You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by je...@apache.org on 2015/12/14 20:34:45 UTC
[2/4] storm git commit: Merge branch 'master' of
https://github.com/apache/storm
Merge branch 'master' of https://github.com/apache/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1da0219f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1da0219f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1da0219f
Branch: refs/heads/master
Commit: 1da0219f51b562752633ea538f86848d28569558
Parents: 430df4c 6d7b968
Author: Boyang Jerry Peng <je...@yahoo-inc.com>
Authored: Fri Dec 11 01:21:46 2015 -0600
Committer: Boyang Jerry Peng <je...@yahoo-inc.com>
Committed: Fri Dec 11 01:21:46 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 9 +
README.markdown | 5 +-
bin/storm.py | 18 +-
conf/defaults.yaml | 1 +
dev-tools/travis/travis-install.sh | 12 +-
dev-tools/travis/travis-script.sh | 21 +-
external/sql/README.md | 117 +++++
external/sql/pom.xml | 44 ++
external/sql/storm-sql-core/pom.xml | 261 ++++++++++
.../sql/storm-sql-core/src/codegen/config.fmpp | 23 +
.../storm-sql-core/src/codegen/data/Parser.tdd | 64 +++
.../src/codegen/includes/license.ftl | 17 +
.../src/codegen/includes/parserImpls.ftl | 86 ++++
.../src/jvm/org/apache/storm/sql/StormSql.java | 54 +++
.../jvm/org/apache/storm/sql/StormSqlImpl.java | 187 ++++++++
.../org/apache/storm/sql/StormSqlRunner.java | 44 ++
.../apache/storm/sql/compiler/CompilerUtil.java | 168 +++++++
.../apache/storm/sql/compiler/ExprCompiler.java | 471 +++++++++++++++++++
.../sql/compiler/PostOrderRelNodeVisitor.java | 122 +++++
.../backends/standalone/PlanCompiler.java | 132 ++++++
.../backends/standalone/RelNodeCompiler.java | 111 +++++
.../compiler/backends/trident/PlanCompiler.java | 201 ++++++++
.../backends/trident/RelNodeCompiler.java | 116 +++++
.../storm/sql/javac/CompilingClassLoader.java | 225 +++++++++
.../storm/sql/parser/ColumnConstraint.java | 42 ++
.../storm/sql/parser/ColumnDefinition.java | 44 ++
.../apache/storm/sql/parser/SqlCreateTable.java | 136 ++++++
.../apache/storm/sql/parser/SqlDDLKeywords.java | 27 ++
.../apache/storm/sql/parser/StormParser.java | 42 ++
.../apache/storm/sql/parser/UnparseUtil.java | 60 +++
.../test/org/apache/storm/sql/TestStormSql.java | 82 ++++
.../storm/sql/compiler/TestCompilerUtils.java | 64 +++
.../storm/sql/compiler/TestExprCompiler.java | 93 ++++
.../storm/sql/compiler/TestExprSemantic.java | 140 ++++++
.../backends/standalone/TestPlanCompiler.java | 69 +++
.../standalone/TestRelNodeCompiler.java | 62 +++
.../backends/trident/TestPlanCompiler.java | 116 +++++
.../apache/storm/sql/parser/TestSqlParser.java | 48 ++
external/sql/storm-sql-kafka/pom.xml | 111 +++++
.../org/apache/storm/sql/kafka/JsonScheme.java | 58 +++
.../apache/storm/sql/kafka/JsonSerializer.java | 56 +++
.../sql/kafka/KafkaDataSourcesProvider.java | 205 ++++++++
...apache.storm.sql.runtime.DataSourcesProvider | 16 +
.../storm/sql/kafka/TestJsonRepresentation.java | 50 ++
.../sql/kafka/TestKafkaDataSourcesProvider.java | 114 +++++
external/sql/storm-sql-runtime/pom.xml | 73 +++
.../sql/runtime/AbstractChannelHandler.java | 44 ++
.../sql/runtime/AbstractValuesProcessor.java | 49 ++
.../storm/sql/runtime/ChannelContext.java | 30 ++
.../storm/sql/runtime/ChannelHandler.java | 39 ++
.../org/apache/storm/sql/runtime/Channels.java | 80 ++++
.../apache/storm/sql/runtime/DataSource.java | 29 ++
.../storm/sql/runtime/DataSourcesProvider.java | 49 ++
.../storm/sql/runtime/DataSourcesRegistry.java | 78 +++
.../org/apache/storm/sql/runtime/FieldInfo.java | 45 ++
.../storm/sql/runtime/IOutputSerializer.java | 31 ++
.../sql/runtime/ISqlTridentDataSource.java | 30 ++
.../storm/sql/runtime/StormSqlFunctions.java | 36 ++
.../trident/AbstractTridentProcessor.java | 43 ++
.../test/org/apache/storm/sql/TestUtils.java | 163 +++++++
external/storm-cassandra/README.md | 28 ++
external/storm-cassandra/pom.xml | 9 +
.../cassandra/client/impl/DefaultClient.java | 22 +-
.../query/CQLResultSetValuesMapper.java | 36 ++
.../query/impl/BoundStatementMapperBuilder.java | 8 +-
.../cassandra/trident/state/CassandraQuery.java | 44 ++
.../cassandra/trident/state/CassandraState.java | 158 +++++++
.../trident/state/CassandraStateFactory.java | 51 ++
.../trident/state/CassandraStateUpdater.java | 36 ++
.../state/TridentResultSetValuesMapper.java | 63 +++
.../cassandra/DynamicStatementBuilderTest.java | 46 +-
.../apache/storm/cassandra/WeatherSpout.java | 4 +-
.../bolt/BatchCassandraWriterBoltTest.java | 13 +-
.../cassandra/bolt/CassandraWriterBoltTest.java | 13 +-
.../cassandra/trident/TridentTopologyTest.java | 125 +++++
.../cassandra/trident/WeatherBatchSpout.java | 104 ++++
.../src/test/resources/schema.cql | 12 +-
.../jvm/storm/kafka/ByteBufferSerializer.java | 41 ++
.../src/jvm/storm/kafka/IntSerializer.java | 42 ++
pom.xml | 17 +
.../src/clj/backtype/storm/daemon/drpc.clj | 6 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 6 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 8 +-
.../clj/backtype/storm/daemon/supervisor.clj | 8 +-
storm-core/src/clj/backtype/storm/stats.clj | 2 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 8 +-
.../org/apache/storm/pacemaker/pacemaker.clj | 8 +-
.../storm/pacemaker/pacemaker_state_factory.clj | 1 +
storm-core/src/jvm/backtype/storm/Config.java | 3 +-
.../jvm/backtype/storm/blobstore/BlobStore.java | 4 +-
.../scheduler/multitenant/IsolatedPool.java | 67 ++-
.../storm/scheduler/multitenant/Node.java | 2 +-
.../src/jvm/backtype/storm/task/ShellBolt.java | 13 +-
.../storm/utils/ShellBoltMessageQueue.java | 121 +++++
.../src/jvm/backtype/storm/utils/Utils.java | 15 +-
.../test/clj/backtype/storm/multilang_test.clj | 2 +-
.../scheduler/multitenant_scheduler_test.clj | 52 +-
.../backtype/storm/localizer/LocalizerTest.java | 64 +--
.../storm/utils/ShellBoltMessageQueueTest.java | 85 ++++
.../storm/windowing/WindowManagerTest.java | 22 +-
storm-dist/binary/pom.xml | 10 +
storm-dist/binary/src/main/assembly/binary.xml | 25 +-
102 files changed, 6189 insertions(+), 178 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1da0219f/README.markdown
----------------------------------------------------------------------
diff --cc README.markdown
index cc0bd66,1478208..cfd21b4
--- a/README.markdown
+++ b/README.markdown
@@@ -86,7 -86,8 +86,9 @@@ under the License
* Parth Brahmbhatt ([@Parth-Brahmbhatt](https://github.com/Parth-Brahmbhatt))
* Jungtaek Lim ([@HeartSaVioR](https://github.com/HeartSaVioR))
* Aaron Dossett ([@dossett](https://github.com/dossett))
+ * Matthias J. Sax ([@mjsax](https://github.com/mjsax))
+ * Arun Mahadevan ([@arunmahadevan](https://github.com/arunmahadevan))
+* Boyang Jerry Peng ([@jerrypeng](https://github.com/jerrypeng))
## Contributors
@@@ -214,8 -215,8 +216,7 @@@
* Adrian Seungjin Lee ([@sweetest](https://github.com/sweetest))
* Randy Gelhausen ([@randerzander](https://github.com/randerzander))
* Gabor Liptak ([@gliptak](https://github.com/glibtak))
- * Arun Mahadevan ([@arunmahadevan](https://github.com/arunmahadevan))
* Yvonne Ironberg ([@YvonneIronberg](https://github.com/YvonneIronberg))
-* Boyang Jerry Peng ([@jerrypeng](https://github.com/jerrypeng))
* Li Wang ([@wangli1426](https://github.com/wangli1426))
* Rohan Agarwal ([@rohanag12](https://github.com/rohanag12))
* Alex Panov ([@alexpanov](https://github.com/alexpanov))