From 7dbce92bfbb1d1a7d96806a61381a7f63c065555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Sun, 20 May 2012 13:35:23 +0800 Subject: [PATCH] refactor --- .../hbql/ast/HBQLCreateMappingStatement.java | 6 ------ .../hbase/hbql/parser/HBQLStatementParser.java | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 7 deletions(-) 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 index 7bb101eea3..cc080ac697 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java +++ b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java @@ -1,16 +1,12 @@ package com.alibaba.druid.hbase.hbql.ast; -<<<<<<< HEAD import com.alibaba.druid.hbase.mapping.HMapping; -======= ->>>>>>> ca778ea3c3ae05528c08c708193c8a4f79392825 import com.alibaba.druid.sql.ast.SQLStatementImpl; public class HBQLCreateMappingStatement extends SQLStatementImpl implements HBQLStatement { private static final long serialVersionUID = 1L; -<<<<<<< HEAD private HMapping mapping = new HMapping(); public HMapping getMapping() { @@ -21,6 +17,4 @@ public class HBQLCreateMappingStatement extends SQLStatementImpl implements HBQL this.mapping = mapping; } -======= ->>>>>>> ca778ea3c3ae05528c08c708193c8a4f79392825 } 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 index b318458c26..761dbfd80e 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java @@ -1,6 +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 { +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); + } }