From a9b93e07391faede77dde4c0b3c21c9b3f97f8eb Mon Sep 17 00:00:00 2001 From: Herman van Hovell Date: Thu, 31 Mar 2016 09:25:09 -0700 Subject: [SPARK-14211][SQL] Remove ANTLR3 based parser ### What changes were proposed in this pull request? This PR removes the ANTLR3 based parser, and moves the new ANTLR4 based parser into the `org.apache.spark.sql.catalyst.parser package`. ### How was this patch tested? Existing unit tests. cc rxin andrewor14 yhuai Author: Herman van Hovell Closes #12071 from hvanhovell/SPARK-14211. --- dev/deps/spark-deps-hadoop-2.2 | 4 +++- dev/deps/spark-deps-hadoop-2.3 | 4 +++- dev/deps/spark-deps-hadoop-2.4 | 4 +++- dev/deps/spark-deps-hadoop-2.6 | 4 +++- dev/deps/spark-deps-hadoop-2.7 | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) (limited to 'dev') diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2 index 7c2f88bdb1..0c4e43b9c8 100644 --- a/dev/deps/spark-deps-hadoop-2.2 +++ b/dev/deps/spark-deps-hadoop-2.2 @@ -2,7 +2,8 @@ JavaEWAH-0.3.2.jar RoaringBitmap-0.5.11.jar ST4-4.0.4.jar activation-1.1.jar -antlr-runtime-3.5.2.jar +antlr-2.7.7.jar +antlr-runtime-3.4.jar antlr4-runtime-4.5.2-1.jar aopalliance-1.0.jar apache-log4j-extras-1.2.17.jar @@ -173,6 +174,7 @@ spire_2.11-0.7.4.jar stax-api-1.0-2.jar stax-api-1.0.1.jar stream-2.7.0.jar +stringtemplate-3.2.1.jar super-csv-2.2.0.jar univocity-parsers-1.5.6.jar unused-1.0.0.jar diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 index f4d600038d..a0d62a1c30 100644 --- a/dev/deps/spark-deps-hadoop-2.3 +++ b/dev/deps/spark-deps-hadoop-2.3 @@ -2,7 +2,8 @@ JavaEWAH-0.3.2.jar RoaringBitmap-0.5.11.jar ST4-4.0.4.jar activation-1.1.1.jar -antlr-runtime-3.5.2.jar +antlr-2.7.7.jar +antlr-runtime-3.4.jar antlr4-runtime-4.5.2-1.jar aopalliance-1.0.jar apache-log4j-extras-1.2.17.jar @@ -164,6 +165,7 @@ spire_2.11-0.7.4.jar stax-api-1.0-2.jar stax-api-1.0.1.jar stream-2.7.0.jar +stringtemplate-3.2.1.jar super-csv-2.2.0.jar univocity-parsers-1.5.6.jar unused-1.0.0.jar diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 index 7c5e2c35bd..cc6e40329c 100644 --- a/dev/deps/spark-deps-hadoop-2.4 +++ b/dev/deps/spark-deps-hadoop-2.4 @@ -2,7 +2,8 @@ JavaEWAH-0.3.2.jar RoaringBitmap-0.5.11.jar ST4-4.0.4.jar activation-1.1.1.jar -antlr-runtime-3.5.2.jar +antlr-2.7.7.jar +antlr-runtime-3.4.jar antlr4-runtime-4.5.2-1.jar aopalliance-1.0.jar apache-log4j-extras-1.2.17.jar @@ -165,6 +166,7 @@ spire_2.11-0.7.4.jar stax-api-1.0-2.jar stax-api-1.0.1.jar stream-2.7.0.jar +stringtemplate-3.2.1.jar super-csv-2.2.0.jar univocity-parsers-1.5.6.jar unused-1.0.0.jar diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6 index 03d9a51057..5c93db5082 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -2,7 +2,8 @@ JavaEWAH-0.3.2.jar RoaringBitmap-0.5.11.jar ST4-4.0.4.jar activation-1.1.1.jar -antlr-runtime-3.5.2.jar +antlr-2.7.7.jar +antlr-runtime-3.4.jar antlr4-runtime-4.5.2-1.jar aopalliance-1.0.jar apache-log4j-extras-1.2.17.jar @@ -171,6 +172,7 @@ spire_2.11-0.7.4.jar stax-api-1.0-2.jar stax-api-1.0.1.jar stream-2.7.0.jar +stringtemplate-3.2.1.jar super-csv-2.2.0.jar univocity-parsers-1.5.6.jar unused-1.0.0.jar diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 5765071a1c..860fd79aad 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -2,7 +2,8 @@ JavaEWAH-0.3.2.jar RoaringBitmap-0.5.11.jar ST4-4.0.4.jar activation-1.1.1.jar -antlr-runtime-3.5.2.jar +antlr-2.7.7.jar +antlr-runtime-3.4.jar antlr4-runtime-4.5.2-1.jar aopalliance-1.0.jar apache-log4j-extras-1.2.17.jar @@ -172,6 +173,7 @@ spire_2.11-0.7.4.jar stax-api-1.0-2.jar stax-api-1.0.1.jar stream-2.7.0.jar +stringtemplate-3.2.1.jar super-csv-2.2.0.jar univocity-parsers-1.5.6.jar unused-1.0.0.jar -- cgit v1.2.3