kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gwens...@apache.org
Subject [50/50] [abbrv] kafka git commit: Merge branch 'trunk' into 0.10.0
Date Mon, 11 Apr 2016 23:10:06 GMT
Merge branch 'trunk' into 0.10.0


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/6c13fca5
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/6c13fca5
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/6c13fca5

Branch: refs/heads/0.10.0
Commit: 6c13fca51fb8b25e6bfe4b3ab416e774ab9142ac
Parents: 0773bc4 40fd456
Author: Gwen Shapira <cshapi@gmail.com>
Authored: Mon Apr 11 16:08:46 2016 -0700
Committer: Gwen Shapira <cshapi@gmail.com>
Committed: Mon Apr 11 16:08:46 2016 -0700

----------------------------------------------------------------------
 .../kafka/clients/consumer/KafkaConsumer.java   |   3 +-
 .../consumer/internals/AbstractCoordinator.java |  24 ++-
 .../consumer/internals/ConsumerCoordinator.java |   3 -
 .../internals/ConsumerNetworkClient.java        |  58 ++++---
 .../consumer/internals/SendFailedException.java |  27 ---
 .../kafka/clients/producer/KafkaProducer.java   |  10 +-
 .../GroupCoordinatorNotAvailableException.java  |   1 +
 .../clients/consumer/ConsumerRecordTest.java    |   2 +-
 .../internals/ConsumerCoordinatorTest.java      |  42 ++++-
 .../internals/ConsumerNetworkClientTest.java    |  63 ++++++-
 .../clients/consumer/internals/FetcherTest.java |   2 +-
 .../runtime/distributed/WorkerGroupMember.java  |   3 +-
 .../distributed/WorkerCoordinatorTest.java      |   2 +-
 .../main/scala/kafka/admin/AdminClient.scala    |  23 +--
 .../scala/kafka/server/ReplicaManager.scala     |   8 +-
 .../src/test/scala/unit/kafka/log/LogTest.scala |   9 +-
 .../unit/kafka/server/ReplicaManagerTest.scala  | 118 ++++++++++---
 gradle.properties                               |   2 +-
 kafka-merge-pr.py                               |   2 +-
 .../kafka/streams/kstream/ForeachAction.java    |  35 ++++
 .../apache/kafka/streams/kstream/KStream.java   |  54 ++++++
 .../apache/kafka/streams/kstream/KTable.java    |  51 ++++++
 .../kafka/streams/kstream/Transformer.java      |   9 +-
 .../kafka/streams/kstream/ValueTransformer.java |   5 +-
 .../kstream/internals/ChangedSerializer.java    |  16 +-
 .../kstream/internals/KStreamForeach.java       |  44 +++++
 .../streams/kstream/internals/KStreamImpl.java  |  50 +++++-
 .../kstream/internals/KStreamJoinWindow.java    |   8 +-
 .../kstream/internals/KStreamKStreamJoin.java   |   5 +
 .../internals/KStreamKTableLeftJoin.java        |   6 +-
 .../kstream/internals/KStreamTransform.java     |  17 +-
 .../internals/KStreamTransformValues.java       |  11 +-
 .../internals/KStreamWindowAggregate.java       |   5 +
 .../kstream/internals/KStreamWindowReduce.java  |   5 +
 .../streams/kstream/internals/KTableImpl.java   |  53 +++++-
 .../kstream/internals/KTableKTableJoin.java     |   5 +
 .../kstream/internals/KTableKTableLeftJoin.java |   5 +
 .../internals/KTableKTableOuterJoin.java        |   5 +
 .../internals/KTableKTableRightJoin.java        |   5 +
 .../kstream/internals/KTableRepartitionMap.java |   5 +
 .../kstream/internals/KeyValuePrinter.java      | 124 ++++++++++++++
 .../streams/processor/ProcessorContext.java     |  26 ++-
 .../processor/internals/PartitionGroup.java     |  17 +-
 .../internals/ProcessorContextImpl.java         |  16 +-
 .../processor/internals/ProcessorNode.java      |   2 +-
 .../processor/internals/PunctuationQueue.java   |   2 +-
 .../internals/PunctuationSchedule.java          |  13 +-
 .../processor/internals/StandbyContextImpl.java |  23 ++-
 .../streams/processor/internals/StreamTask.java |  29 +++-
 .../processor/internals/StreamThread.java       |   7 +-
 .../kstream/internals/KStreamForeachTest.java   |  85 ++++++++++
 .../internals/KStreamKStreamJoinTest.java       |  72 ++++----
 .../internals/KStreamKStreamLeftJoinTest.java   |  36 ++--
 .../internals/KStreamKTableLeftJoinTest.java    |  14 +-
 .../kstream/internals/KStreamTransformTest.java |  10 +-
 .../internals/KStreamTransformValuesTest.java   |   8 +-
 .../internals/KStreamWindowAggregateTest.java   |  24 +--
 .../kstream/internals/KTableFilterTest.java     |  36 ++--
 .../kstream/internals/KTableForeachTest.java    |  85 ++++++++++
 .../kstream/internals/KTableKTableJoinTest.java |  42 ++---
 .../internals/KTableKTableLeftJoinTest.java     |  42 ++---
 .../internals/KTableKTableOuterJoinTest.java    |  48 +++---
 .../kstream/internals/KTableMapValuesTest.java  |  16 +-
 .../kstream/internals/KTableSourceTest.java     |  16 +-
 .../internals/KeyValuePrinterProcessorTest.java | 165 +++++++++++++++++++
 .../processor/internals/PartitionGroupTest.java |  82 ++++++++-
 .../internals/ProcessorTopologyTest.java        |  56 +++++++
 .../processor/internals/StreamTaskTest.java     |  79 ++++++++-
 .../apache/kafka/test/KStreamTestDriver.java    |  31 ++++
 .../apache/kafka/test/MockProcessorContext.java |  14 +-
 .../apache/kafka/test/MockProcessorNode.java    |  49 ++++++
 .../kafka/test/MockProcessorSupplier.java       |  41 ++++-
 tests/kafkatest/__init__.py                     |   2 +-
 tests/kafkatest/services/verifiable_producer.py |  37 +++--
 tests/kafkatest/tests/client/consumer_test.py   |   6 +
 .../apache/kafka/tools/VerifiableConsumer.java  |   7 +
 76 files changed, 1767 insertions(+), 396 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/6c13fca5/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamImpl.java
----------------------------------------------------------------------
diff --cc streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamImpl.java
index 0fb3984,a02cfb4..97a7aac
--- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamImpl.java
+++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamImpl.java
@@@ -201,6 -238,11 +238,13 @@@ public class KStreamImpl<K, V> extends 
      }
  
      @Override
+     public void foreach(ForeachAction<K, V> action) {
+         String name = topology.newName(FOREACH_NAME);
+ 
+         topology.addProcessor(name, new KStreamForeach<>(action), this.name);
+     }
++
++    @Override
      public KStream<K, V> through(Serde<K> keySerde, Serde<V> valSerde,
String topic) {
          return through(keySerde, valSerde, null, topic);
      }


Mime
View raw message