You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/09/26 21:53:17 UTC
[2/3] storm git commit: Merge branch 'STORM-2089'
Merge branch 'STORM-2089'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/227721a6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/227721a6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/227721a6
Branch: refs/heads/master
Commit: 227721a6d185929eb0a81d86ef3e5a5c7df47a1b
Parents: 8e26bc1 1cd5b74
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Sep 27 06:49:04 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Sep 27 06:49:04 2016 +0900
----------------------------------------------------------------------
.../trident/TridentLogicalPlanCompiler.java | 9 +-
.../backends/trident/TestPlanCompiler.java | 33 +++--
.../org/apache/storm/sql/kafka/JsonScheme.java | 58 --------
.../apache/storm/sql/kafka/JsonSerializer.java | 56 --------
.../sql/kafka/KafkaDataSourcesProvider.java | 61 +++-----
.../storm/sql/kafka/TestJsonRepresentation.java | 50 -------
.../sql/kafka/TestKafkaDataSourcesProvider.java | 26 +++-
external/sql/storm-sql-runtime/pom.xml | 4 +
.../org/apache/storm/sql/runtime/FieldInfo.java | 4 +-
.../sql/runtime/ISqlTridentDataSource.java | 41 +++++-
.../sql/runtime/SimpleSqlTridentConsumer.java | 24 ++++
.../sql/runtime/serde/json/JsonScheme.java | 58 ++++++++
.../sql/runtime/serde/json/JsonSerializer.java | 57 ++++++++
.../storm/sql/TestJsonRepresentation.java | 52 +++++++
.../test/org/apache/storm/sql/TestUtils.java | 138 +++++++++----------
15 files changed, 367 insertions(+), 304 deletions(-)
----------------------------------------------------------------------