STORM-2453 Move non-connectors into the top directory

* move storm-sql, flux, storm-submit-tools to the top directory * rearrange target directories for them in binary dist. * create "lib-tools" directory for storing non-storm-core libs * sql: lib-tools/sql/core and lib-tools/sql/runtime * storm-submit-tools: lib-tools/submit-tools * storm-kafka-monitor: lib-tools/storm-kafka-monitor
aqeelvn · Apr 4, 2017 · e9d7833 · e9d7833
1 parent 28c8711
commit e9d7833
Showing 209 changed files with 44 additions and 109 deletions.
diff --git a/bin/storm-kafka-monitor b/bin/storm-kafka-monitor
@@ -49,4 +49,4 @@ if [ -z "$JAVA_HOME" ]; then
 else
   JAVA="$JAVA_HOME/bin/java"
 fi
-exec $JAVA $STORM_JAAS_CONF_PARAM -cp $STORM_BASE_DIR/toollib/storm-kafka-monitor-*.jar org.apache.storm.kafka.monitor.KafkaOffsetLagUtil "$@"
+exec $JAVA $STORM_JAAS_CONF_PARAM -cp $STORM_BASE_DIR/lib-tools/storm-kafka-monitor/storm-kafka-monitor-*.jar org.apache.storm.kafka.monitor.KafkaOffsetLagUtil "$@"
diff --git a/bin/storm.py b/bin/storm.py
@@ -82,6 +82,7 @@ def init_storm_env():
 
 STORM_LIB_DIR = os.path.join(STORM_DIR, "lib")
 STORM_DRPC_LIB_DIR = os.path.join(STORM_DIR, "lib-drpc-server")
+STORM_TOOLS_LIB_DIR = os.path.join(STORM_DIR, "lib-tools")
 STORM_BIN_DIR = os.path.join(STORM_DIR, "bin")
 STORM_LOG4J2_CONF_DIR = os.path.join(STORM_DIR, "log4j2")
 STORM_SUPERVISOR_LOG_FILE = os.getenv('STORM_SUPERVISOR_LOG_FILE', "supervisor.log")
@@ -167,10 +168,8 @@ def resolve_dependencies(artifacts, artifact_repositories):
     print("Resolving dependencies on demand: artifacts (%s) with repositories (%s)" % (artifacts, artifact_repositories))
     sys.stdout.flush()
 
-    # TODO: should we move some external modules to outer place?
-
     # storm-submit module doesn't rely on storm-core and relevant libs
