You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by bb...@apache.org on 2020/10/08 19:16:01 UTC
[kafka] 23/31: Merge remote-tracking branch 'apache/trunk' into
ccs-master
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 bbc9cb1289ce49f6b95fedebda6db9e6db66dda2
Merge: f59086a d0800b3
Author: Rajini Sivaram <ra...@googlemail.com>
AuthorDate: Thu Aug 13 15:11:21 2020 +0100
Merge remote-tracking branch 'apache/trunk' into ccs-master
.asf.yaml | 2 +
README.md | 2 +-
build.gradle | 16 +-
.../producer/internals/TransactionManager.java | 36 ++-
.../kafka/common/errors/RetriableException.java | 2 +-
.../InvalidProducerEpochException.java} | 24 +-
.../org/apache/kafka/common/protocol/Errors.java | 12 +-
.../common/requests/AddOffsetsToTxnResponse.java | 3 +-
.../requests/AddPartitionsToTxnResponse.java | 3 +-
.../kafka/common/requests/EndTxnResponse.java | 3 +-
.../kafka/common/requests/FetchResponse.java | 36 +--
.../common/requests/InitProducerIdResponse.java | 13 +-
.../common/message/AddOffsetsToTxnRequest.json | 4 +-
.../common/message/AddOffsetsToTxnResponse.json | 4 +-
.../common/message/AddPartitionsToTxnRequest.json | 4 +-
.../common/message/AddPartitionsToTxnResponse.json | 4 +-
.../resources/common/message/EndTxnRequest.json | 4 +-
.../resources/common/message/EndTxnResponse.json | 4 +-
.../resources/common/message/FetchResponse.json | 39 ++-
.../common/message/InitProducerIdRequest.json | 4 +-
.../common/message/InitProducerIdResponse.json | 4 +-
.../producer/internals/TransactionManagerTest.java | 149 +++++++++-
.../common/message/SimpleExampleMessageTest.java | 50 +++-
.../transaction/TransactionCoordinator.scala | 10 +-
.../transaction/TransactionMetadata.scala | 4 +-
core/src/main/scala/kafka/server/KafkaApis.scala | 43 ++-
.../transaction/TransactionCoordinatorTest.scala | 21 +-
.../transaction/TransactionMetadataTest.scala | 2 +-
.../scala/unit/kafka/server/KafkaApisTest.scala | 312 ++++++++++++++++++---
.../apache/kafka/message/MessageDataGenerator.java | 25 +-
gradle/dependencies.gradle | 4 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 2 +-
.../streams/processor/internals/AbstractTask.java | 30 +-
.../internals/GlobalStateManagerImpl.java | 5 +-
.../processor/internals/GlobalStateUpdateTask.java | 3 +-
.../processor/internals/ProcessorStateManager.java | 54 +++-
.../streams/processor/internals/StandbyTask.java | 53 ++--
.../streams/processor/internals/StateManager.java | 4 +-
.../processor/internals/StateManagerUtil.java | 27 ++
.../streams/processor/internals/StreamTask.java | 99 +++----
.../kafka/streams/processor/internals/Task.java | 2 +-
.../streams/processor/internals/TaskManager.java | 305 +++++++++++---------
.../streams/state/internals/CachedStateStore.java | 7 +
.../state/internals/CachingKeyValueStore.java | 12 +
.../state/internals/CachingSessionStore.java | 6 +
.../state/internals/CachingWindowStore.java | 36 +--
.../streams/state/internals/WrappedStateStore.java | 7 +
.../internals/GlobalStateManagerImplTest.java | 8 +-
.../internals/ProcessorStateManagerTest.java | 66 ++++-
.../processor/internals/StandbyTaskTest.java | 48 ++--
.../processor/internals/StateManagerStub.java | 5 +-
.../processor/internals/StreamTaskTest.java | 213 +++++++++-----
.../processor/internals/TaskManagerTest.java | 34 ++-
.../apache/kafka/streams/tests/EosTestDriver.java | 20 +-
.../apache/kafka/test/GlobalStateManagerStub.java | 7 +-
.../apache/kafka/streams/TopologyTestDriver.java | 6 +-
tests/docker/Dockerfile | 4 +-
tests/kafkatest/version.py | 3 +-
vagrant/base.sh | 4 +-
60 files changed, 1355 insertions(+), 560 deletions(-)
diff --cc build.gradle
index 8d7f355,d7820b4..b7ce20e
--- a/build.gradle
+++ b/build.gradle
@@@ -119,6 -94,6 +114,9 @@@ allprojects
libs.nettyHandler,
libs.nettyTransportNativeEpoll
)
++ dependencySubstitution {
++ substitute module("log4j:log4j:1.2.17") because "we use a custom version with security patches" with module("io.confluent:confluent-log4j:1.2.17-cp2")
++ }
}
}
}