Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
TAJO-1818: Separate sql parser into an independent maven module.
Browse files Browse the repository at this point in the history 
Closes #733
  • Loading branch information
@hyunsik
hyunsik committed Sep 7, 2015
1 parent 6c9ddea commit 33b8893
Show file tree
Hide file tree
Showing 36 changed files with 345 additions and 159 deletions.
3 changes: 3 additions & 0 deletions CHANGES
View file
Expand Up @@ -36,6 +36,9 @@ Release 0.11.0 - unreleased

IMPROVEMENT

TAJO-1818: Separate sql parser into an independent maven module.
(hyunsik)

TAJO-1816: Refactor SQL parser tests. (hyunsik)

TAJO-1738: Improve off-heap RowBlock. (jinho)
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Expand Up @@ -89,6 +89,7 @@
<module>tajo-client</module>
<module>tajo-client-example</module>
<module>tajo-jdbc</module>
<module>tajo-sql-parser</module>
<module>tajo-storage</module>
<module>tajo-pullserver</module>
<module>tajo-dist</module>
Expand Down
2 changes: 1 addition & 1 deletion tajo-cluster-tests/src/test/java/org/apache/tajo/QueryTestCaseBase.java
View file
Expand Up @@ -37,7 +37,7 @@
import org.apache.tajo.cli.tsql.SimpleParser;
import org.apache.tajo.client.TajoClient;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.query.QueryContext;
import org.apache.tajo.exception.TajoException;
import org.apache.tajo.exception.UndefinedTableException;
Expand Down
2 changes: 1 addition & 1 deletion tajo-core-tests/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
View file
Expand Up @@ -34,7 +34,7 @@
import org.apache.tajo.engine.codegen.TajoClassLoader;
import org.apache.tajo.engine.function.FunctionLoader;
import org.apache.tajo.engine.json.CoreGsonHelper;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.query.QueryContext;
import org.apache.tajo.exception.TajoException;
import org.apache.tajo.exception.TajoInternalError;
Expand Down
2 changes: 1 addition & 1 deletion tajo-core-tests/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java
View file
Expand Up @@ -31,7 +31,7 @@
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.function.FunctionLoader;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.query.QueryContext;
import org.apache.tajo.exception.TajoException;
import org.apache.tajo.plan.LogicalPlan;
Expand Down
2 changes: 1 addition & 1 deletion tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/TestJoinOrderAlgorithm.java
View file
Expand Up @@ -28,7 +28,7 @@
import org.apache.tajo.catalog.statistics.TableStats;
import org.apache.tajo.common.TajoDataTypes.Type;
import org.apache.tajo.engine.function.FunctionLoader;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.query.QueryContext;
import org.apache.tajo.plan.LogicalOptimizer;
import org.apache.tajo.plan.LogicalPlan;
Expand Down
2 changes: 1 addition & 1 deletion tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java
View file
Expand Up @@ -27,7 +27,7 @@
import org.apache.tajo.common.TajoDataTypes.Type;
import org.apache.tajo.engine.function.FunctionLoader;
import org.apache.tajo.engine.function.builtin.SumInt;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.query.QueryContext;
import org.apache.tajo.exception.TajoException;
import org.apache.tajo.plan.LogicalOptimizer;
Expand Down
2 changes: 1 addition & 1 deletion tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java
View file
Expand Up @@ -38,7 +38,7 @@
import org.apache.tajo.engine.function.FunctionLoader;
import org.apache.tajo.engine.function.builtin.SumInt;
import org.apache.tajo.engine.json.CoreGsonHelper;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.query.QueryContext;
import org.apache.tajo.exception.TajoException;
import org.apache.tajo.plan.LogicalOptimizer;
Expand Down
2 changes: 1 addition & 1 deletion tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java
View file
Expand Up @@ -32,7 +32,7 @@
import org.apache.tajo.common.TajoDataTypes.Type;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.function.builtin.SumInt;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.physical.PhysicalPlanUtil;
import org.apache.tajo.exception.TajoException;
import org.apache.tajo.plan.LogicalPlanner;
Expand Down
2 changes: 1 addition & 1 deletion ...ore-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java
View file
Expand Up @@ -30,7 +30,7 @@
import org.apache.tajo.conf.TajoConf.ConfVars;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.PhysicalPlanner;
import org.apache.tajo.engine.planner.PhysicalPlannerImpl;
import org.apache.tajo.engine.planner.enforce.Enforcer;
Expand Down
2 changes: 1 addition & 1 deletion ...ests/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java
View file
Expand Up @@ -27,7 +27,7 @@
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.PhysicalPlanner;
import org.apache.tajo.engine.planner.PhysicalPlannerImpl;
import org.apache.tajo.engine.planner.enforce.Enforcer;
Expand Down
2 changes: 1 addition & 1 deletion ...sts/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java
View file
Expand Up @@ -28,7 +28,7 @@
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.PhysicalPlanner;
import org.apache.tajo.engine.planner.PhysicalPlannerImpl;
import org.apache.tajo.engine.planner.enforce.Enforcer;
Expand Down
2 changes: 1 addition & 1 deletion ...ore-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
View file
Expand Up @@ -27,7 +27,7 @@
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.PhysicalPlanner;
import org.apache.tajo.engine.planner.PhysicalPlannerImpl;
import org.apache.tajo.engine.planner.enforce.Enforcer;
Expand Down
2 changes: 1 addition & 1 deletion tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java
View file
Expand Up @@ -29,7 +29,7 @@
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.PhysicalPlanner;
import org.apache.tajo.engine.planner.PhysicalPlannerImpl;
import org.apache.tajo.engine.planner.enforce.Enforcer;
Expand Down
2 changes: 1 addition & 1 deletion ...ore-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
View file
Expand Up @@ -27,7 +27,7 @@
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.PhysicalPlanner;
import org.apache.tajo.engine.planner.PhysicalPlannerImpl;
import org.apache.tajo.engine.planner.enforce.Enforcer;
Expand Down
2 changes: 1 addition & 1 deletion ...ests/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java
View file
Expand Up @@ -27,7 +27,7 @@
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.PhysicalPlanner;
import org.apache.tajo.engine.planner.PhysicalPlannerImpl;
import org.apache.tajo.engine.planner.enforce.Enforcer;
Expand Down
2 changes: 1 addition & 1 deletion tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java
View file
Expand Up @@ -28,7 +28,7 @@
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.PhysicalPlanner;
import org.apache.tajo.engine.planner.PhysicalPlannerImpl;
import org.apache.tajo.engine.planner.enforce.Enforcer;
Expand Down
2 changes: 1 addition & 1 deletion ...core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
View file
Expand Up @@ -34,7 +34,7 @@
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.datum.NullDatum;
import org.apache.tajo.engine.function.FunctionLoader;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.PhysicalPlanner;
import org.apache.tajo.engine.planner.PhysicalPlannerImpl;
import org.apache.tajo.engine.planner.enforce.Enforcer;
Expand Down
2 changes: 1 addition & 1 deletion ...s/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java
View file
Expand Up @@ -32,7 +32,7 @@
import org.apache.tajo.conf.TajoConf.ConfVars;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.plan.LogicalPlan;
import org.apache.tajo.plan.LogicalPlanner;
import org.apache.tajo.engine.planner.PhysicalPlanner;
Expand Down
2 changes: 1 addition & 1 deletion ...sts/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java
View file
Expand Up @@ -27,7 +27,7 @@
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.PhysicalPlanner;
import org.apache.tajo.engine.planner.PhysicalPlannerImpl;
import org.apache.tajo.engine.planner.enforce.Enforcer;
Expand Down
2 changes: 1 addition & 1 deletion ...ts/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java
View file
Expand Up @@ -27,7 +27,7 @@
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.PhysicalPlanner;
import org.apache.tajo.engine.planner.PhysicalPlannerImpl;
import org.apache.tajo.engine.planner.enforce.Enforcer;
Expand Down
2 changes: 1 addition & 1 deletion tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
View file
Expand Up @@ -29,7 +29,7 @@
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.PhysicalPlanner;
import org.apache.tajo.engine.planner.PhysicalPlannerImpl;
import org.apache.tajo.engine.planner.RangePartitionAlgorithm;
Expand Down
2 changes: 1 addition & 1 deletion ...re-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestSortIntersectExec.java
View file
Expand Up @@ -27,7 +27,7 @@
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.PhysicalPlanner;
import org.apache.tajo.engine.planner.PhysicalPlannerImpl;
import org.apache.tajo.engine.planner.enforce.Enforcer;
Expand Down
2 changes: 1 addition & 1 deletion tajo-core-tests/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java
View file
Expand Up @@ -25,7 +25,7 @@
import org.apache.tajo.catalog.TableMeta;
import org.apache.tajo.catalog.statistics.TableStats;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.global.ExecutionBlock;
import org.apache.tajo.engine.planner.global.ExecutionBlockCursor;
import org.apache.tajo.engine.planner.global.GlobalPlanner;
Expand Down
5 changes: 2 additions & 3 deletions ...e/tajo/engine/parser/TestSQLAnalyzer.java → ...ache/tajo/parser/sql/TestSQLAnalyzer.java
View file
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.tajo.engine.parser;
package org.apache.tajo.parser.sql;

