Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 13BA7200CFE for ; Fri, 8 Sep 2017 16:25:19 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 127F7160EB8; Fri, 8 Sep 2017 14:25:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 60838160C3A for ; Fri, 8 Sep 2017 16:25:18 +0200 (CEST) Received: (qmail 77976 invoked by uid 500); 8 Sep 2017 14:25:17 -0000 Mailing-List: contact commits-help@storm.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@storm.apache.org Delivered-To: mailing list commits@storm.apache.org Received: (qmail 77963 invoked by uid 99); 8 Sep 2017 14:25:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Sep 2017 14:25:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A1A46F56DC; Fri, 8 Sep 2017 14:25:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bobby@apache.org To: commits@storm.apache.org Date: Fri, 08 Sep 2017 14:25:16 -0000 Message-Id: <51e1e80631714aafa800b382cbfe2631@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] storm git commit: Merge branch 'STORM-2675' of https://github.com/srdo/storm into STORM-2675 archived-at: Fri, 08 Sep 2017 14:25:19 -0000 Merge branch 'STORM-2675' of https://github.com/srdo/storm into STORM-2675 STORM-2675: Fix storm-kafka-client Trident spout failing to serialize meta objects to Zookeeper This closes #2271 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ea0e465a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ea0e465a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ea0e465a Branch: refs/heads/master Commit: ea0e465ab863668f0b04aba7d01050aeb4b13d22 Parents: 306f399 54a829c Author: Robert Evans Authored: Fri Sep 8 08:56:38 2017 -0500 Committer: Robert Evans Committed: Fri Sep 8 08:56:38 2017 -0500 ---------------------------------------------------------------------- examples/storm-kafka-client-examples/pom.xml | 11 +- examples/storm-kafka-examples/pom.xml | 11 +- external/storm-kafka-client/pom.xml | 2 +- .../kafka/spout/subscription/Subscription.java | 5 +- .../trident/KafkaTridentSpoutBatchMetadata.java | 77 +++++++++---- .../spout/trident/KafkaTridentSpoutEmitter.java | 108 +++++++++++-------- .../spout/trident/KafkaTridentSpoutManager.java | 10 +- .../spout/trident/KafkaTridentSpoutOpaque.java | 12 +-- .../KafkaTridentSpoutOpaqueCoordinator.java | 17 +-- .../spout/trident/TopicPartitionSerializer.java | 47 ++++++++ .../storm/kafka/trident/TridentKafkaState.java | 9 ++ .../storm/kafka/spout/KafkaSpoutConfigTest.java | 2 +- .../SpoutWithMockedConsumerSetupHelper.java | 33 ++++-- .../KafkaTridentSpoutBatchMetadataTest.java | 66 ++++++++++++ .../spout/IOpaquePartitionedTridentSpout.java | 22 +++- .../topology/state/TransactionalState.java | 12 ++- 16 files changed, 334 insertions(+), 110 deletions(-) ----------------------------------------------------------------------