Merge branch 'MLHR-1912' into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/05b2b898 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/05b2b898 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/05b2b898 Branch: refs/heads/devel-3 Commit: 05b2b89874a1496be9fe476eef58febff0069292 Parents: 5b9eff8 b9aa203 Author: bright <[email protected]> Authored: Thu Nov 19 12:32:48 2015 -0800 Committer: bright <[email protected]> Committed: Thu Nov 19 12:32:48 2015 -0800 ---------------------------------------------------------------------- .../datatorrent/lib/algo/UniqueValueCount.java | 13 +- .../lib/codec/KryoSerializableStreamCodec.java | 4 +- .../AbstractDBLookupCacheBackedOperator.java | 16 ++- .../datatorrent/lib/db/cache/CacheManager.java | 27 +++-- .../datatorrent/lib/db/cache/CacheStore.java | 5 +- .../lib/db/jdbc/AbstractJdbcInputOperator.java | 15 +-- ...stractJdbcTransactionableOutputOperator.java | 20 ++-- .../db/jdbc/JDBCLookupCacheBackedOperator.java | 15 +-- .../lib/db/jdbc/JdbcPOJOInputOperator.java | 55 ++++++--- .../lib/db/jdbc/JdbcPOJOOutputOperator.java | 98 +++++++++------ .../com/datatorrent/lib/db/jdbc/JdbcStore.java | 14 +-- .../lib/db/jdbc/JdbcTransactionalStore.java | 48 ++++---- .../lib/io/AbstractFTPInputOperator.java | 14 +-- .../lib/io/fs/AbstractFileOutputOperator.java | 68 +++++------ .../lib/io/jms/AbstractJMSInputOperator.java | 85 +++++++------ .../lib/io/jms/JMSStringInputOperator.java | 10 +- .../datatorrent/lib/metric/AvgAggregator.java | 3 +- .../lib/metric/max/DoubleMaxAggregator.java | 3 +- .../lib/metric/max/FloatMaxAggregator.java | 3 +- .../lib/metric/max/IntMaxAggregator.java | 3 +- .../lib/metric/max/LongMaxAggregator.java | 1 - .../lib/metric/min/DoubleMinAggregator.java | 3 +- .../lib/metric/min/FloatMinAggregator.java | 3 +- .../lib/metric/min/IntMinAggregator.java | 3 +- .../lib/metric/min/LongMinAggregator.java | 3 +- .../lib/codec/KryoStreamCodecTest.java | 120 ++++++++++--------- .../lib/db/cache/CacheManagerTest.java | 2 +- .../jdbc/JDBCLookupCacheBackedOperatorTest.java | 33 ++--- .../lib/db/jdbc/JdbcOperatorTest.java | 43 ++++--- .../datatorrent/lib/db/jdbc/JdbcStoreTest.java | 7 +- .../lib/io/FTPStringInputOperatorTest.java | 7 +- .../io/fs/AbstractFileOutputOperatorTest.java | 4 +- .../lib/io/jms/JMSStringInputOperatorTest.java | 39 +++--- pom.xml | 2 +- 34 files changed, 412 insertions(+), 377 deletions(-) ----------------------------------------------------------------------