import com.google.common.base.Function;
import com.google.common.base.Predicate;
Expand All @@ -30,7 +30,6 @@
import org.apache.tajo.algebra.Expr;
import org.apache.tajo.annotation.Nullable;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.engine.parser.SQLParser.SqlContext;
import org.apache.tajo.storage.StorageUtil;
import org.apache.tajo.util.FileUtil;
import org.apache.tajo.util.Pair;
Expand Down Expand Up @@ -66,7 +65,7 @@ public static Expr parseQuery(String sql) {
parser.setBuildParseTree(true);

SQLAnalyzer visitor = new SQLAnalyzer();
SqlContext context = parser.sql();
SQLParser.SqlContext context = parser.sql();
return visitor.visitSql(context);
}

Expand Down
4 changes: 1 addition & 3 deletions tajo-core-tests/src/test/java/org/apache/tajo/querymaster/TestKillQuery.java
View file
Expand Up @@ -25,12 +25,11 @@
import org.apache.tajo.*;
import org.apache.tajo.ResourceProtos.ExecutionBlockContextResponse;
import org.apache.tajo.algebra.Expr;
import org.apache.tajo.benchmark.TPCH;
import org.apache.tajo.catalog.CatalogService;
import org.apache.tajo.catalog.proto.CatalogProtos;
import org.apache.tajo.client.TajoClient;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.planner.global.GlobalPlanner;
import org.apache.tajo.engine.planner.global.MasterPlan;
import org.apache.tajo.engine.query.QueryContext;
Expand All @@ -52,7 +51,6 @@
import org.junit.BeforeClass;
import org.junit.Test;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
Expand Down
21 changes: 4 additions & 17 deletions tajo-core/pom.xml
View file
Expand Up @@ -31,8 +31,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<antlr4.visitor>true</antlr4.visitor>
<antlr4.listener>true</antlr4.listener>
<metrics.version>3.1.0</metrics.version>
<maven.fork.count>3</maven.fork.count>
</properties>
Expand Down Expand Up @@ -76,17 +74,6 @@
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>antlr4</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Expand Down Expand Up @@ -228,6 +215,10 @@
<groupId>org.apache.tajo</groupId>
<artifactId>tajo-rpc-protobuf</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tajo</groupId>
<artifactId>tajo-sql-parser</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tajo</groupId>
<artifactId>tajo-thirdparty-asm</artifactId>
Expand Down Expand Up @@ -266,10 +257,6 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
View file
Expand Up @@ -35,7 +35,7 @@
import org.apache.tajo.catalog.Schema;
import org.apache.tajo.catalog.TableDesc;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.parser.sql.SQLAnalyzer;
import org.apache.tajo.engine.query.QueryContext;
import org.apache.tajo.exception.*;
import org.apache.tajo.master.TajoMaster.MasterContext;
Expand Down

0 comments on commit 33b8893

Please sign in to comment.