-    extrajars = get_jars_full(STORM_DIR + "/external/storm-submit-tools")
+    extrajars = get_jars_full(os.path.join(STORM_TOOLS_LIB_DIR, "submit-tools"))
     classpath = normclasspath(os.pathsep.join(extrajars))
 
     command = [
@@ -343,8 +342,8 @@ def sql(sql_file, topology_name):
     local_jars = DEP_JARS_OPTS
     artifact_to_file_jars = resolve_dependencies(DEP_ARTIFACTS_OPTS, DEP_ARTIFACTS_REPOSITORIES_OPTS)
 
-    sql_core_jars = get_jars_full(STORM_DIR + "/external/sql/storm-sql-core")
-    sql_runtime_jars = get_jars_full(STORM_DIR + "/external/sql/storm-sql-runtime")
+    sql_core_jars = get_jars_full(os.path.join(STORM_TOOLS_LIB_DIR, "sql", "core"))
+    sql_runtime_jars = get_jars_full(os.path.join(STORM_TOOLS_LIB_DIR, "sql", "runtime"))
 
     # include storm-sql-runtime jar(s) to local jar list
     local_jars.extend(sql_runtime_jars)

diff --git a/external/flux/README.md → flux/README.md b/external/flux/README.md → flux/README.md
diff --git a/external/flux/flux-core/pom.xml → flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml → flux/flux-core/pom.xml
diff --git a/...main/java/org/apache/storm/flux/Flux.java → ...main/java/org/apache/storm/flux/Flux.java b/...main/java/org/apache/storm/flux/Flux.java → ...main/java/org/apache/storm/flux/Flux.java
@@ -32,8 +32,6 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
-import java.util.Map;
-import java.util.Properties;
 
 /**
  * Flux entry point.

diff --git a/...va/org/apache/storm/flux/FluxBuilder.java → ...va/org/apache/storm/flux/FluxBuilder.java b/...va/org/apache/storm/flux/FluxBuilder.java → ...va/org/apache/storm/flux/FluxBuilder.java
diff --git a/...apache/storm/flux/api/TopologySource.java → ...apache/storm/flux/api/TopologySource.java b/...apache/storm/flux/api/TopologySource.java → ...apache/storm/flux/api/TopologySource.java
diff --git a/.../org/apache/storm/flux/model/BeanDef.java → .../org/apache/storm/flux/model/BeanDef.java b/.../org/apache/storm/flux/model/BeanDef.java → .../org/apache/storm/flux/model/BeanDef.java
@@ -17,11 +17,6 @@
  */
 package org.apache.storm.flux.model;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * A representation of a Java object that is uniquely identifyable, and given a className, constructor arguments,
  * and properties, can be instantiated.

diff --git a/...e/storm/flux/model/BeanListReference.java → ...e/storm/flux/model/BeanListReference.java b/...e/storm/flux/model/BeanListReference.java → ...e/storm/flux/model/BeanListReference.java
diff --git a/...pache/storm/flux/model/BeanReference.java → ...pache/storm/flux/model/BeanReference.java b/...pache/storm/flux/model/BeanReference.java → ...pache/storm/flux/model/BeanReference.java
diff --git a/.../org/apache/storm/flux/model/BoltDef.java → .../org/apache/storm/flux/model/BoltDef.java b/.../org/apache/storm/flux/model/BoltDef.java → .../org/apache/storm/flux/model/BoltDef.java
diff --git a/...che/storm/flux/model/ConfigMethodDef.java → ...che/storm/flux/model/ConfigMethodDef.java b/...che/storm/flux/model/ConfigMethodDef.java → ...che/storm/flux/model/ConfigMethodDef.java
diff --git a/...he/storm/flux/model/ExecutionContext.java → ...he/storm/flux/model/ExecutionContext.java b/...he/storm/flux/model/ExecutionContext.java → ...he/storm/flux/model/ExecutionContext.java
diff --git a/.../apache/storm/flux/model/GroupingDef.java → .../apache/storm/flux/model/GroupingDef.java b/.../apache/storm/flux/model/GroupingDef.java → .../apache/storm/flux/model/GroupingDef.java
diff --git a/...g/apache/storm/flux/model/IncludeDef.java → ...g/apache/storm/flux/model/IncludeDef.java b/...g/apache/storm/flux/model/IncludeDef.java → ...g/apache/storm/flux/model/IncludeDef.java
diff --git a/...rg/apache/storm/flux/model/ObjectDef.java → ...rg/apache/storm/flux/model/ObjectDef.java b/...rg/apache/storm/flux/model/ObjectDef.java → ...rg/apache/storm/flux/model/ObjectDef.java
diff --git a/.../apache/storm/flux/model/PropertyDef.java → .../apache/storm/flux/model/PropertyDef.java b/.../apache/storm/flux/model/PropertyDef.java → .../apache/storm/flux/model/PropertyDef.java
diff --git a/...org/apache/storm/flux/model/SpoutDef.java → ...org/apache/storm/flux/model/SpoutDef.java b/...org/apache/storm/flux/model/SpoutDef.java → ...org/apache/storm/flux/model/SpoutDef.java
diff --git a/...rg/apache/storm/flux/model/StreamDef.java → ...rg/apache/storm/flux/model/StreamDef.java b/...rg/apache/storm/flux/model/StreamDef.java → ...rg/apache/storm/flux/model/StreamDef.java
diff --git a/.../apache/storm/flux/model/TopologyDef.java → .../apache/storm/flux/model/TopologyDef.java b/.../apache/storm/flux/model/TopologyDef.java → .../apache/storm/flux/model/TopologyDef.java
diff --git a/...e/storm/flux/model/TopologySourceDef.java → ...e/storm/flux/model/TopologySourceDef.java b/...e/storm/flux/model/TopologySourceDef.java → ...e/storm/flux/model/TopologySourceDef.java
diff --git a/...rg/apache/storm/flux/model/VertexDef.java → ...rg/apache/storm/flux/model/VertexDef.java b/...rg/apache/storm/flux/model/VertexDef.java → ...rg/apache/storm/flux/model/VertexDef.java
diff --git a/.../apache/storm/flux/parser/FluxParser.java → .../apache/storm/flux/parser/FluxParser.java b/.../apache/storm/flux/parser/FluxParser.java → .../apache/storm/flux/parser/FluxParser.java
@@ -17,7 +17,6 @@
  */
 package org.apache.storm.flux.parser;
 
-import org.apache.storm.flux.api.TopologySource;
 import org.apache.storm.flux.model.BoltDef;
 import org.apache.storm.flux.model.IncludeDef;
 import org.apache.storm.flux.model.SpoutDef;
@@ -32,7 +31,6 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.ByteBuffer;
 import java.util.Map;
 import java.util.Properties;
 

diff --git a/...x/flux-core/src/main/resources/splash.txt → flux/flux-core/src/main/resources/splash.txt b/...x/flux-core/src/main/resources/splash.txt → flux/flux-core/src/main/resources/splash.txt
diff --git a/...rg/apache/storm/flux/FluxBuilderTest.java → ...rg/apache/storm/flux/FluxBuilderTest.java b/...rg/apache/storm/flux/FluxBuilderTest.java → ...rg/apache/storm/flux/FluxBuilderTest.java
diff --git a/...rg/apache/storm/flux/IntegrationTest.java → ...rg/apache/storm/flux/IntegrationTest.java b/...rg/apache/storm/flux/IntegrationTest.java → ...rg/apache/storm/flux/IntegrationTest.java
diff --git a/...t/java/org/apache/storm/flux/TCKTest.java → ...t/java/org/apache/storm/flux/TCKTest.java b/...t/java/org/apache/storm/flux/TCKTest.java → ...t/java/org/apache/storm/flux/TCKTest.java
@@ -25,8 +25,6 @@
 import org.apache.storm.flux.test.TestBolt;
 import org.junit.Test;
 
-import java.io.File;
-
 import static org.junit.Assert.*;
 
 public class TCKTest {

diff --git a/.../multilang/MultilangEnvirontmentTest.java → .../multilang/MultilangEnvirontmentTest.java b/.../multilang/MultilangEnvirontmentTest.java → .../multilang/MultilangEnvirontmentTest.java
diff --git a/...pache/storm/flux/test/SimpleTopology.java → ...pache/storm/flux/test/SimpleTopology.java b/...pache/storm/flux/test/SimpleTopology.java → ...pache/storm/flux/test/SimpleTopology.java
@@ -19,7 +19,6 @@
 
 import org.apache.storm.generated.StormTopology;
 import org.apache.storm.topology.TopologyBuilder;
-import org.apache.storm.flux.api.TopologySource;
 import org.apache.storm.flux.wrappers.bolts.LogInfoBolt;
 import org.apache.storm.flux.wrappers.spouts.FluxShellSpout;
 

diff --git a/...storm/flux/test/SimpleTopologySource.java → ...storm/flux/test/SimpleTopologySource.java b/...storm/flux/test/SimpleTopologySource.java → ...storm/flux/test/SimpleTopologySource.java
diff --git a/...x/test/SimpleTopologyWithConfigParam.java → ...x/test/SimpleTopologyWithConfigParam.java b/...x/test/SimpleTopologyWithConfigParam.java → ...x/test/SimpleTopologyWithConfigParam.java
@@ -23,8 +23,6 @@
 import org.apache.storm.flux.wrappers.bolts.LogInfoBolt;
 import org.apache.storm.flux.wrappers.spouts.FluxShellSpout;
 
-import java.util.Map;
-
 /**
  * Test topology source that does not implement TopologySource, but has the same
  * `getTopology()` method.

diff --git a/.../org/apache/storm/flux/test/TestBolt.java → .../org/apache/storm/flux/test/TestBolt.java b/.../org/apache/storm/flux/test/TestBolt.java → .../org/apache/storm/flux/test/TestBolt.java
diff --git a/...torm/flux/test/TridentTopologySource.java → ...torm/flux/test/TridentTopologySource.java b/...torm/flux/test/TridentTopologySource.java → ...torm/flux/test/TridentTopologySource.java
diff --git a/...src/test/resources/configs/bad_hbase.yaml → ...src/test/resources/configs/bad_hbase.yaml b/...src/test/resources/configs/bad_hbase.yaml → ...src/test/resources/configs/bad_hbase.yaml
diff --git a/...est/resources/configs/bad_shell_test.yaml → ...est/resources/configs/bad_shell_test.yaml b/...est/resources/configs/bad_shell_test.yaml → ...est/resources/configs/bad_shell_test.yaml
diff --git a/...esources/configs/config-methods-test.yaml → ...esources/configs/config-methods-test.yaml b/...esources/configs/config-methods-test.yaml → ...esources/configs/config-methods-test.yaml
diff --git a/...t/resources/configs/diamond-topology.yaml → ...t/resources/configs/diamond-topology.yaml b/...t/resources/configs/diamond-topology.yaml → ...t/resources/configs/diamond-topology.yaml
diff --git a/...gs/existing-topology-method-override.yaml → ...gs/existing-topology-method-override.yaml b/...gs/existing-topology-method-override.yaml → ...gs/existing-topology-method-override.yaml
diff --git a/.../existing-topology-reflection-config.yaml → .../existing-topology-reflection-config.yaml b/.../existing-topology-reflection-config.yaml → .../existing-topology-reflection-config.yaml
diff --git a/...configs/existing-topology-reflection.yaml → ...configs/existing-topology-reflection.yaml b/...configs/existing-topology-reflection.yaml → ...configs/existing-topology-reflection.yaml
diff --git a/...es/configs/existing-topology-trident.yaml → ...es/configs/existing-topology-trident.yaml b/...es/configs/existing-topology-trident.yaml → ...es/configs/existing-topology-trident.yaml
diff --git a/.../resources/configs/existing-topology.yaml → .../resources/configs/existing-topology.yaml b/.../resources/configs/existing-topology.yaml → .../resources/configs/existing-topology.yaml
diff --git a/...src/test/resources/configs/hdfs_test.yaml → ...src/test/resources/configs/hdfs_test.yaml b/...src/test/resources/configs/hdfs_test.yaml → ...src/test/resources/configs/hdfs_test.yaml
diff --git a/.../test/resources/configs/include_test.yaml → .../test/resources/configs/include_test.yaml b/.../test/resources/configs/include_test.yaml → .../test/resources/configs/include_test.yaml
diff --git a/...es/configs/invalid-existing-topology.yaml → ...es/configs/invalid-existing-topology.yaml b/...es/configs/invalid-existing-topology.yaml → ...es/configs/invalid-existing-topology.yaml
diff --git a/...rc/test/resources/configs/kafka_test.yaml → ...rc/test/resources/configs/kafka_test.yaml b/...rc/test/resources/configs/kafka_test.yaml → ...rc/test/resources/configs/kafka_test.yaml
diff --git a/...rc/test/resources/configs/shell_test.yaml → ...rc/test/resources/configs/shell_test.yaml b/...rc/test/resources/configs/shell_test.yaml → ...rc/test/resources/configs/shell_test.yaml
diff --git a/.../test/resources/configs/simple_hbase.yaml → .../test/resources/configs/simple_hbase.yaml b/.../test/resources/configs/simple_hbase.yaml → .../test/resources/configs/simple_hbase.yaml
diff --git a/.../resources/configs/substitution-test.yaml → .../resources/configs/substitution-test.yaml b/.../resources/configs/substitution-test.yaml → .../resources/configs/substitution-test.yaml
diff --git a/...-core/src/test/resources/configs/tck.yaml → ...-core/src/test/resources/configs/tck.yaml b/...-core/src/test/resources/configs/tck.yaml → ...-core/src/test/resources/configs/tck.yaml
diff --git a/...rc/test/resources/configs/test.properties → ...rc/test/resources/configs/test.properties b/...rc/test/resources/configs/test.properties → ...rc/test/resources/configs/test.properties
diff --git a/...x/flux-core/src/test/resources/log4j2.xml → flux/flux-core/src/test/resources/log4j2.xml b/...x/flux-core/src/test/resources/log4j2.xml → flux/flux-core/src/test/resources/log4j2.xml
diff --git a/external/flux/flux-examples/README.md → flux/flux-examples/README.md b/external/flux/flux-examples/README.md → flux/flux-examples/README.md
diff --git a/external/flux/flux-examples/pom.xml → flux/flux-examples/pom.xml b/external/flux/flux-examples/pom.xml → flux/flux-examples/pom.xml
diff --git a/...rm/flux/examples/StatefulWordCounter.java → ...rm/flux/examples/StatefulWordCounter.java b/...rm/flux/examples/StatefulWordCounter.java → ...rm/flux/examples/StatefulWordCounter.java
diff --git a/...he/storm/flux/examples/TestPrintBolt.java → ...he/storm/flux/examples/TestPrintBolt.java b/...he/storm/flux/examples/TestPrintBolt.java → ...he/storm/flux/examples/TestPrintBolt.java
diff --git a/...e/storm/flux/examples/TestWindowBolt.java → ...e/storm/flux/examples/TestWindowBolt.java b/...e/storm/flux/examples/TestWindowBolt.java → ...e/storm/flux/examples/TestWindowBolt.java
diff --git a/.../storm/flux/examples/WordCountClient.java → .../storm/flux/examples/WordCountClient.java b/.../storm/flux/examples/WordCountClient.java → .../storm/flux/examples/WordCountClient.java
diff --git a/...ache/storm/flux/examples/WordCounter.java → ...ache/storm/flux/examples/WordCounter.java b/...ache/storm/flux/examples/WordCounter.java → ...ache/storm/flux/examples/WordCounter.java
diff --git a/.../src/main/resources/hbase_bolt.properties → .../src/main/resources/hbase_bolt.properties b/.../src/main/resources/hbase_bolt.properties → .../src/main/resources/hbase_bolt.properties
diff --git a/...s/src/main/resources/hdfs_bolt.properties → ...s/src/main/resources/hdfs_bolt.properties b/...s/src/main/resources/hdfs_bolt.properties → ...s/src/main/resources/hdfs_bolt.properties
diff --git a/...mples/src/main/resources/kafka_spout.yaml → ...mples/src/main/resources/kafka_spout.yaml b/...mples/src/main/resources/kafka_spout.yaml → ...mples/src/main/resources/kafka_spout.yaml
diff --git a/...xamples/src/main/resources/multilang.yaml → ...xamples/src/main/resources/multilang.yaml b/...xamples/src/main/resources/multilang.yaml → ...xamples/src/main/resources/multilang.yaml
diff --git a/...ples/src/main/resources/simple_hbase.yaml → ...ples/src/main/resources/simple_hbase.yaml b/...ples/src/main/resources/simple_hbase.yaml → ...ples/src/main/resources/simple_hbase.yaml
diff --git a/...mples/src/main/resources/simple_hdfs.yaml → ...mples/src/main/resources/simple_hdfs.yaml b/...mples/src/main/resources/simple_hdfs.yaml → ...mples/src/main/resources/simple_hdfs.yaml
diff --git a/.../resources/simple_stateful_wordcount.yaml → .../resources/simple_stateful_wordcount.yaml b/.../resources/simple_stateful_wordcount.yaml → .../resources/simple_stateful_wordcount.yaml
diff --git a/.../src/main/resources/simple_windowing.yaml → .../src/main/resources/simple_windowing.yaml b/.../src/main/resources/simple_windowing.yaml → .../src/main/resources/simple_windowing.yaml
diff --git a/.../src/main/resources/simple_wordcount.yaml → .../src/main/resources/simple_wordcount.yaml b/.../src/main/resources/simple_wordcount.yaml → .../src/main/resources/simple_wordcount.yaml
diff --git a/external/flux/flux-ui/README.md → flux/flux-ui/README.md b/external/flux/flux-ui/README.md → flux/flux-ui/README.md
diff --git a/external/flux/flux-wrappers/pom.xml → flux/flux-wrappers/pom.xml b/external/flux/flux-wrappers/pom.xml → flux/flux-wrappers/pom.xml
diff --git a/...rm/flux/wrappers/bolts/FluxShellBolt.java → ...rm/flux/wrappers/bolts/FluxShellBolt.java b/...rm/flux/wrappers/bolts/FluxShellBolt.java → ...rm/flux/wrappers/bolts/FluxShellBolt.java
diff --git a/...torm/flux/wrappers/bolts/LogInfoBolt.java → ...torm/flux/wrappers/bolts/LogInfoBolt.java b/...torm/flux/wrappers/bolts/LogInfoBolt.java → ...torm/flux/wrappers/bolts/LogInfoBolt.java
diff --git a/.../flux/wrappers/spouts/FluxShellSpout.java → .../flux/wrappers/spouts/FluxShellSpout.java b/.../flux/wrappers/spouts/FluxShellSpout.java → .../flux/wrappers/spouts/FluxShellSpout.java
diff --git a/...ain/resources/resources/randomsentence.js → ...ain/resources/resources/randomsentence.js b/...ain/resources/resources/randomsentence.js → ...ain/resources/resources/randomsentence.js
diff --git a/...main/resources/resources/splitsentence.py → ...main/resources/resources/splitsentence.py b/...main/resources/resources/splitsentence.py → ...main/resources/resources/splitsentence.py
diff --git a/external/flux/pom.xml → flux/pom.xml b/external/flux/pom.xml → flux/pom.xml
@@ -27,7 +27,7 @@
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <developers>

diff --git a/pom.xml b/pom.xml
@@ -320,6 +320,9 @@
         <module>storm-drpc-server</module>
         <module>storm-rename-hack</module>
         <module>storm-clojure</module>
+        <module>storm-submit-tools</module>
+        <module>flux</module>
+        <module>sql</module>
 
         <!-- externals -->
         <module>external/storm-kafka</module>
@@ -329,8 +332,6 @@
         <module>external/storm-jdbc</module>
         <module>external/storm-redis</module>
         <module>external/storm-eventhubs</module>
-        <module>external/flux</module>
-        <module>external/sql</module>
         <module>external/storm-elasticsearch</module>
         <module>external/storm-solr</module>
         <module>external/storm-metrics</module>
@@ -342,7 +343,6 @@
         <module>external/storm-kafka-monitor</module>
         <module>external/storm-kinesis</module>
         <module>external/storm-druid</module>
-        <module>external/storm-submit-tools</module>
         <module>external/storm-jms</module>
         <module>external/storm-pmml</module>
 

diff --git a/external/sql/README.md → sql/README.md b/external/sql/README.md → sql/README.md
diff --git a/external/sql/pom.xml → sql/pom.xml b/external/sql/pom.xml → sql/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>sql</artifactId>

diff --git a/external/sql/storm-sql-core/pom.xml → sql/storm-sql-core/pom.xml b/external/sql/storm-sql-core/pom.xml → sql/storm-sql-core/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>storm-sql-core</artifactId>

diff --git a/...ql/storm-sql-core/src/codegen/config.fmpp → sql/storm-sql-core/src/codegen/config.fmpp b/...ql/storm-sql-core/src/codegen/config.fmpp → sql/storm-sql-core/src/codegen/config.fmpp
diff --git a/...torm-sql-core/src/codegen/data/Parser.tdd → ...torm-sql-core/src/codegen/data/Parser.tdd b/...torm-sql-core/src/codegen/data/Parser.tdd → ...torm-sql-core/src/codegen/data/Parser.tdd
diff --git a/...sql-core/src/codegen/includes/license.ftl → ...sql-core/src/codegen/includes/license.ftl b/...sql-core/src/codegen/includes/license.ftl → ...sql-core/src/codegen/includes/license.ftl
diff --git a/...core/src/codegen/includes/parserImpls.ftl → ...core/src/codegen/includes/parserImpls.ftl b/...core/src/codegen/includes/parserImpls.ftl → ...core/src/codegen/includes/parserImpls.ftl
diff --git a/...e/storm/sql/AbstractTridentProcessor.java → ...e/storm/sql/AbstractTridentProcessor.java b/...e/storm/sql/AbstractTridentProcessor.java → ...e/storm/sql/AbstractTridentProcessor.java
@@ -19,12 +19,10 @@
 
 import org.apache.calcite.DataContext;
 import org.apache.storm.sql.javac.CompilingClassLoader;
-import org.apache.storm.sql.runtime.ISqlTridentDataSource;
 import org.apache.storm.trident.Stream;
 import org.apache.storm.trident.TridentTopology;
 
 import java.util.List;
-import java.util.Map;
 
 public abstract class AbstractTridentProcessor {
   protected Stream outputStream;

diff --git a/...rc/jvm/org/apache/storm/sql/StormSql.java → ...rc/jvm/org/apache/storm/sql/StormSql.java b/...rc/jvm/org/apache/storm/sql/StormSql.java → ...rc/jvm/org/apache/storm/sql/StormSql.java
diff --git a/...vm/org/apache/storm/sql/StormSqlImpl.java → ...vm/org/apache/storm/sql/StormSqlImpl.java b/...vm/org/apache/storm/sql/StormSqlImpl.java → ...vm/org/apache/storm/sql/StormSqlImpl.java
diff --git a/.../org/apache/storm/sql/StormSqlRunner.java → .../org/apache/storm/sql/StormSqlRunner.java b/.../org/apache/storm/sql/StormSqlRunner.java → .../org/apache/storm/sql/StormSqlRunner.java
diff --git a/.../sql/calcite/ParallelStreamableTable.java → .../sql/calcite/ParallelStreamableTable.java b/.../sql/calcite/ParallelStreamableTable.java → .../sql/calcite/ParallelStreamableTable.java
diff --git a/...ache/storm/sql/compiler/CompilerUtil.java → ...ache/storm/sql/compiler/CompilerUtil.java b/...ache/storm/sql/compiler/CompilerUtil.java → ...ache/storm/sql/compiler/CompilerUtil.java
diff --git a/...l/compiler/RexNodeToJavaCodeCompiler.java → ...l/compiler/RexNodeToJavaCodeCompiler.java b/...l/compiler/RexNodeToJavaCodeCompiler.java → ...l/compiler/RexNodeToJavaCodeCompiler.java
diff --git a/...sql/compiler/StormSqlTypeFactoryImpl.java → ...sql/compiler/StormSqlTypeFactoryImpl.java b/...sql/compiler/StormSqlTypeFactoryImpl.java → ...sql/compiler/StormSqlTypeFactoryImpl.java
diff --git a/...standalone/BuiltinAggregateFunctions.java → ...standalone/BuiltinAggregateFunctions.java b/...standalone/BuiltinAggregateFunctions.java → ...standalone/BuiltinAggregateFunctions.java
diff --git a/...ler/backends/standalone/PlanCompiler.java → ...ler/backends/standalone/PlanCompiler.java b/...ler/backends/standalone/PlanCompiler.java → ...ler/backends/standalone/PlanCompiler.java
diff --git a/...s/standalone/PostOrderRelNodeVisitor.java → ...s/standalone/PostOrderRelNodeVisitor.java b/...s/standalone/PostOrderRelNodeVisitor.java → ...s/standalone/PostOrderRelNodeVisitor.java
diff --git a/.../backends/standalone/RelNodeCompiler.java → .../backends/standalone/RelNodeCompiler.java b/.../backends/standalone/RelNodeCompiler.java → .../backends/standalone/RelNodeCompiler.java
diff --git a/...storm/sql/javac/CompilingClassLoader.java → ...storm/sql/javac/CompilingClassLoader.java b/...storm/sql/javac/CompilingClassLoader.java → ...storm/sql/javac/CompilingClassLoader.java
diff --git a/...he/storm/sql/parser/ColumnConstraint.java → ...he/storm/sql/parser/ColumnConstraint.java b/...he/storm/sql/parser/ColumnConstraint.java → ...he/storm/sql/parser/ColumnConstraint.java
diff --git a/...he/storm/sql/parser/ColumnDefinition.java → ...he/storm/sql/parser/ColumnDefinition.java b/...he/storm/sql/parser/ColumnDefinition.java → ...he/storm/sql/parser/ColumnDefinition.java
diff --git a/...e/storm/sql/parser/SqlCreateFunction.java → ...e/storm/sql/parser/SqlCreateFunction.java b/...e/storm/sql/parser/SqlCreateFunction.java → ...e/storm/sql/parser/SqlCreateFunction.java
diff --git a/...ache/storm/sql/parser/SqlCreateTable.java → ...ache/storm/sql/parser/SqlCreateTable.java b/...ache/storm/sql/parser/SqlCreateTable.java → ...ache/storm/sql/parser/SqlCreateTable.java
diff --git a/...ache/storm/sql/parser/SqlDDLKeywords.java → ...ache/storm/sql/parser/SqlDDLKeywords.java b/...ache/storm/sql/parser/SqlDDLKeywords.java → ...ache/storm/sql/parser/SqlDDLKeywords.java
diff --git a/.../apache/storm/sql/parser/StormParser.java → .../apache/storm/sql/parser/StormParser.java b/.../apache/storm/sql/parser/StormParser.java → .../apache/storm/sql/parser/StormParser.java
diff --git a/.../apache/storm/sql/parser/UnparseUtil.java → .../apache/storm/sql/parser/UnparseUtil.java b/.../apache/storm/sql/parser/UnparseUtil.java → .../apache/storm/sql/parser/UnparseUtil.java
@@ -17,7 +17,6 @@
  */
 package org.apache.storm.sql.parser;
 
-import org.apache.calcite.sql.SqlIdentifier;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.SqlNodeList;
 import org.apache.calcite.sql.SqlWriter;

diff --git a/...m/sql/planner/StormRelDataTypeSystem.java → ...m/sql/planner/StormRelDataTypeSystem.java b/...m/sql/planner/StormRelDataTypeSystem.java → ...m/sql/planner/StormRelDataTypeSystem.java
diff --git a/...ache/storm/sql/planner/StormRelUtils.java → ...ache/storm/sql/planner/StormRelUtils.java b/...ache/storm/sql/planner/StormRelUtils.java → ...ache/storm/sql/planner/StormRelUtils.java
diff --git a/.../planner/UnsupportedOperatorsVisitor.java → .../planner/UnsupportedOperatorsVisitor.java b/.../planner/UnsupportedOperatorsVisitor.java → .../planner/UnsupportedOperatorsVisitor.java
diff --git a/...orm/sql/planner/rel/StormCalcRelBase.java → ...orm/sql/planner/rel/StormCalcRelBase.java b/...orm/sql/planner/rel/StormCalcRelBase.java → ...orm/sql/planner/rel/StormCalcRelBase.java
@@ -23,7 +23,6 @@
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rel.core.Calc;
 import org.apache.calcite.rex.RexProgram;
-import org.apache.storm.sql.planner.rel.StormRelNode;
 
 public abstract class StormCalcRelBase extends Calc implements StormRelNode {
     protected StormCalcRelBase(RelOptCluster cluster, RelTraitSet traits, RelNode child, RexProgram program) {

diff --git a/...m/sql/planner/rel/StormFilterRelBase.java → ...m/sql/planner/rel/StormFilterRelBase.java b/...m/sql/planner/rel/StormFilterRelBase.java → ...m/sql/planner/rel/StormFilterRelBase.java
@@ -23,7 +23,6 @@
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rel.core.Filter;
 import org.apache.calcite.rex.RexNode;
-import org.apache.storm.sql.planner.rel.StormRelNode;
 
 public abstract class StormFilterRelBase extends Filter implements StormRelNode {
     protected StormFilterRelBase(RelOptCluster cluster, RelTraitSet traits, RelNode child, RexNode condition) {

diff --git a/...orm/sql/planner/rel/StormJoinRelBase.java → ...orm/sql/planner/rel/StormJoinRelBase.java b/...orm/sql/planner/rel/StormJoinRelBase.java → ...orm/sql/planner/rel/StormJoinRelBase.java
@@ -25,7 +25,6 @@
 import org.apache.calcite.rel.core.Join;
 import org.apache.calcite.rel.core.JoinRelType;
 import org.apache.calcite.rex.RexNode;
-import org.apache.storm.sql.planner.rel.StormRelNode;
 
 import java.util.Set;
 

diff --git a/.../sql/planner/rel/StormProjectRelBase.java → .../sql/planner/rel/StormProjectRelBase.java b/.../sql/planner/rel/StormProjectRelBase.java → .../sql/planner/rel/StormProjectRelBase.java
@@ -24,7 +24,6 @@
 import org.apache.calcite.rel.core.Project;
 import org.apache.calcite.rel.type.RelDataType;
 import org.apache.calcite.rex.RexNode;
-import org.apache.storm.sql.planner.rel.StormRelNode;
 
 import java.util.List;
 

diff --git a/...e/storm/sql/planner/rel/StormRelNode.java → ...e/storm/sql/planner/rel/StormRelNode.java b/...e/storm/sql/planner/rel/StormRelNode.java → ...e/storm/sql/planner/rel/StormRelNode.java
diff --git a/...planner/rel/StormStreamInsertRelBase.java → ...planner/rel/StormStreamInsertRelBase.java b/...planner/rel/StormStreamInsertRelBase.java → ...planner/rel/StormStreamInsertRelBase.java
@@ -25,7 +25,6 @@
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rel.core.TableModify;
 import org.apache.calcite.rex.RexNode;
-import org.apache.storm.sql.planner.rel.StormRelNode;
 
 import java.util.List;
 

diff --git a/...l/planner/rel/StormStreamScanRelBase.java → ...l/planner/rel/StormStreamScanRelBase.java b/...l/planner/rel/StormStreamScanRelBase.java → ...l/planner/rel/StormStreamScanRelBase.java
@@ -22,7 +22,6 @@
 import org.apache.calcite.plan.RelOptTable;
 import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.core.TableScan;
-import org.apache.storm.sql.planner.rel.StormRelNode;
 
 public abstract class StormStreamScanRelBase extends TableScan implements StormRelNode {
 

diff --git a/...orm/sql/planner/trident/QueryPlanner.java → ...orm/sql/planner/trident/QueryPlanner.java b/...orm/sql/planner/trident/QueryPlanner.java → ...orm/sql/planner/trident/QueryPlanner.java
diff --git a/...l/planner/trident/TridentPlanCreator.java → ...l/planner/trident/TridentPlanCreator.java b/...l/planner/trident/TridentPlanCreator.java → ...l/planner/trident/TridentPlanCreator.java
@@ -19,7 +19,6 @@
 
 import org.apache.calcite.DataContext;
 import org.apache.calcite.adapter.java.JavaTypeFactory;
-import org.apache.calcite.interpreter.Scalar;
 import org.apache.calcite.rel.type.RelDataType;
 import org.apache.calcite.rex.RexBuilder;
 import org.apache.calcite.rex.RexNode;
@@ -36,7 +35,6 @@
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Deque;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 

diff --git a/...planner/trident/TridentStormRuleSets.java → ...planner/trident/TridentStormRuleSets.java b/...planner/trident/TridentStormRuleSets.java → ...planner/trident/TridentStormRuleSets.java
diff --git a/...l/planner/trident/rel/TridentCalcRel.java → ...l/planner/trident/rel/TridentCalcRel.java b/...l/planner/trident/rel/TridentCalcRel.java → ...l/planner/trident/rel/TridentCalcRel.java
diff --git a/...planner/trident/rel/TridentFilterRel.java → ...planner/trident/rel/TridentFilterRel.java b/...planner/trident/rel/TridentFilterRel.java → ...planner/trident/rel/TridentFilterRel.java
diff --git a/...trident/rel/TridentLogicalConvention.java → ...trident/rel/TridentLogicalConvention.java b/...trident/rel/TridentLogicalConvention.java → ...trident/rel/TridentLogicalConvention.java
diff --git a/...lanner/trident/rel/TridentProjectRel.java → ...lanner/trident/rel/TridentProjectRel.java b/...lanner/trident/rel/TridentProjectRel.java → ...lanner/trident/rel/TridentProjectRel.java
diff --git a/...m/sql/planner/trident/rel/TridentRel.java → ...m/sql/planner/trident/rel/TridentRel.java b/...m/sql/planner/trident/rel/TridentRel.java → ...m/sql/planner/trident/rel/TridentRel.java
@@ -17,7 +17,6 @@
  */
 package org.apache.storm.sql.planner.trident.rel;
 
-import org.apache.calcite.plan.Convention;
 import org.apache.storm.sql.planner.rel.StormRelNode;
 import org.apache.storm.sql.planner.trident.TridentPlanCreator;
 

diff --git a/...r/trident/rel/TridentStreamInsertRel.java → ...r/trident/rel/TridentStreamInsertRel.java b/...r/trident/rel/TridentStreamInsertRel.java → ...r/trident/rel/TridentStreamInsertRel.java
diff --git a/...ner/trident/rel/TridentStreamScanRel.java → ...ner/trident/rel/TridentStreamScanRel.java b/...ner/trident/rel/TridentStreamScanRel.java → ...ner/trident/rel/TridentStreamScanRel.java
diff --git a/...r/trident/rules/TridentAggregateRule.java → ...r/trident/rules/TridentAggregateRule.java b/...r/trident/rules/TridentAggregateRule.java → ...r/trident/rules/TridentAggregateRule.java
diff --git a/...lanner/trident/rules/TridentCalcRule.java → ...lanner/trident/rules/TridentCalcRule.java b/...lanner/trident/rules/TridentCalcRule.java → ...lanner/trident/rules/TridentCalcRule.java
diff --git a/...nner/trident/rules/TridentFilterRule.java → ...nner/trident/rules/TridentFilterRule.java b/...nner/trident/rules/TridentFilterRule.java → ...nner/trident/rules/TridentFilterRule.java
diff --git a/...lanner/trident/rules/TridentJoinRule.java → ...lanner/trident/rules/TridentJoinRule.java b/...lanner/trident/rules/TridentJoinRule.java → ...lanner/trident/rules/TridentJoinRule.java
diff --git a/...nner/trident/rules/TridentModifyRule.java → ...nner/trident/rules/TridentModifyRule.java b/...nner/trident/rules/TridentModifyRule.java → ...nner/trident/rules/TridentModifyRule.java
diff --git a/...ner/trident/rules/TridentProjectRule.java → ...ner/trident/rules/TridentProjectRule.java b/...ner/trident/rules/TridentProjectRule.java → ...ner/trident/rules/TridentProjectRule.java
diff --git a/...lanner/trident/rules/TridentScanRule.java → ...lanner/trident/rules/TridentScanRule.java b/...lanner/trident/rules/TridentScanRule.java → ...lanner/trident/rules/TridentScanRule.java
diff --git a/...st/org/apache/storm/sql/TestStormSql.java → ...st/org/apache/storm/sql/TestStormSql.java b/...st/org/apache/storm/sql/TestStormSql.java → ...st/org/apache/storm/sql/TestStormSql.java
diff --git a/.../storm/sql/compiler/TestExprSemantic.java → .../storm/sql/compiler/TestExprSemantic.java b/.../storm/sql/compiler/TestExprSemantic.java → .../storm/sql/compiler/TestExprSemantic.java
diff --git a/...ackends/standalone/TestCompilerUtils.java → ...ackends/standalone/TestCompilerUtils.java b/...ackends/standalone/TestCompilerUtils.java → ...ackends/standalone/TestCompilerUtils.java
diff --git a/...backends/standalone/TestPlanCompiler.java → ...backends/standalone/TestPlanCompiler.java b/...backends/standalone/TestPlanCompiler.java → ...backends/standalone/TestPlanCompiler.java
diff --git a/...kends/standalone/TestRelNodeCompiler.java → ...kends/standalone/TestRelNodeCompiler.java b/...kends/standalone/TestRelNodeCompiler.java → ...kends/standalone/TestRelNodeCompiler.java
diff --git a/...r/backends/trident/TestCompilerUtils.java → ...r/backends/trident/TestCompilerUtils.java b/...r/backends/trident/TestCompilerUtils.java → ...r/backends/trident/TestCompilerUtils.java
diff --git a/...er/backends/trident/TestPlanCompiler.java → ...er/backends/trident/TestPlanCompiler.java b/...er/backends/trident/TestPlanCompiler.java → ...er/backends/trident/TestPlanCompiler.java
@@ -20,10 +20,8 @@
 package org.apache.storm.sql.compiler.backends.trident;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
 import org.apache.calcite.DataContext;
 import org.apache.calcite.avatica.util.DateTimeUtils;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.storm.Config;
 import org.apache.storm.LocalCluster;
 import org.apache.storm.LocalCluster.LocalTopology;
@@ -45,7 +43,6 @@
 import java.time.ZoneOffset;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
 

diff --git a/...pache/storm/sql/parser/TestSqlParser.java → ...pache/storm/sql/parser/TestSqlParser.java b/...pache/storm/sql/parser/TestSqlParser.java → ...pache/storm/sql/parser/TestSqlParser.java
diff --git a/...storm-sql-external/storm-sql-hdfs/pom.xml → ...storm-sql-external/storm-sql-hdfs/pom.xml b/...storm-sql-external/storm-sql-hdfs/pom.xml → ...storm-sql-external/storm-sql-hdfs/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../../../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>storm-sql-hdfs</artifactId>

diff --git a/...orm/sql/hdfs/HdfsDataSourcesProvider.java → ...orm/sql/hdfs/HdfsDataSourcesProvider.java b/...orm/sql/hdfs/HdfsDataSourcesProvider.java → ...orm/sql/hdfs/HdfsDataSourcesProvider.java
diff --git a/...che.storm.sql.runtime.DataSourcesProvider → ...che.storm.sql.runtime.DataSourcesProvider b/...che.storm.sql.runtime.DataSourcesProvider → ...che.storm.sql.runtime.DataSourcesProvider
diff --git a/...sql/hdfs/TestHdfsDataSourcesProvider.java → ...sql/hdfs/TestHdfsDataSourcesProvider.java b/...sql/hdfs/TestHdfsDataSourcesProvider.java → ...sql/hdfs/TestHdfsDataSourcesProvider.java
diff --git a/...torm-sql-external/storm-sql-kafka/pom.xml → ...torm-sql-external/storm-sql-kafka/pom.xml b/...torm-sql-external/storm-sql-kafka/pom.xml → ...torm-sql-external/storm-sql-kafka/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../../../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>storm-sql-kafka</artifactId>

diff --git a/...m/sql/kafka/KafkaDataSourcesProvider.java → ...m/sql/kafka/KafkaDataSourcesProvider.java b/...m/sql/kafka/KafkaDataSourcesProvider.java → ...m/sql/kafka/KafkaDataSourcesProvider.java
diff --git a/...che.storm.sql.runtime.DataSourcesProvider → ...che.storm.sql.runtime.DataSourcesProvider b/...che.storm.sql.runtime.DataSourcesProvider → ...che.storm.sql.runtime.DataSourcesProvider
diff --git a/...l/kafka/TestKafkaDataSourcesProvider.java → ...l/kafka/TestKafkaDataSourcesProvider.java b/...l/kafka/TestKafkaDataSourcesProvider.java → ...l/kafka/TestKafkaDataSourcesProvider.java
diff --git a/...rm-sql-external/storm-sql-mongodb/pom.xml → ...rm-sql-external/storm-sql-mongodb/pom.xml b/...rm-sql-external/storm-sql-mongodb/pom.xml → ...rm-sql-external/storm-sql-mongodb/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../../../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>storm-sql-mongodb</artifactId>

diff --git a/...sql/mongodb/MongoDataSourcesProvider.java → ...sql/mongodb/MongoDataSourcesProvider.java b/...sql/mongodb/MongoDataSourcesProvider.java → ...sql/mongodb/MongoDataSourcesProvider.java
diff --git a/...che.storm.sql.runtime.DataSourcesProvider → ...che.storm.sql.runtime.DataSourcesProvider b/...che.storm.sql.runtime.DataSourcesProvider → ...che.storm.sql.runtime.DataSourcesProvider
diff --git a/...mongodb/TestMongoDataSourcesProvider.java → ...mongodb/TestMongoDataSourcesProvider.java b/...mongodb/TestMongoDataSourcesProvider.java → ...mongodb/TestMongoDataSourcesProvider.java
diff --git a/...torm-sql-external/storm-sql-redis/pom.xml → ...torm-sql-external/storm-sql-redis/pom.xml b/...torm-sql-external/storm-sql-redis/pom.xml → ...torm-sql-external/storm-sql-redis/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../../../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>storm-sql-redis</artifactId>

diff --git a/...m/sql/redis/RedisDataSourcesProvider.java → ...m/sql/redis/RedisDataSourcesProvider.java b/...m/sql/redis/RedisDataSourcesProvider.java → ...m/sql/redis/RedisDataSourcesProvider.java
diff --git a/...che.storm.sql.runtime.DataSourcesProvider → ...che.storm.sql.runtime.DataSourcesProvider b/...che.storm.sql.runtime.DataSourcesProvider → ...che.storm.sql.runtime.DataSourcesProvider
diff --git a/...l/redis/TestRedisDataSourcesProvider.java → ...l/redis/TestRedisDataSourcesProvider.java b/...l/redis/TestRedisDataSourcesProvider.java → ...l/redis/TestRedisDataSourcesProvider.java
diff --git a/external/sql/storm-sql-runtime/pom.xml → sql/storm-sql-runtime/pom.xml b/external/sql/storm-sql-runtime/pom.xml → sql/storm-sql-runtime/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>storm-sql-runtime</artifactId>

diff --git a/...che/calcite/interpreter/StormContext.java → ...che/calcite/interpreter/StormContext.java b/...che/calcite/interpreter/StormContext.java → ...che/calcite/interpreter/StormContext.java
diff --git a/...m/sql/runtime/AbstractChannelHandler.java → ...m/sql/runtime/AbstractChannelHandler.java b/...m/sql/runtime/AbstractChannelHandler.java → ...m/sql/runtime/AbstractChannelHandler.java
diff --git a/.../sql/runtime/AbstractValuesProcessor.java → .../sql/runtime/AbstractValuesProcessor.java b/.../sql/runtime/AbstractValuesProcessor.java → .../sql/runtime/AbstractValuesProcessor.java
@@ -18,8 +18,6 @@
 package org.apache.storm.sql.runtime;
 
 import org.apache.storm.tuple.Values;
-import org.apache.storm.sql.runtime.ChannelHandler;
-import org.apache.storm.sql.runtime.DataSource;
 
 import java.util.Map;
 

diff --git a/...che/storm/sql/runtime/ChannelContext.java → ...che/storm/sql/runtime/ChannelContext.java b/...che/storm/sql/runtime/ChannelContext.java → ...che/storm/sql/runtime/ChannelContext.java
diff --git a/...che/storm/sql/runtime/ChannelHandler.java → ...che/storm/sql/runtime/ChannelHandler.java b/...che/storm/sql/runtime/ChannelHandler.java → ...che/storm/sql/runtime/ChannelHandler.java
diff --git a/...rg/apache/storm/sql/runtime/Channels.java → ...rg/apache/storm/sql/runtime/Channels.java b/...rg/apache/storm/sql/runtime/Channels.java → ...rg/apache/storm/sql/runtime/Channels.java
diff --git a/.../apache/storm/sql/runtime/DataSource.java → .../apache/storm/sql/runtime/DataSource.java b/.../apache/storm/sql/runtime/DataSource.java → .../apache/storm/sql/runtime/DataSource.java
diff --git a/...torm/sql/runtime/DataSourcesProvider.java → ...torm/sql/runtime/DataSourcesProvider.java b/...torm/sql/runtime/DataSourcesProvider.java → ...torm/sql/runtime/DataSourcesProvider.java
diff --git a/...torm/sql/runtime/DataSourcesRegistry.java → ...torm/sql/runtime/DataSourcesRegistry.java b/...torm/sql/runtime/DataSourcesRegistry.java → ...torm/sql/runtime/DataSourcesRegistry.java
diff --git a/...g/apache/storm/sql/runtime/FieldInfo.java → ...g/apache/storm/sql/runtime/FieldInfo.java b/...g/apache/storm/sql/runtime/FieldInfo.java → ...g/apache/storm/sql/runtime/FieldInfo.java
diff --git a/.../storm/sql/runtime/IOutputSerializer.java → .../storm/sql/runtime/IOutputSerializer.java b/.../storm/sql/runtime/IOutputSerializer.java → .../storm/sql/runtime/IOutputSerializer.java
diff --git a/...rm/sql/runtime/ISqlTridentDataSource.java → ...rm/sql/runtime/ISqlTridentDataSource.java b/...rm/sql/runtime/ISqlTridentDataSource.java → ...rm/sql/runtime/ISqlTridentDataSource.java
diff --git a/...sql/runtime/SimpleSqlTridentConsumer.java → ...sql/runtime/SimpleSqlTridentConsumer.java b/...sql/runtime/SimpleSqlTridentConsumer.java → ...sql/runtime/SimpleSqlTridentConsumer.java
diff --git a/.../storm/sql/runtime/StormSqlFunctions.java → .../storm/sql/runtime/StormSqlFunctions.java b/.../storm/sql/runtime/StormSqlFunctions.java → .../storm/sql/runtime/StormSqlFunctions.java
diff --git a/...lcite/DebuggableExecutableExpression.java → ...lcite/DebuggableExecutableExpression.java b/...lcite/DebuggableExecutableExpression.java → ...lcite/DebuggableExecutableExpression.java
diff --git a/...runtime/calcite/ExecutableExpression.java → ...runtime/calcite/ExecutableExpression.java b/...runtime/calcite/ExecutableExpression.java → ...runtime/calcite/ExecutableExpression.java
diff --git a/...sql/runtime/calcite/StormDataContext.java → ...sql/runtime/calcite/StormDataContext.java b/...sql/runtime/calcite/StormDataContext.java → ...sql/runtime/calcite/StormDataContext.java
diff --git a/...rce/socket/SocketDataSourcesProvider.java → ...rce/socket/SocketDataSourcesProvider.java b/...rce/socket/SocketDataSourcesProvider.java → ...rce/socket/SocketDataSourcesProvider.java
@@ -28,7 +28,6 @@
 import org.apache.storm.sql.runtime.datasource.socket.trident.SocketState;
 import org.apache.storm.sql.runtime.datasource.socket.trident.SocketStateUpdater;
 import org.apache.storm.sql.runtime.datasource.socket.trident.TridentSocketSpout;
-import org.apache.storm.sql.runtime.serde.json.JsonSerializer;
 import org.apache.storm.sql.runtime.utils.FieldInfoUtils;
 import org.apache.storm.sql.runtime.utils.SerdeUtils;
 import org.apache.storm.trident.spout.ITridentDataSource;

diff --git a/...atasource/socket/trident/SocketState.java → ...atasource/socket/trident/SocketState.java b/...atasource/socket/trident/SocketState.java → ...atasource/socket/trident/SocketState.java
diff --git a/...ce/socket/trident/SocketStateUpdater.java → ...ce/socket/trident/SocketStateUpdater.java b/...ce/socket/trident/SocketStateUpdater.java → ...ce/socket/trident/SocketStateUpdater.java
diff --git a/...ce/socket/trident/TridentSocketSpout.java → ...ce/socket/trident/TridentSocketSpout.java b/...ce/socket/trident/TridentSocketSpout.java → ...ce/socket/trident/TridentSocketSpout.java
diff --git a/...rm/sql/runtime/serde/avro/AvroScheme.java → ...rm/sql/runtime/serde/avro/AvroScheme.java b/...rm/sql/runtime/serde/avro/AvroScheme.java → ...rm/sql/runtime/serde/avro/AvroScheme.java
diff --git a/...ql/runtime/serde/avro/AvroSerializer.java → ...ql/runtime/serde/avro/AvroSerializer.java b/...ql/runtime/serde/avro/AvroSerializer.java → ...ql/runtime/serde/avro/AvroSerializer.java
diff --git a/...sql/runtime/serde/avro/CachedSchemas.java → ...sql/runtime/serde/avro/CachedSchemas.java b/...sql/runtime/serde/avro/CachedSchemas.java → ...sql/runtime/serde/avro/CachedSchemas.java
diff --git a/...torm/sql/runtime/serde/csv/CsvScheme.java → ...torm/sql/runtime/serde/csv/CsvScheme.java b/...torm/sql/runtime/serde/csv/CsvScheme.java → ...torm/sql/runtime/serde/csv/CsvScheme.java
diff --git a/.../sql/runtime/serde/csv/CsvSerializer.java → .../sql/runtime/serde/csv/CsvSerializer.java b/.../sql/runtime/serde/csv/CsvSerializer.java → .../sql/runtime/serde/csv/CsvSerializer.java
diff --git a/...rm/sql/runtime/serde/json/JsonScheme.java → ...rm/sql/runtime/serde/json/JsonScheme.java b/...rm/sql/runtime/serde/json/JsonScheme.java → ...rm/sql/runtime/serde/json/JsonScheme.java
diff --git a/...ql/runtime/serde/json/JsonSerializer.java → ...ql/runtime/serde/json/JsonSerializer.java b/...ql/runtime/serde/json/JsonSerializer.java → ...ql/runtime/serde/json/JsonSerializer.java
diff --git a/...torm/sql/runtime/serde/tsv/TsvScheme.java → ...torm/sql/runtime/serde/tsv/TsvScheme.java b/...torm/sql/runtime/serde/tsv/TsvScheme.java → ...torm/sql/runtime/serde/tsv/TsvScheme.java
diff --git a/.../sql/runtime/serde/tsv/TsvSerializer.java → .../sql/runtime/serde/tsv/TsvSerializer.java b/.../sql/runtime/serde/tsv/TsvSerializer.java → .../sql/runtime/serde/tsv/TsvSerializer.java
diff --git a/...ime/trident/functions/EvaluationCalc.java → ...ime/trident/functions/EvaluationCalc.java b/...ime/trident/functions/EvaluationCalc.java → ...ime/trident/functions/EvaluationCalc.java
diff --git a/...e/trident/functions/EvaluationFilter.java → ...e/trident/functions/EvaluationFilter.java b/...e/trident/functions/EvaluationFilter.java → ...e/trident/functions/EvaluationFilter.java
diff --git a/...trident/functions/EvaluationFunction.java → ...trident/functions/EvaluationFunction.java b/...trident/functions/EvaluationFunction.java → ...trident/functions/EvaluationFunction.java
diff --git a/...me/trident/functions/ForwardFunction.java → ...me/trident/functions/ForwardFunction.java b/...me/trident/functions/ForwardFunction.java → ...me/trident/functions/ForwardFunction.java
diff --git a/...orm/sql/runtime/utils/FieldInfoUtils.java → ...orm/sql/runtime/utils/FieldInfoUtils.java b/...orm/sql/runtime/utils/FieldInfoUtils.java → ...orm/sql/runtime/utils/FieldInfoUtils.java
diff --git a/...e/storm/sql/runtime/utils/SerdeUtils.java → ...e/storm/sql/runtime/utils/SerdeUtils.java b/...e/storm/sql/runtime/utils/SerdeUtils.java → ...e/storm/sql/runtime/utils/SerdeUtils.java
diff --git a/...apache/storm/sql/runtime/utils/Utils.java → ...apache/storm/sql/runtime/utils/Utils.java b/...apache/storm/sql/runtime/utils/Utils.java → ...apache/storm/sql/runtime/utils/Utils.java
diff --git a/...che.storm.sql.runtime.DataSourcesProvider → ...che.storm.sql.runtime.DataSourcesProvider b/...che.storm.sql.runtime.DataSourcesProvider → ...che.storm.sql.runtime.DataSourcesProvider
diff --git a/.../apache/storm/sql/TestAvroSerializer.java → .../apache/storm/sql/TestAvroSerializer.java b/.../apache/storm/sql/TestAvroSerializer.java → .../apache/storm/sql/TestAvroSerializer.java
diff --git a/...g/apache/storm/sql/TestCsvSerializer.java → ...g/apache/storm/sql/TestCsvSerializer.java b/...g/apache/storm/sql/TestCsvSerializer.java → ...g/apache/storm/sql/TestCsvSerializer.java
diff --git a/...che/storm/sql/TestJsonRepresentation.java → ...che/storm/sql/TestJsonRepresentation.java b/...che/storm/sql/TestJsonRepresentation.java → ...che/storm/sql/TestJsonRepresentation.java
diff --git a/...g/apache/storm/sql/TestTsvSerializer.java → ...g/apache/storm/sql/TestTsvSerializer.java b/...g/apache/storm/sql/TestTsvSerializer.java → ...g/apache/storm/sql/TestTsvSerializer.java
diff --git a/.../test/org/apache/storm/sql/TestUtils.java → .../test/org/apache/storm/sql/TestUtils.java b/.../test/org/apache/storm/sql/TestUtils.java → .../test/org/apache/storm/sql/TestUtils.java
diff --git a/.../socket/TestSocketDataSourceProvider.java → .../socket/TestSocketDataSourceProvider.java b/.../socket/TestSocketDataSourceProvider.java → .../socket/TestSocketDataSourceProvider.java