From 78235af596a64849ab66c169d624aa973038ea17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Sun, 20 May 2012 01:11:52 +0800 Subject: [PATCH] refactor --- .../hbql/ast/HBQLCreateMappingStatement.java | 20 ++++++++++++++++++ ...ent.java => HBQLCreateTableStatement.java} | 2 +- ...inition.java => HBQLFamilyDefinition.java} | 2 +- ...ryBlock.java => HBQLSelectQueryBlock.java} | 2 +- .../druid/hbase/hbql/ast/HBQLStatement.java | 8 +++++++ .../hbql/parser/HBQLStatementParser.java | 21 +++++++++++++++++++ .../hbase/hbql/parser/HStatementParser.java | 6 ------ .../druid/hbase/hbql/visitor/HBQLVisitor.java | 8 +++++++ 8 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java rename src/main/java/com/alibaba/druid/hbase/hbql/ast/{HCreateTableStatement.java => HBQLCreateTableStatement.java} (70%) rename src/main/java/com/alibaba/druid/hbase/hbql/ast/{HFamilyDefinition.java => HBQLFamilyDefinition.java} (96%) rename src/main/java/com/alibaba/druid/hbase/hbql/ast/{HSelectQueryBlock.java => HBQLSelectQueryBlock.java} (74%) create mode 100644 src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatement.java create mode 100644 src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java delete mode 100644 src/main/java/com/alibaba/druid/hbase/hbql/parser/HStatementParser.java create mode 100644 src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLVisitor.java diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java new file mode 100644 index 0000000000..cc080ac697 --- /dev/null +++ b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java @@ -0,0 +1,20 @@ +package com.alibaba.druid.hbase.hbql.ast; + +import com.alibaba.druid.hbase.mapping.HMapping; +import com.alibaba.druid.sql.ast.SQLStatementImpl; + +public class HBQLCreateMappingStatement extends SQLStatementImpl implements HBQLStatement { + + private static final long serialVersionUID = 1L; + + private HMapping mapping = new HMapping(); + + public HMapping getMapping() { + return mapping; + } + + public void setMapping(HMapping mapping) { + this.mapping = mapping; + } + +} diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HCreateTableStatement.java b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateTableStatement.java similarity index 70% rename from src/main/java/com/alibaba/druid/hbase/hbql/ast/HCreateTableStatement.java rename to src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateTableStatement.java index 38fa1ed678..bd222ec73a 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateTableStatement.java @@ -2,7 +2,7 @@ package com.alibaba.druid.hbase.hbql.ast; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; -public class HCreateTableStatement extends SQLCreateTableStatement { +public class HBQLCreateTableStatement extends SQLCreateTableStatement { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HFamilyDefinition.java b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLFamilyDefinition.java similarity index 96% rename from src/main/java/com/alibaba/druid/hbase/hbql/ast/HFamilyDefinition.java rename to src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLFamilyDefinition.java index 535ea75385..8b31cc32fd 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HFamilyDefinition.java +++ b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLFamilyDefinition.java @@ -4,7 +4,7 @@ import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.ast.statement.SQLTableElement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class HFamilyDefinition extends SQLObjectImpl implements SQLTableElement { +public class HBQLFamilyDefinition extends SQLObjectImpl implements SQLTableElement { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HSelectQueryBlock.java b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLSelectQueryBlock.java similarity index 74% rename from src/main/java/com/alibaba/druid/hbase/hbql/ast/HSelectQueryBlock.java rename to src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLSelectQueryBlock.java index a4e75171e7..ee446bd071 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLSelectQueryBlock.java @@ -2,7 +2,7 @@ package com.alibaba.druid.hbase.hbql.ast; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; -public class HSelectQueryBlock extends SQLSelectQueryBlock { +public class HBQLSelectQueryBlock extends SQLSelectQueryBlock { /** * diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatement.java b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatement.java new file mode 100644 index 0000000000..af1ecf8f6a --- /dev/null +++ b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatement.java @@ -0,0 +1,8 @@ +package com.alibaba.druid.hbase.hbql.ast; + +import com.alibaba.druid.sql.ast.SQLStatement; + + +public interface HBQLStatement extends SQLStatement { + +} diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java b/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java new file mode 100644 index 0000000000..761dbfd80e --- /dev/null +++ b/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java @@ -0,0 +1,21 @@ +package com.alibaba.druid.hbase.hbql.parser; + +import com.alibaba.druid.sql.parser.Lexer; +import com.alibaba.druid.sql.parser.SQLExprParser; +import com.alibaba.druid.sql.parser.SQLStatementParser; + + +public class HBQLStatementParser extends SQLStatementParser { + protected SQLExprParser exprParser; + + public HBQLStatementParser(String sql){ + super(sql); + + this.exprParser = new SQLExprParser(lexer); + } + + public HBQLStatementParser(Lexer lexer){ + super(lexer); + this.exprParser = new SQLExprParser(lexer); + } +} diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/parser/HStatementParser.java b/src/main/java/com/alibaba/druid/hbase/hbql/parser/HStatementParser.java deleted file mode 100644 index 204c5dfbc8..0000000000 --- a/src/main/java/com/alibaba/druid/hbase/hbql/parser/HStatementParser.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.alibaba.druid.hbase.hbql.parser; - - -public class HStatementParser { - -} diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLVisitor.java b/src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLVisitor.java new file mode 100644 index 0000000000..4c4ac97c8e --- /dev/null +++ b/src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLVisitor.java @@ -0,0 +1,8 @@ +package com.alibaba.druid.hbase.hbql.visitor; + +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + + +public interface HBQLVisitor extends SQLASTVisitor { + +}