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/11/05 01:55:54 UTC

[2/3] storm git commit: Merge branch 'STORM-2103-1.x-merge' into 1.x-branch

Merge branch 'STORM-2103-1.x-merge' into 1.x-branch


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ff61fdf3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ff61fdf3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ff61fdf3

Branch: refs/heads/1.x-branch
Commit: ff61fdf366d29741727e7aa25d962e9476b860b1
Parents: 1094480 0920b6d
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Nov 5 10:55:13 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Nov 5 10:55:13 2016 +0900

----------------------------------------------------------------------
 external/sql/pom.xml                            |   1 +
 .../apache/storm/sql/parser/SqlCreateTable.java |  20 ++-
 .../test/org/apache/storm/sql/TestStormSql.java |  11 +-
 .../storm-sql-external/storm-sql-kafka/pom.xml  |   4 -
 .../sql/kafka/KafkaDataSourcesProvider.java     |  29 ++---
 .../sql/kafka/TestKafkaDataSourcesProvider.java |  31 +++--
 .../storm-sql-mongodb/pom.xml                   |  84 +++++++++++++
 .../sql/mongodb/MongoDataSourcesProvider.java   | 116 ++++++++++++++++++
 ...apache.storm.sql.runtime.DataSourcesProvider |  16 +++
 .../mongodb/TestMongoDataSourcesProvider.java   | 122 +++++++++++++++++++
 .../storm-sql-external/storm-sql-redis/pom.xml  |   4 -
 .../sql/redis/RedisDataSourcesProvider.java     |  27 +---
 .../sql/redis/TestRedisDataSourcesProvider.java |  26 ++--
 .../storm/sql/runtime/DataSourcesProvider.java  |   5 +-
 .../storm/sql/runtime/DataSourcesRegistry.java  |   5 +-
 .../storm/sql/runtime/utils/FieldInfoUtils.java |  39 ++++++
 storm-dist/binary/src/main/assembly/binary.xml  |   7 ++
 17 files changed, 452 insertions(+), 95 deletions(-)
----------------------------------------------------------------------