From 4036368eae39877ee5a39054691f1d68fbcdf101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Mon, 21 May 2012 17:01:55 +0800 Subject: [PATCH] refactor --- .../impl/hbql/parser/HBQLExprParser.java | 5 +- .../hdriver/impl/hbql/parser/HBQLLexer.java | 98 +++++++++++++++++++ .../impl/hbql/parser/HBQLStatementParser.java | 2 +- .../impl/mapping/HMappingDefaultImpl.java | 23 ++++- 4 files changed, 122 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLLexer.java diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLExprParser.java b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLExprParser.java index fd3e3dcad6..9d8657d3da 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLExprParser.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLExprParser.java @@ -4,10 +4,11 @@ import com.alibaba.druid.sql.parser.Lexer; import com.alibaba.druid.sql.parser.ParserException; import com.alibaba.druid.sql.parser.SQLExprParser; - public class HBQLExprParser extends SQLExprParser { + public HBQLExprParser(String sql) throws ParserException{ - super(sql); + super(new HBQLLexer(sql)); + this.lexer.nextToken(); } public HBQLExprParser(Lexer lexer){ diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLLexer.java b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLLexer.java new file mode 100644 index 0000000000..680471a2c0 --- /dev/null +++ b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLLexer.java @@ -0,0 +1,98 @@ +package com.alibaba.druid.hdriver.impl.hbql.parser; + +import java.util.HashMap; +import java.util.Map; + +import com.alibaba.druid.sql.parser.Keywords; +import com.alibaba.druid.sql.parser.Lexer; +import com.alibaba.druid.sql.parser.Token; + +public class HBQLLexer extends Lexer { + + public final static Keywords DEFAULT_HBQL_KEYWORDS; + + static { + Map map = new HashMap(); + map.put("EXISTS", Token.EXISTS); + map.put("THEN", Token.THEN); + map.put("AS", Token.AS); + map.put("GROUP", Token.GROUP); + map.put("BY", Token.BY); + map.put("HAVING", Token.HAVING); + map.put("DELETE", Token.DELETE); + map.put("ORDER", Token.ORDER); + map.put("INDEX", Token.INDEX); + map.put("FOR", Token.FOR); + map.put("SCHEMA", Token.SCHEMA); + map.put("FOREIGN", Token.FOREIGN); + map.put("REFERENCES", Token.REFERENCES); + map.put("CHECK", Token.CHECK); + map.put("PRIMARY", Token.PRIMARY); + map.put("KEY", Token.KEY); + map.put("CONSTRAINT", Token.CONSTRAINT); + map.put("DEFAULT", Token.DEFAULT); + map.put("VIEW", Token.VIEW); + map.put("CREATE", Token.CREATE); + map.put("VALUES", Token.VALUES); + map.put("ALTER", Token.ALTER); + map.put("TABLE", Token.TABLE); + map.put("DROP", Token.DROP); + map.put("SET", Token.SET); + map.put("INTO", Token.INTO); + map.put("UPDATE", Token.UPDATE); + map.put("NULL", Token.NULL); + map.put("IS", Token.IS); + map.put("NOT", Token.NOT); + map.put("SELECT", Token.SELECT); + map.put("INSERT", Token.INSERT); + map.put("FROM", Token.FROM); + map.put("WHERE", Token.WHERE); + map.put("AND", Token.AND); + map.put("OR", Token.OR); + map.put("XOR", Token.XOR); + map.put("DISTINCT", Token.DISTINCT); + map.put("UNIQUE", Token.UNIQUE); + map.put("ALL", Token.ALL); + map.put("UNION", Token.UNION); + map.put("INTERSECT", Token.INTERSECT); + map.put("MINUS", Token.MINUS); + map.put("INNER", Token.INNER); + map.put("LEFT", Token.LEFT); + map.put("RIGHT", Token.RIGHT); + map.put("FULL", Token.FULL); + map.put("ON", Token.ON); + map.put("OUTER", Token.OUTER); + map.put("JOIN", Token.JOIN); + map.put("NEW", Token.NEW); + map.put("CASE", Token.CASE); + map.put("WHEN", Token.WHEN); + map.put("END", Token.END); + map.put("WHEN", Token.WHEN); + map.put("ELSE", Token.ELSE); + map.put("EXISTS", Token.EXISTS); + map.put("CAST", Token.CAST); + map.put("IN", Token.IN); + map.put("ASC", Token.ASC); + map.put("DESC", Token.DESC); + map.put("LIKE", Token.LIKE); + map.put("ESCAPE", Token.ESCAPE); + map.put("BETWEEN", Token.BETWEEN); + map.put("INTERVAL", Token.INTERVAL); + map.put("LOCK", Token.LOCK); + map.put("SOME", Token.SOME); + map.put("ANY", Token.ANY); + map.put("TRUNCATE", Token.TRUNCATE); + map.put("IF", Token.IF); + + map.put("TRUE", Token.TRUE); + map.put("FALSE", Token.FALSE); + map.put("LIMIT", Token.LIMIT); + + DEFAULT_HBQL_KEYWORDS = new Keywords(map); + } + + public HBQLLexer(String input){ + super(input); + super.keywods = DEFAULT_HBQL_KEYWORDS; + } +} diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLStatementParser.java b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLStatementParser.java index a623e73df9..3f394baaf8 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLStatementParser.java @@ -10,7 +10,7 @@ public class HBQLStatementParser extends SQLStatementParser { protected SQLExprParser exprParser; public HBQLStatementParser(String sql){ - super(new SQLExprParser(sql)); + super(new HBQLExprParser(sql)); } public HBQLStatementParser(SQLExprParser exprParser){ diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMappingDefaultImpl.java b/src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMappingDefaultImpl.java index 6089ad28a7..58978a660e 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMappingDefaultImpl.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMappingDefaultImpl.java @@ -5,7 +5,24 @@ import org.apache.hadoop.hbase.util.Bytes; public class HMappingDefaultImpl implements HMapping { - private byte[] family = Bytes.toBytes("d"); + private byte[] family = Bytes.toBytes("d"); + private String rowColumn = "id"; + + public byte[] getFamily() { + return family; + } + + public void setFamily(byte[] family) { + this.family = family; + } + + public String getRowColumn() { + return rowColumn; + } + + public void setRowColumn(String rowColumn) { + this.rowColumn = rowColumn; + } @Override public Object getObject(Result result, String columnName) { @@ -25,7 +42,7 @@ public class HMappingDefaultImpl implements HMapping { public byte[] getFamily(String columnName) { return family; } - + public byte[] getRow(Result result, String columnName) { return result.getRow(); } @@ -37,7 +54,7 @@ public class HMappingDefaultImpl implements HMapping { @Override public boolean isRow(String columnName) { - if ("id".equals(columnName)) { + if (rowColumn.equals(columnName)) { return true; }