You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2017/11/20 19:01:36 UTC
[50/50] [abbrv] storm git commit: Merge branch '1.x-branch' into
metrics_v2
Merge branch '1.x-branch' into metrics_v2
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/99bcf684
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/99bcf684
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/99bcf684
Branch: refs/heads/metrics_v2
Commit: 99bcf68449df63a83e124afaadaa61f61da15d22
Parents: a47b5fb 7962639
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Mon Nov 20 13:52:24 2017 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Mon Nov 20 13:52:24 2017 -0500
----------------------------------------------------------------------
bin/storm.py | 1 -
docs/Trident-API-Overview.md | 2 +-
docs/storm-kafka-client.md | 46 +-
.../storm/hbase/security/HBaseSecurityUtil.java | 2 +-
.../state/TridentResultSetValuesMapper.java | 6 +-
.../apache/storm/druid/bolt/DruidBeamBolt.java | 13 +-
external/storm-eventhubs/pom.xml | 11 -
external/storm-hbase/README.md | 22 +-
.../storm/hdfs/blobstore/HdfsBlobStore.java | 107 +-
.../storm/hdfs/blobstore/HdfsBlobStoreImpl.java | 14 +-
.../storm/hdfs/bolt/AbstractHdfsBolt.java | 48 +-
.../org/apache/storm/hdfs/spout/HdfsSpout.java | 1484 +++++++++---------
.../hdfs/avro/TestFixedAvroSerializer.java | 13 +-
.../hdfs/avro/TestGenericAvroSerializer.java | 11 +-
.../storm/hdfs/blobstore/BlobStoreTest.java | 897 ++++++-----
.../hdfs/blobstore/HdfsBlobStoreImplTest.java | 288 ++--
.../hdfs/bolt/AvroGenericRecordBoltTest.java | 142 +-
.../apache/storm/hdfs/bolt/TestHdfsBolt.java | 108 +-
.../storm/hdfs/bolt/TestSequenceFileBolt.java | 71 +-
.../apache/storm/hdfs/spout/TestDirLock.java | 281 ++--
.../apache/storm/hdfs/spout/TestFileLock.java | 679 ++++----
.../storm/hdfs/spout/TestHdfsSemantics.java | 311 ++--
.../apache/storm/hdfs/spout/TestHdfsSpout.java | 1235 +++++++--------
.../storm/hdfs/spout/TestProgressTracker.java | 179 +--
.../storm/hdfs/testing/MiniDFSClusterRule.java | 78 +
.../apache/storm/jms/spout/JmsSpoutTest.java | 72 +-
.../apache/storm/kafka/spout/KafkaSpout.java | 362 +++--
.../storm/kafka/spout/KafkaSpoutConfig.java | 167 +-
.../KafkaSpoutRetryExponentialBackoff.java | 32 +-
.../kafka/spout/KafkaSpoutRetryService.java | 6 +-
.../apache/storm/kafka/spout/Subscription.java | 5 +-
.../kafka/spout/internal/OffsetManager.java | 102 +-
.../trident/KafkaTridentSpoutBatchMetadata.java | 78 +-
.../spout/trident/KafkaTridentSpoutEmitter.java | 108 +-
.../spout/trident/KafkaTridentSpoutManager.java | 10 +-
.../spout/trident/KafkaTridentSpoutOpaque.java | 18 +-
.../KafkaTridentSpoutOpaqueCoordinator.java | 26 +-
.../spout/trident/TopicPartitionSerializer.java | 47 +
.../storm/kafka/trident/TridentKafkaState.java | 9 +
.../storm/kafka/spout/KafkaSpoutCommitTest.java | 131 --
.../storm/kafka/spout/KafkaSpoutConfigTest.java | 26 +-
.../storm/kafka/spout/KafkaSpoutEmitTest.java | 147 +-
.../KafkaSpoutLogCompactionSupportTest.java | 223 +++
.../spout/KafkaSpoutMessagingGuaranteeTest.java | 207 +++
.../kafka/spout/KafkaSpoutRebalanceTest.java | 79 +-
.../KafkaSpoutRetryExponentialBackoffTest.java | 292 ++++
.../kafka/spout/KafkaSpoutRetryLimitTest.java | 27 +-
.../kafka/spout/MaxUncommittedOffsetTest.java | 64 +-
.../kafka/spout/SingleTopicKafkaSpoutTest.java | 153 +-
.../spout/SingleTopicKafkaUnitSetupHelper.java | 67 +
.../SpoutWithMockedConsumerSetupHelper.java | 136 +-
.../SingleTopicKafkaSpoutConfiguration.java | 25 +-
.../kafka/spout/internal/OffsetManagerTest.java | 187 +++
.../KafkaTridentSpoutBatchMetadataTest.java | 66 +
external/storm-kafka-monitor/pom.xml | 6 -
external/storm-kafka/pom.xml | 29 -
.../apache/storm/kafka/PartitionManager.java | 21 +-
external/storm-kinesis/pom.xml | 11 -
integration-test/README.md | 2 +-
integration-test/config/Vagrantfile | 8 +-
integration-test/config/cluster.xml | 101 --
integration-test/config/install-storm.sh | 1 -
integration-test/config/install-zookeeper.sh | 1 +
integration-test/pom.xml | 5 +
integration-test/run-it.sh | 7 +-
.../topology/window/SlidingTimeCorrectness.java | 4 +-
.../window/SlidingWindowCorrectness.java | 2 -
.../window/TumblingTimeCorrectness.java | 10 +-
.../window/TumblingWindowCorrectness.java | 4 +-
.../test/java/org/apache/storm/st/DemoTest.java | 3 +-
.../st/tests/window/SlidingWindowTest.java | 51 +-
.../st/tests/window/TumblingWindowTest.java | 9 +-
.../apache/storm/st/wrapper/StormCluster.java | 25 +-
.../org/apache/storm/st/wrapper/TopoWrap.java | 87 +-
pom.xml | 47 +-
storm-core/pom.xml | 37 +-
.../clj/org/apache/storm/daemon/executor.clj | 19 +-
.../clj/org/apache/storm/daemon/logviewer.clj | 12 +-
storm-core/src/clj/org/apache/storm/ui/core.clj | 3 +-
.../src/clj/org/apache/storm/ui/helpers.clj | 21 +-
storm-core/src/jvm/org/apache/storm/Config.java | 6 +-
.../apache/storm/blobstore/BlobStoreUtils.java | 8 +-
.../storm/blobstore/LocalFsBlobStore.java | 6 +-
.../apache/storm/testing/FixedTupleSpout.java | 18 +-
.../storm/topology/OutputFieldsGetter.java | 3 +
.../storm/topology/WindowedBoltExecutor.java | 9 +-
.../spout/IOpaquePartitionedTridentSpout.java | 22 +-
.../topology/state/TransactionalState.java | 14 +-
.../jvm/org/apache/storm/utils/ConfigUtils.java | 16 +-
.../apache/storm/windowing/EvictionContext.java | 2 +-
.../apache/storm/windowing/EvictionPolicy.java | 2 +-
.../storm/windowing/TimeEvictionPolicy.java | 2 +-
.../storm/windowing/TimeTriggerPolicy.java | 8 +-
.../windowing/WaterMarkEventGenerator.java | 25 +-
.../windowing/WatermarkCountEvictionPolicy.java | 11 +-
.../windowing/WatermarkTimeEvictionPolicy.java | 10 +-
.../apache/storm/windowing/WindowManager.java | 3 +
.../org/apache/storm/integration_test.clj | 53 +-
.../clj/org/apache/storm/transactional_test.clj | 4 +-
.../clj/org/apache/storm/trident/state_test.clj | 4 +-
.../storm/blobstore/BlobStoreUtilsTest.java | 135 ++
.../storm/blobstore/BlobSynchronizerTest.java | 23 +-
.../blobstore/MockZookeeperClientBuilder.java | 100 ++
.../windowing/WaterMarkEventGeneratorTest.java | 6 +
.../storm/windowing/WindowManagerTest.java | 48 +-
storm-core/test/resources/log4j2-test.xml | 2 +
106 files changed, 5938 insertions(+), 4049 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/99bcf684/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/99bcf684/storm-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/99bcf684/storm-core/src/clj/org/apache/storm/daemon/executor.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/99bcf684/storm-core/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------