This is an automated email from the ASF dual-hosted git repository.
bbejeck pushed a commit to branch Merge_AK_to_CCS_10_08_2020
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit daefd1ada5b66455bd883eb7bfe3ffb9d950f2a2
Merge: 5cf5c25 3e6dcb1
Author: Rajini Sivaram <rajinisiva...@googlemail.com>
AuthorDate: Tue Aug 11 10:11:51 2020 +0100
AK -> CCS Kafka Sync (11 Aug 2020)
build.gradle | 19 +
checkstyle/checkstyle.xml | 8 +
checkstyle/suppressions.xml | 21 +-
.../org/apache/kafka/common/metrics/Metrics.java | 4 +-
.../org/apache/kafka/common/metrics/Sensor.java | 38 +-
.../common/metrics/internals/MetricsUtils.java | 46 ++
.../apache/kafka/common/metrics/stats/Rate.java | 24 +-
.../kafka/common/metrics/stats/TokenBucket.java | 101 ++++
.../apache/kafka/common/utils/AppInfoParser.java | 2 +
.../apache/kafka/common/metrics/SensorTest.java | 94 +++
.../kafka/common/metrics/TokenBucketTest.java | 93 +++
.../kafka/controller/ControllerEventManager.scala | 10 +-
.../scala/kafka/controller/KafkaController.scala | 82 +--
core/src/main/scala/kafka/log/Log.scala | 143 +++--
core/src/main/scala/kafka/log/LogSegment.scala | 2 +-
.../scala/kafka/server/ClientQuotaManager.scala | 22 +-
.../server/ControllerMutationQuotaManager.scala | 40 +-
.../scala/kafka/server/KafkaRequestHandler.scala | 5 +-
.../main/scala/kafka/server/ReplicaManager.scala | 60 +-
.../kafka/server/ReplicationQuotaManager.scala | 4 +-
.../src/main/scala/kafka/server/SensorAccess.scala | 10 +-
.../main/scala/kafka/tools/StreamsResetter.java | 18 +-
.../kafka/controller/ControllerFailoverTest.scala | 2 +
.../controller/ControllerIntegrationTest.scala | 87 ++-
.../ControllerMutationQuotaManagerTest.scala | 58 +-
.../kafka/server/ControllerMutationQuotaTest.scala | 16 +-
docs/streams/developer-guide/config-streams.html | 28 +-
docs/streams/upgrade-guide.html | 15 +-
docs/upgrade.html | 4 +-
gradle/dependencies.gradle | 4 +-
settings.gradle | 1 +
.../examples/pageview/PageViewTypedDemo.java | 2 +-
.../examples/wordcount/WordCountProcessorDemo.java | 2 +-
.../org/apache/kafka/streams/KafkaStreams.java | 9 +-
.../org/apache/kafka/streams/KeyQueryMetadata.java | 39 +-
.../org/apache/kafka/streams/StreamsConfig.java | 15 +-
.../streams/internals/QuietStreamsConfig.java | 33 --
.../kstream/internals/CogroupedKStreamImpl.java | 5 +-
.../internals/CogroupedStreamAggregateBuilder.java | 170 ++++--
.../SessionWindowedCogroupedKStreamImpl.java | 4 +-
.../TimeWindowedCogroupedKStreamImpl.java | 22 +-
.../kafka/streams/processor/api/Processor.java | 64 ++
.../streams/processor/api/ProcessorContext.java | 239 ++++++++
.../streams/processor/api/ProcessorSupplier.java | 43 ++
.../internals/AbstractProcessorContext.java | 6 +-
.../streams/processor/internals/ClientUtils.java | 24 +-
.../internals/GlobalProcessorContextImpl.java | 8 +-
.../internals/GlobalStateManagerImpl.java | 204 ++++---
.../processor/internals/GlobalStateUpdateTask.java | 6 +-
.../processor/internals/GlobalStreamThread.java | 7 +-
...ntext.java => InternalApiProcessorContext.java} | 14 +-
.../internals/InternalProcessorContext.java | 6 +-
.../processor/internals/InternalTopicManager.java | 89 +--
.../internals/InternalTopologyBuilder.java | 171 +++---
.../processor/internals/PartitionGroup.java | 2 +-
.../processor/internals/ProcessorAdapter.java | 53 ++
.../internals/ProcessorContextAdapter.java | 234 ++++++++
.../processor/internals/ProcessorContextImpl.java | 14 +-
.../internals/ProcessorContextReverseAdapter.java | 248 ++++++++
.../streams/processor/internals/ProcessorNode.java | 27 +-
.../internals/ProcessorNodePunctuator.java | 2 +-
.../processor/internals/ProcessorTopology.java | 44 +-
.../processor/internals/RecordDeserializer.java | 6 +-
.../streams/processor/internals/RecordQueue.java | 6 +-
.../streams/processor/internals/SinkNode.java | 26 +-
.../streams/processor/internals/SourceNode.java | 24 +-
.../streams/processor/internals/StreamTask.java | 14 +-
.../streams/processor/internals/StreamThread.java | 21 +-
.../internals/StreamsPartitionAssignor.java | 19 +-
.../assignment/AssignorConfiguration.java | 6 +-
.../apache/kafka/streams/StreamsBuilderTest.java | 2 +-
.../apache/kafka/streams/StreamsConfigTest.java | 19 -
.../kafka/streams/TopologyTestDriverWrapper.java | 6 +-
.../OptimizedKTableIntegrationTest.java | 2 +-
.../integration/QueryableStateIntegrationTest.java | 14 +-
.../SmokeTestDriverIntegrationTest.java | 7 +
.../integration/StoreQueryIntegrationTest.java | 10 +-
.../streams/kstream/internals/KStreamImplTest.java | 8 +-
.../internals/GlobalProcessorContextImplTest.java | 19 +-
.../internals/GlobalStateManagerImplTest.java | 660 +++++++++++++++++++--
.../processor/internals/GlobalStateTaskTest.java | 10 +-
...ghAvailabilityStreamsPartitionAssignorTest.java | 4 +-
.../internals/InternalTopicManagerTest.java | 80 ++-
.../internals/InternalTopologyBuilderTest.java | 4 +-
.../internals/ProcessorContextImplTest.java | 2 +-
.../processor/internals/ProcessorNodeTest.java | 4 +-
.../internals/ProcessorTopologyFactories.java | 4 +-
.../processor/internals/PunctuationQueueTest.java | 2 +-
.../internals/RecordDeserializerTest.java | 2 +-
.../processor/internals/RecordQueueTest.java | 2 +-
.../streams/processor/internals/SinkNodeTest.java | 4 +-
.../processor/internals/SourceNodeTest.java | 6 +-
.../processor/internals/StreamTaskTest.java | 18 +-
.../internals/StreamsMetadataStateTest.java | 10 +-
.../internals/StreamsPartitionAssignorTest.java | 191 ++++--
.../streams/tests/BrokerCompatibilityTest.java | 5 +-
.../tests/StreamsBrokerDownResilienceTest.java | 6 +-
.../apache/kafka/streams/tests/StreamsEosTest.java | 11 +-
.../kafka/streams/tests/StreamsSmokeTest.java | 7 +-
.../streams/tests/StreamsStandByReplicaTest.java | 10 +-
.../kafka/test/InternalMockProcessorContext.java | 14 +-
.../kafka/test/MockInternalTopicManager.java | 11 +-
.../org/apache/kafka/test/MockProcessorNode.java | 12 +-
.../java/org/apache/kafka/test/MockSourceNode.java | 10 +-
.../org/apache/kafka/test/NoOpReadOnlyStore.java | 1 +
streams/src/test/resources/log4j.properties | 7 +-
.../apache/kafka/streams/TopologyTestDriver.java | 10 +-
.../streams/processor/MockProcessorContext.java | 4 +-
.../kafka/streams/tests/StreamsSmokeTest.java | 7 +-
.../kafka/streams/tests/StreamsSmokeTest.java | 7 +-
.../kafka/streams/tests/StreamsSmokeTest.java | 7 +-
.../kafka/streams/tests/StreamsSmokeTest.java | 7 +-
.../kafka/streams/tests/SmokeTestClient.java | 298 ++++++++++
.../kafka/streams/tests/SmokeTestDriver.java | 622 +++++++++++++++++++
.../apache/kafka/streams/tests/SmokeTestUtil.java | 134 +++++
.../kafka/streams/tests/StreamsSmokeTest.java | 7 +-
.../kafka/streams/tests/StreamsUpgradeTest.java | 86 +++
tests/docker/Dockerfile | 2 +
.../streams/streams_broker_compatibility_test.py | 3 +-
.../streams_cooperative_rebalance_upgrade_test.py | 3 +-
.../tests/streams/streams_upgrade_test.py | 5 +-
.../kafka/tools/TransactionalMessageCopier.java | 2 +-
vagrant/base.sh | 2 +
123 files changed, 4393 insertions(+), 986 deletions(-)
diff --cc gradle/dependencies.gradle
index ed27aed,e902846..683333b
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@@ -164,7 -165,8 +165,8 @@@ libs +=
kafkaStreams_23: "org.apache.kafka:kafka-streams:$versions.kafka_23",
kafkaStreams_24: "org.apache.kafka:kafka-streams:$versions.kafka_24",
kafkaStreams_25: "org.apache.kafka:kafka-streams:$versions.kafka_25",
+ kafkaStreams_26: "org.apache.kafka:kafka-streams:$versions.kafka_26",
- log4j: "log4j:log4j:$versions.log4j",
+ log4j: "io.confluent:confluent-log4j:$versions.log4j",
lz4: "org.lz4:lz4-java:$versions.lz4",
metrics: "com.yammer.metrics:metrics-core:$versions.metrics",
mockitoCore: "org.mockito:mockito-core:$versions.mockito",
