You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by xi...@apache.org on 2017/07/16 11:13:19 UTC

[2/2] storm git commit: Merge branch 'STORM-2634' of https://github.com/vesense/storm

Merge branch 'STORM-2634' of https://github.com/vesense/storm


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

Branch: refs/heads/master
Commit: 72e219c1551aa999a51e6f6ce91f3dbaa279494c
Parents: 2fc414d 2a36ec7
Author: Xin Wang <be...@163.com>
Authored: Sun Jul 16 19:13:05 2017 +0800
Committer: Xin Wang <be...@163.com>
Committed: Sun Jul 16 19:13:05 2017 +0800

----------------------------------------------------------------------
 sql/storm-sql-runtime/pom.xml                   |   3 -
 .../calcite/interpreter/StormContext.java       |   5 +-
 .../sql/runtime/AbstractChannelHandler.java     |  43 +++---
 .../sql/runtime/AbstractValuesProcessor.java    |  23 +--
 .../storm/sql/runtime/ChannelContext.java       |  18 ++-
 .../storm/sql/runtime/ChannelHandler.java       |  21 +--
 .../org/apache/storm/sql/runtime/Channels.java  | 149 ++++++++++---------
 .../apache/storm/sql/runtime/DataSource.java    |   3 +-
 .../storm/sql/runtime/DataSourcesProvider.java  |  42 +++---
 .../storm/sql/runtime/DataSourcesRegistry.java  |  96 +++++++-----
 .../org/apache/storm/sql/runtime/FieldInfo.java |  43 +++---
 .../storm/sql/runtime/IOutputSerializer.java    |  15 +-
 .../sql/runtime/ISqlTridentDataSource.java      |  72 ++++-----
 .../sql/runtime/SimpleSqlTridentConsumer.java   |   1 +
 .../storm/sql/runtime/StormSqlFunctions.java    |  34 +++--
 .../runtime/calcite/ExecutableExpression.java   |   5 +-
 .../sql/runtime/calcite/StormDataContext.java   |  13 +-
 .../socket/SocketDataSourcesProvider.java       |  13 +-
 .../datasource/socket/trident/SocketState.java  |  12 +-
 .../socket/trident/SocketStateUpdater.java      |   6 +-
 .../socket/trident/TridentSocketSpout.java      |  33 ++--
 .../sql/runtime/serde/avro/AvroScheme.java      |  74 ++++-----
 .../sql/runtime/serde/avro/AvroSerializer.java  |  75 +++++-----
 .../sql/runtime/serde/avro/CachedSchemas.java   |  12 +-
 .../storm/sql/runtime/serde/csv/CsvScheme.java  |  60 ++++----
 .../sql/runtime/serde/csv/CsvSerializer.java    |  39 ++---
 .../sql/runtime/serde/json/JsonScheme.java      |  56 +++----
 .../sql/runtime/serde/json/JsonSerializer.java  |  46 +++---
 .../storm/sql/runtime/serde/tsv/TsvScheme.java  |  54 +++----
 .../sql/runtime/serde/tsv/TsvSerializer.java    |  41 ++---
 .../trident/functions/EvaluationCalc.java       |  17 ++-
 .../trident/functions/EvaluationFilter.java     |  10 +-
 .../trident/functions/EvaluationFunction.java   |  11 +-
 .../trident/functions/ForwardFunction.java      |   1 +
 .../storm/sql/runtime/utils/FieldInfoUtils.java |   4 +-
 .../storm/sql/runtime/utils/SerdeUtils.java     |  41 +++--
 .../apache/storm/sql/runtime/utils/Utils.java   |  21 +--
 37 files changed, 677 insertions(+), 535 deletions(-)
----------------------------------------------------------------------