[04/14] storm git commit: STORM-697: Added scheme to include Partition and offset when generating tuple. >>>

2015-10-28 Thread kabhwan 
STORM-697: Added scheme to include Partition and offset when generating tuple. 
>>>

The MessageMetadataScheme interface extends Sheme and defines a deserialization 
method that accepts the message byte[], Partition, and the offset.
MessageMetadataSchemeAsMultiScheme follows the same pattern as 
KeyValueSchemeAsMultiScheme, extending SchemeAsMultiScheme and providing a 
deserialization method named for the method defined by
MessageMetadataScheme.
StringMessageAndMetadataScheme provides an implementation of 
MessageMetadataScheme, following the same pattern as StringKeyValueScheme.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2f119c6e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2f119c6e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2f119c6e

Branch: refs/heads/master
Commit: 2f119c6e2edace030afeb9ee0885010f1de7fc28
Parents: 6e76866
Author: matt.tieman 
Authored: Tue Mar 3 11:50:04 2015 -0500
Committer: matt.tieman 
Committed: Tue Mar 3 11:59:44 2015 -0500

--
 .../jvm/storm/kafka/MessageMetadataScheme.java  | 25 
 .../MessageMetadataSchemeAsMultiScheme.java | 25 
 .../kafka/StringMessageAndMetadataScheme.java   | 25 
 3 files changed, 75 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/2f119c6e/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataScheme.java
--
diff --git 
a/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataScheme.java 
b/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataScheme.java
new file mode 100644
index 000..d0dd2be
--- /dev/null
+++ b/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataScheme.java
@@ -0,0 +1,25 @@
+package storm.kafka;
+
+import java.util.List;
+import backtype.storm.spout.Scheme;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public interface MessageMetadataScheme extends Scheme {
+public List deserializeMessageWithMetadata(byte[] message, 
Partition partition, int offset);
+}

http://git-wip-us.apache.org/repos/asf/storm/blob/2f119c6e/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
--
diff --git 
a/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
 
b/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
new file mode 100644
index 000..6226676
--- /dev/null
+++ 
b/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
@@ -0,0 +1,25 @@
+package storm.kafka;
+
+import java.util.Arrays;
+import java.util.List;
+
+import backtype.storm.spout.Scheme;
+import backtype.storm.spout.SchemeAsMultiScheme;
+
+public class MessageMetadataSchemeAsMultiScheme extends SchemeAsMultiScheme {
+private static final long serialVersionUID = -7172403703813625116L;
+
+public MessageMetadataSchemeAsMultiScheme(Scheme scheme) {
+super(scheme);
+}
+
+@SuppressWarnings("unchecked")
+public Iterable deserializeMessageWithMetadata(byte[] 
message, Partition partition, int offset) {
+List o = ((MessageMetadataScheme) 
scheme).deserializeMessageWithMetadata(message, partition, offset);
+if (o == null) {
+return null;
+} else {
+return Arrays.asList(o);
+}
+}
+}

http://git-wip-us.apache.org/repos/asf/storm/blob/2f119c6e/external/storm-kafka/src/jvm/storm/kafka/StringMessageAndMetadataScheme.java
--
diff --git 
a/external/storm-kafka/src/jvm/storm/kafka/StringMessageAndMetadataScheme.java 
b/external/storm-kafka/src/jvm/storm/kafka/StringMessageAndMetadataScheme.java
new file mode 100644
index 000..262a27c
--- /dev/null
+++ 
b/external/storm-kafka/src/jvm/storm/kafka/StringMessageAndMetadataScheme.java
@@ -0,0 +1,25 @@
+package

[7/8] storm git commit: Merge branch 'disruptor-upgrade' of https://github.com/revans2/incubator-storm

2015-10-28 Thread kishorvpatil 
Merge branch 'disruptor-upgrade' of https://github.com/revans2/incubator-storm


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1a9e1f96
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1a9e1f96
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1a9e1f96

Branch: refs/heads/master
Commit: 1a9e1f969f7733431bc79dcdf2852f2e3a8f7554
Parents: ee9e4ff 1be78e7
Author: Kishor Patil 
Authored: Wed Oct 28 14:35:14 2015 +
Committer: Kishor Patil 
Committed: Wed Oct 28 14:35:14 2015 +

--
 conf/defaults.yaml  |   1 -
 .../storm/starter/FastWordCountTopology.java| 193 +++
 .../jvm/storm/starter/InOrderDeliveryTest.java  | 175 +
 pom.xml |   4 +-
 storm-core/pom.xml  |   2 +-
 .../src/clj/backtype/storm/daemon/executor.clj  |   3 +-
 .../src/clj/backtype/storm/daemon/worker.clj|   6 +-
 storm-core/src/clj/backtype/storm/disruptor.clj |  32 +--
 storm-core/src/jvm/backtype/storm/Config.java   |  13 +-
 .../backtype/storm/utils/DisruptorQueue.java|  96 +
 .../jvm/backtype/storm/utils/MutableObject.java |   6 +-
 .../utils/DisruptorQueueBackpressureTest.java   |   8 +-
 .../storm/utils/DisruptorQueueTest.java |  65 ++-
 13 files changed, 503 insertions(+), 101 deletions(-)
--

[2/8] storm git commit: Added in an in-order test case.

2015-10-28 Thread kishorvpatil 
Added in an in-order test case.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7e0b08ef
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7e0b08ef
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7e0b08ef

Branch: refs/heads/master
Commit: 7e0b08ef2201db91cb97fec979cd98faf10dbd31
Parents: 41b35ea
Author: Robert (Bobby) Evans 
Authored: Thu Sep 24 13:45:36 2015 -0500
Committer: Robert (Bobby) Evans 
Committed: Mon Oct 26 12:43:51 2015 -0500

--
 .../storm/starter/FastWordCountTopology.java|  12 +-
 .../jvm/storm/starter/InOrderDeliveryTest.java  | 175 +++
 2 files changed, 185 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/7e0b08ef/examples/storm-starter/src/jvm/storm/starter/FastWordCountTopology.java
--
diff --git 
a/examples/storm-starter/src/jvm/storm/starter/FastWordCountTopology.java 
b/examples/storm-starter/src/jvm/storm/starter/FastWordCountTopology.java
index c50c994..dab9405 100644
--- a/examples/storm-starter/src/jvm/storm/starter/FastWordCountTopology.java
+++ b/examples/storm-starter/src/jvm/storm/starter/FastWordCountTopology.java
@@ -127,13 +127,21 @@ public class FastWordCountTopology {
 TopologyInfo info = client.getTopologyInfo(id);
 int uptime = info.get_uptime_secs();
 long acked = 0;
+long failed = 0;
 double weightedAvgTotal = 0.0;
 for (ExecutorSummary exec: info.get_executors()) {
   if ("spout".equals(exec.get_component_id())) {
 SpoutStats stats = exec.get_stats().get_specific().get_spout();
+Map failedMap = stats.get_failed().get(":all-time");
 Map ackedMap = stats.get_acked().get(":all-time");
 Map avgLatMap = 
stats.get_complete_ms_avg().get(":all-time");
 for (String key: ackedMap.keySet()) {
+  if (failedMap != null) {
+  Long tmp = failedMap.get(key);
+  if (tmp != null) {
+  failed += tmp;
+  }
+  }
   long ackVal = ackedMap.get(key);
   double latVal = avgLatMap.get(key) * ackVal;
   acked += ackVal;
@@ -142,7 +150,7 @@ public class FastWordCountTopology {
   }
 }
 double avgLatency = weightedAvgTotal/acked;
-System.out.println("uptime: "+uptime+" acked: "+acked+" avgLatency: 
"+avgLatency+" acked/sec: "+(((double)acked)/uptime));
+System.out.println("uptime: "+uptime+" acked: "+acked+" avgLatency: 
"+avgLatency+" acked/sec: "+(((double)acked)/uptime+" failed: "+failed));
   } 
 
   public static void kill(Nimbus.Client client, String name) throws Exception {
@@ -169,7 +177,7 @@ public class FastWordCountTopology {
 }
 
 conf.setNumWorkers(1);
-StormSubmitter.submitTopologyWithProgressBar(args[0], conf, 
builder.createTopology());
+StormSubmitter.submitTopologyWithProgressBar(name, conf, 
builder.createTopology());
 
 Map clusterConf = Utils.readStormConfig();
 clusterConf.putAll(Utils.readCommandLineOpts());

http://git-wip-us.apache.org/repos/asf/storm/blob/7e0b08ef/examples/storm-starter/src/jvm/storm/starter/InOrderDeliveryTest.java
--
diff --git 
a/examples/storm-starter/src/jvm/storm/starter/InOrderDeliveryTest.java 
b/examples/storm-starter/src/jvm/storm/starter/InOrderDeliveryTest.java
new file mode 100644
index 000..5df0688
--- /dev/null
+++ b/examples/storm-starter/src/jvm/storm/starter/InOrderDeliveryTest.java
@@ -0,0 +1,175 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package storm.starter;
+
+import backtype.storm.Config;
+import backtype.storm.StormSubmitter;
+import backtype.storm.generated.*;
+import backtype.storm.spout.SpoutOutputCollector;
+import backtype.storm.task.TopologyContext;
+import backtype.storm.topology.BasicOutputCollector;
+import backtype.storm.topology.FailedException;
+import

[6/8] storm git commit: Fixed disable of event logger

2015-10-28 Thread kishorvpatil 
Fixed disable of event logger


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1be78e79
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1be78e79
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1be78e79

Branch: refs/heads/master
Commit: 1be78e79a44319ec32f3d45852a284ca6e9cb895
Parents: 945db1a
Author: Robert (Bobby) Evans 
Authored: Mon Oct 26 13:17:42 2015 -0500
Committer: Robert (Bobby) Evans 
Committed: Mon Oct 26 13:17:42 2015 -0500

--
 storm-core/src/jvm/backtype/storm/Config.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/1be78e79/storm-core/src/jvm/backtype/storm/Config.java
--
diff --git a/storm-core/src/jvm/backtype/storm/Config.java 
b/storm-core/src/jvm/backtype/storm/Config.java
index 565ef23..ad74597 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -1256,7 +1256,7 @@ public class Config extends HashMap {
  * event logging will be disabled.
  */
 @isInteger
-@isPositiveNumber
+@isPositiveNumber(includeZero = true)
 public static final String TOPOLOGY_EVENTLOGGER_EXECUTORS = 
"topology.eventlogger.executors";
 
 /**

[5/8] storm git commit: Fixed issue with disruptor queue timeout. Also updated it to use AtomicReference so debugging checks can be simpler.

2015-10-28 Thread kishorvpatil 
Fixed issue with disruptor queue timeout.  Also updated it to use 
AtomicReference so debugging checks can be simpler.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/945db1a6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/945db1a6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/945db1a6

Branch: refs/heads/master
Commit: 945db1a6e92c0c5d6d3c95be103ab3241a82a74f
Parents: acaa3b9
Author: Robert (Bobby) Evans 
Authored: Wed Oct 14 10:47:23 2015 -0500
Committer: Robert (Bobby) Evans 
Committed: Mon Oct 26 12:43:52 2015 -0500

--
 .../backtype/storm/utils/DisruptorQueue.java| 40 +++-
 1 file changed, 23 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/945db1a6/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
--
diff --git a/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java 
b/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
index 9d4261a..33cb5bf 100644
--- a/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
+++ b/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
@@ -38,6 +38,10 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import backtype.storm.metric.api.IStatefulObject;
 import backtype.storm.metric.internal.RateTracker;
@@ -47,11 +51,12 @@ import backtype.storm.metric.internal.RateTracker;
  * the ability to catch up to the producer by processing tuples in batches.
  */
 public class DisruptorQueue implements IStatefulObject {
+private static final Logger LOG = 
LoggerFactory.getLogger(DisruptorQueue.class);
 private static final Object FLUSH_CACHE = new Object();
 private static final Object INTERRUPT = new Object();
 private static final String PREFIX = "disruptor-";
 
-private final RingBuffer _buffer;
+private final RingBuffer _buffer;
 private final Sequence _consumer;
 private final SequenceBarrier _barrier;
 
@@ -115,16 +120,13 @@ public class DisruptorQueue implements IStatefulObject {
 public void consumeBatchWhenAvailable(EventHandler handler) {
 try {
 final long nextSequence = _consumer.get() + 1;
-long availableSequence = 0;
-try {
-availableSequence = _barrier.waitFor(nextSequence);
-} catch (TimeoutException te) {
-availableSequence = _barrier.getCursor();
-}
+long availableSequence = _barrier.waitFor(nextSequence);
 
 if (availableSequence >= nextSequence) {
 consumeBatchToCursor(availableSequence, handler);
 }
+} catch (TimeoutException te) {
+//Ignored
 } catch (AlertException e) {
 throw new RuntimeException(e);
 } catch (InterruptedException e) {
@@ -135,10 +137,12 @@ public class DisruptorQueue implements IStatefulObject {
 private void consumeBatchToCursor(long cursor, EventHandler 
handler) {
 for (long curr = _consumer.get() + 1; curr <= cursor; curr++) {
 try {
-MutableObject mo = _buffer.get(curr);
-Object o = mo.getObject();
-mo.setObject(null);
-if (o == FLUSH_CACHE) {
+AtomicReference mo = _buffer.get(curr);
+Object o = mo.getAndSet(null);
+
+if (o == null) {
+LOG.error("NULL found in {}:{}", this.getName(), cursor);
+} else if (o == FLUSH_CACHE) {
 Object c = null;
 while (true) {
 c = _cache.poll();
@@ -164,7 +168,6 @@ public class DisruptorQueue implements IStatefulObject {
 throw new RuntimeException(e);
 }
 }
-//TODO: only set this if the consumer cursor has changed?
 _consumer.set(cursor);
 }
 
@@ -214,8 +217,8 @@ public class DisruptorQueue implements IStatefulObject {
 } else {
 id = _buffer.tryNext(1);
 }
-final MutableObject m = _buffer.get(id);
-m.setObject(obj);
+final AtomicReference m = _buffer.get(id);
+Object old = m.getAndSet(obj);
 _buffer.publish(id);
 _metrics.notifyArrivals(1);
 if (_enableBackpressure && _cb != null && _metrics.population() >= 
_highWaterMark) {
@@ -228,6 +231,9 @@ public class DisruptorQueue implements IStatefulObject {

[3/8] storm git commit: Fixed null reads from disruptor.

2015-10-28 Thread kishorvpatil 
Fixed null reads from disruptor.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/41b35ea9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/41b35ea9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/41b35ea9

Branch: refs/heads/master
Commit: 41b35ea9f2a2d452a59f5376c416b2beb05de748
Parents: 48c55c8
Author: Robert (Bobby) Evans 
Authored: Wed Sep 23 08:43:41 2015 -0500
Committer: Robert (Bobby) Evans 
Committed: Mon Oct 26 12:43:51 2015 -0500

--
 storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java | 6 --
 storm-core/src/jvm/backtype/storm/utils/MutableObject.java  | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/41b35ea9/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
--
diff --git a/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java 
b/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
index 097ccef..cd32625 100644
--- a/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
+++ b/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
@@ -103,7 +103,9 @@ public class DisruptorQueue implements IStatefulObject {
 }
 
 public void consumeBatch(EventHandler handler) {
-consumeBatchToCursor(_barrier.getCursor(), handler);
+if (_metrics.population() > 0) {
+consumeBatchWhenAvailable(handler);
+}
 }
 
 public void haltWithInterrupt() {
@@ -134,7 +136,7 @@ public class DisruptorQueue implements IStatefulObject {
 for (long curr = _consumer.get() + 1; curr <= cursor; curr++) {
 try {
 MutableObject mo = _buffer.get(curr);
-Object o = mo.o;
+Object o = mo.getObject();
 mo.setObject(null);
 if (o == FLUSH_CACHE) {
 Object c = null;

http://git-wip-us.apache.org/repos/asf/storm/blob/41b35ea9/storm-core/src/jvm/backtype/storm/utils/MutableObject.java
--
diff --git a/storm-core/src/jvm/backtype/storm/utils/MutableObject.java 
b/storm-core/src/jvm/backtype/storm/utils/MutableObject.java
index d5cb7db..2bd9bb1 100644
--- a/storm-core/src/jvm/backtype/storm/utils/MutableObject.java
+++ b/storm-core/src/jvm/backtype/storm/utils/MutableObject.java
@@ -18,7 +18,7 @@
 package backtype.storm.utils;
 
 public class MutableObject {
-Object o = null;
+private Object o = null;
 
 public MutableObject() {
 
@@ -28,11 +28,11 @@ public class MutableObject {
 this.o = o;
 }
 
-public void setObject(Object o) {
+public synchronized void setObject(Object o) {
 this.o = o;
 }
 
-public Object getObject() {
+public synchronized Object getObject() {
 return o;
 }
 }

[11/14] storm git commit: STORM-697: Updated kafka-storm README to include MessageMetadataSchemeAsMultiScheme as an implementation of MultiScheme

2015-10-28 Thread kabhwan 
STORM-697: Updated kafka-storm README to include 
MessageMetadataSchemeAsMultiScheme as an implementation of MultiScheme


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/25e7bc49
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/25e7bc49
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/25e7bc49

Branch: refs/heads/master
Commit: 25e7bc496a85c663d50b0c114c620557f35ee034
Parents: 4d79d9b
Author: Matt Tieman 
Authored: Mon Oct 26 23:07:01 2015 -0400
Committer: Matt Tieman 
Committed: Mon Oct 26 23:07:01 2015 -0400

--
 external/storm-kafka/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/25e7bc49/external/storm-kafka/README.md
--
diff --git a/external/storm-kafka/README.md b/external/storm-kafka/README.md
index ed39dc5..1bf14b7 100644
--- a/external/storm-kafka/README.md
+++ b/external/storm-kafka/README.md
@@ -104,8 +104,8 @@ also controls the naming of your output field.
 ```
 
 The default `RawMultiScheme` just takes the `byte[]` and returns a tuple with 
`byte[]` as is. The name of the
-outputField is "bytes".  There are alternative implementation like 
`SchemeAsMultiScheme` and
-`KeyValueSchemeAsMultiScheme` which can convert the `byte[]` to `String`.
+outputField is "bytes".  There are alternative implementations like 
`SchemeAsMultiScheme`,
+`KeyValueSchemeAsMultiScheme`, and `MessageMetadataSchemeAsMultiScheme` which 
can convert the `byte[]` to `String`.
 
 
 ### Examples

[05/14] storm git commit: STORM-697: Fixed incorrect typing for offset

2015-10-28 Thread kabhwan 
STORM-697: Fixed incorrect typing for offset


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

Branch: refs/heads/master
Commit: 11194653f43ce0d4f65d0051270cd86f2191cbc5
Parents: 2f119c6
Author: matt.tieman 
Authored: Tue Mar 3 16:42:31 2015 -0500
Committer: matt.tieman 
Committed: Tue Mar 3 16:42:31 2015 -0500

--
 external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java| 2 +-
 .../src/jvm/storm/kafka/MessageMetadataScheme.java  | 2 +-
 .../jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java | 2 +-
 .../storm-kafka/src/jvm/storm/kafka/PartitionManager.java   | 9 -
 .../src/jvm/storm/kafka/StringMessageAndMetadataScheme.java | 2 +-
 .../storm-kafka/src/test/storm/kafka/KafkaUtilsTest.java| 8 
 6 files changed, 16 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/11194653/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
--
diff --git a/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java 
b/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
index 9af49fe..17d0fb7 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
@@ -211,7 +211,7 @@ public class KafkaUtils {
 return tups;
 }
 
-public static Iterable generateTuples(KafkaConfig 
kafkaConfig, Message msg, Partition partition, int offset) {
+public static Iterable generateTuples(KafkaConfig 
kafkaConfig, Message msg, Partition partition, long offset) {
 Iterable tups;
 ByteBuffer payload = msg.payload();
 if (payload == null) {

http://git-wip-us.apache.org/repos/asf/storm/blob/11194653/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataScheme.java
--
diff --git 
a/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataScheme.java 
b/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataScheme.java
index d0dd2be..da7acbf 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataScheme.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataScheme.java
@@ -21,5 +21,5 @@ import backtype.storm.spout.Scheme;
  * limitations under the License.
  */
 public interface MessageMetadataScheme extends Scheme {
-public List deserializeMessageWithMetadata(byte[] message, 
Partition partition, int offset);
+public List deserializeMessageWithMetadata(byte[] message, 
Partition partition, long offset);
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/11194653/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
--
diff --git 
a/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
 
b/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
index 6226676..5eb20b5 100644
--- 
a/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
+++ 
b/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
@@ -14,7 +14,7 @@ public class MessageMetadataSchemeAsMultiScheme extends 
SchemeAsMultiScheme {
 }
 
 @SuppressWarnings("unchecked")
-public Iterable deserializeMessageWithMetadata(byte[] 
message, Partition partition, int offset) {
+public Iterable deserializeMessageWithMetadata(byte[] 
message, Partition partition, long offset) {
 List o = ((MessageMetadataScheme) 
scheme).deserializeMessageWithMetadata(message, partition, offset);
 if (o == null) {
 return null;

http://git-wip-us.apache.org/repos/asf/storm/blob/11194653/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
--
diff --git a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java 
b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
index 63e70cf..e1186e3 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
@@ -134,7 +134,14 @@ public class PartitionManager {
 if (toEmit == null) {
 return EmitState.NO_EMITTED;
 }
-Iterable tups = 
KafkaUtils.generateTuples(_spoutConfig, toEmit.msg);
+
+Iterable tups;
+if (_spoutConfig.tupleMetaData) {
+tups =

[03/14] storm git commit: STORM-697: Test for MessageMetadataSchemeAsMultiScheme and generateTuples with metadata using SchemeAsMultiScheme

2015-10-28 Thread kabhwan 
STORM-697: Test for MessageMetadataSchemeAsMultiScheme and generateTuples with 
metadata using SchemeAsMultiScheme


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

Branch: refs/heads/master
Commit: 6e768665320d08815c53f27e706ef2ae1ff5af78
Parents: 6e4fde2
Author: matt.tieman 
Authored: Tue Mar 3 11:48:57 2015 -0500
Committer: matt.tieman 
Committed: Tue Mar 3 11:48:57 2015 -0500

--
 .../src/test/storm/kafka/KafkaUtilsTest.java| 66 +---
 1 file changed, 56 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/6e768665/external/storm-kafka/src/test/storm/kafka/KafkaUtilsTest.java
--
diff --git a/external/storm-kafka/src/test/storm/kafka/KafkaUtilsTest.java 
b/external/storm-kafka/src/test/storm/kafka/KafkaUtilsTest.java
index 1f1bbbc..a7c9b2b 100644
--- a/external/storm-kafka/src/test/storm/kafka/KafkaUtilsTest.java
+++ b/external/storm-kafka/src/test/storm/kafka/KafkaUtilsTest.java
@@ -17,9 +17,14 @@
  */
 package storm.kafka;
 
-import backtype.storm.spout.SchemeAsMultiScheme;
-import backtype.storm.utils.Utils;
-import com.google.common.collect.ImmutableMap;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+import java.util.List;
+import java.util.Properties;
+
 import kafka.api.OffsetRequest;
 import kafka.javaapi.consumer.SimpleConsumer;
 import kafka.javaapi.message.ByteBufferMessageSet;
@@ -27,18 +32,17 @@ import kafka.javaapi.producer.Producer;
 import kafka.message.MessageAndOffset;
 import kafka.producer.KeyedMessage;
 import kafka.producer.ProducerConfig;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import storm.kafka.trident.GlobalPartitionInformation;
+import org.mockito.Mockito;
 
-import java.util.List;
-import java.util.Properties;
+import storm.kafka.trident.GlobalPartitionInformation;
+import backtype.storm.spout.SchemeAsMultiScheme;
+import backtype.storm.utils.Utils;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import com.google.common.collect.ImmutableMap;
 
 public class KafkaUtilsTest {
 
@@ -166,6 +170,47 @@ public class KafkaUtilsTest {
 assertEquals(value, lists.iterator().next().get(0));
 }
 }
+
+@Test
+public void generateTuplesWithMessageAndMetadataScheme() {
+String value = "value";
+Partition mockPartition = Mockito.mock(Partition.class);
+mockPartition.partition = 0;
+int offset = 0;
+
+config.scheme = new MessageMetadataSchemeAsMultiScheme(new 
StringMessageAndMetadataScheme());
+config.tupleMetaData = true;
+
+createTopicAndSendMessage(null, value);
+ByteBufferMessageSet messageAndOffsets = getLastMessage();
+for (MessageAndOffset msg : messageAndOffsets) {
+Iterable lists = KafkaUtils.generateTuples(config, 
msg.message(), mockPartition, offset);
+List values = lists.iterator().next(); 
+assertEquals("Message is incorrect", value, values.get(0));
+assertEquals("Offset is incorrect", offset, values.get(1));
+assertEquals("Partition is incorrect", mockPartition.partition, 
values.get(2));
+}
+}
+
+@Test
+public void generateTuplesWithValueSchemeAndMessageAndMetadata() {
+String value = "value";
+Partition mockPartition = Mockito.mock(Partition.class);
+mockPartition.partition = 0;
+int offset = 0;
+
+config.scheme = new SchemeAsMultiScheme(new StringScheme());
+config.tupleMetaData = true;
+
+createTopicAndSendMessage(null, value);
+ByteBufferMessageSet messageAndOffsets = getLastMessage();
+for (MessageAndOffset msg : messageAndOffsets) {
+Iterable lists = KafkaUtils.generateTuples(config, 
msg.message(), mockPartition, offset);
+List values = lists.iterator().next();
+assertEquals("Incorrect number of tuple values", 1, values.size());
+assertEquals("Message is incorrect", value, values.get(0));
+}
+}
 
 private ByteBufferMessageSet getLastMessage() {
 long offsetOfLastMessage = KafkaUtils.getOffset(simpleConsumer, 
config.topic, 0, OffsetRequest.LatestTime()) - 1;
@@ -174,6 +219,7 @@

[13/14] storm git commit: Merge branch 'STORM-697' of https://github.com/mjtieman/storm into STORM-697

2015-10-28 Thread kabhwan 
Merge branch 'STORM-697' of https://github.com/mjtieman/storm into STORM-697


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/81f6355a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/81f6355a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/81f6355a

Branch: refs/heads/master
Commit: 81f6355afed7f258605e8c137ffee332d36b2b71
Parents: 437c4b1 c0c830c
Author: Jungtaek Lim 
Authored: Wed Oct 28 23:10:33 2015 +0900
Committer: Jungtaek Lim 
Committed: Wed Oct 28 23:10:33 2015 +0900

--
 external/storm-kafka/README.md  | 44 ++---
 .../src/jvm/storm/kafka/KafkaConfig.java|  3 +-
 .../src/jvm/storm/kafka/KafkaUtils.java |  8 +++
 .../jvm/storm/kafka/MessageMetadataScheme.java  | 25 ++
 .../MessageMetadataSchemeAsMultiScheme.java | 40 +++
 .../src/jvm/storm/kafka/PartitionManager.java   | 13 -
 .../kafka/StringMessageAndMetadataScheme.java   | 42 
 .../kafka/trident/TridentKafkaEmitter.java  | 14 --
 .../src/test/storm/kafka/KafkaUtilsTest.java| 52 ++--
 9 files changed, 203 insertions(+), 38 deletions(-)
--

[09/14] storm git commit: STORM-697: Merged in master, resolved conflicts

2015-10-28 Thread kabhwan 
STORM-697: Merged in master, resolved conflicts


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/47f4a3c3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/47f4a3c3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/47f4a3c3

Branch: refs/heads/master
Commit: 47f4a3c3d3396b35928578e36b27dbcc49f00752
Parents: 472567e 93043e6
Author: matt.tieman 
Authored: Wed Oct 14 17:31:08 2015 -0400
Committer: matt.tieman 
Committed: Wed Oct 14 17:31:08 2015 -0400

--
 CHANGELOG.md|   14 +
 README.markdown |1 +
 STORM-UI-REST-API.md|4 +-
 bin/storm   |   20 +-
 bin/storm.py|   35 +-
 conf/defaults.yaml  |   18 +
 dev-tools/storm-merge.py|2 +-
 docs/DYNAMIC_LOG_LEVEL_SETTINGS.md  |   41 +
 docs/images/dynamic_log_level_settings_1.png|  Bin 0 -> 93689 bytes
 docs/images/dynamic_log_level_settings_2.png|  Bin 0 -> 78785 bytes
 examples/storm-starter/pom.xml  |7 +
 .../storm/starter/MultipleLoggerTopology.java   |  105 +
 .../starter/ResourceAwareExampleTopology.java   |   87 +
 .../bolt/IntermediateRankingsBoltTest.java  |2 +-
 .../starter/bolt/RollingCountBoltTest.java  |2 +-
 .../starter/bolt/TotalRankingsBoltTest.java |2 +-
 .../storm/starter/tools/MockTupleHelpers.java   |   40 -
 external/storm-hdfs/pom.xml |   15 +
 .../apache/storm/hdfs/bolt/TestHdfsBolt.java|   18 +-
 external/storm-hive/pom.xml |7 +
 .../apache/storm/hive/bolt/TestHiveBolt.java|   56 +-
 .../src/jvm/storm/kafka/PartitionManager.java   |   20 +-
 storm-core/pom.xml  |   12 +
 storm-core/src/clj/backtype/storm/cluster.clj   |   28 +-
 .../backtype/storm/command/set_log_level.clj|   75 +
 storm-core/src/clj/backtype/storm/converter.clj |4 +-
 .../src/clj/backtype/storm/daemon/common.clj|4 +-
 .../src/clj/backtype/storm/daemon/drpc.clj  |   26 +-
 .../src/clj/backtype/storm/daemon/nimbus.clj|  232 +-
 .../clj/backtype/storm/daemon/supervisor.clj|   13 +-
 .../src/clj/backtype/storm/daemon/worker.clj|  134 +-
 storm-core/src/clj/backtype/storm/log.clj   |   12 +-
 storm-core/src/clj/backtype/storm/stats.clj | 1282 ++-
 storm-core/src/clj/backtype/storm/ui/core.clj   | 1050 +--
 .../src/clj/backtype/storm/ui/helpers.clj   |   30 -
 storm-core/src/jvm/backtype/storm/Config.java   |   70 +
 .../jvm/backtype/storm/ConfigValidation.java|   22 +
 .../src/jvm/backtype/storm/StormSubmitter.java  |   35 +-
 .../storm/coordination/CoordinatedBolt.java |2 +-
 .../backtype/storm/generated/Assignment.java|  194 +-
 .../storm/generated/BoltAggregateStats.java |  704 ++
 .../jvm/backtype/storm/generated/BoltStats.java |  442 +-
 .../storm/generated/ClusterSummary.java |  110 +-
 .../storm/generated/ClusterWorkerHeartbeat.java |   54 +-
 .../storm/generated/CommonAggregateStats.java   |  902 ++
 .../generated/ComponentAggregateStats.java  |  752 ++
 .../storm/generated/ComponentPageInfo.java  | 2194 +
 .../backtype/storm/generated/ComponentType.java |   62 +
 .../backtype/storm/generated/Credentials.java   |   46 +-
 .../storm/generated/ExecutorAggregateStats.java |  526 ++
 .../backtype/storm/generated/ExecutorStats.java |  170 +-
 .../storm/generated/LSApprovedWorkers.java  |   46 +-
 .../generated/LSSupervisorAssignments.java  |   50 +-
 .../storm/generated/LSWorkerHeartbeat.java  |   38 +-
 .../storm/generated/LocalAssignment.java|   38 +-
 .../storm/generated/LocalStateData.java |   50 +-
 .../jvm/backtype/storm/generated/LogConfig.java |  475 +
 .../jvm/backtype/storm/generated/LogLevel.java  |  836 ++
 .../storm/generated/LogLevelAction.java |   65 +
 .../jvm/backtype/storm/generated/Nimbus.java| 8830 +-
 .../jvm/backtype/storm/generated/NodeInfo.java  |   34 +-
 .../storm/generated/RebalanceOptions.java   |   46 +-
 .../storm/generated/SpecificAggregateStats.java |  387 +
 .../storm/generated/SpoutAggregateStats.java|  407 +
 .../backtype/storm/generated/SpoutStats.java|  254 +-
 .../jvm/backtype/storm/generated/StormBase.java |   94 +-
 .../storm/generated/SupervisorInfo.java |  276 +-
 .../storm/generated/SupervisorSummary.java  |  168 +-
 .../backtype/storm/generated/TopologyInfo.java  |  162 +-
 .../storm/generated/TopologyPageInfo.java   | 2003 
 .../backtype/storm/generated/TopologyStats.java | 1094 +++
 .../AbstractDNSToSwitchMapping.java |   95 +
 .../networktopography/DNSToSwitchMapping.java   |   50 +

[01/14] storm git commit: STORM-697: Added tupleMetaData flag

2015-10-28 Thread kabhwan 
Repository: storm
Updated Branches:
  refs/heads/master 437c4b149 -> ee9e4fffb


STORM-697: Added tupleMetaData flag


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5b4c28a0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5b4c28a0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5b4c28a0

Branch: refs/heads/master
Commit: 5b4c28a088ffc62ebcc28e8c28a25d096aa1eb78
Parents: bc54e8e
Author: matt.tieman 
Authored: Tue Mar 3 11:46:30 2015 -0500
Committer: matt.tieman 
Committed: Tue Mar 3 11:46:30 2015 -0500

--
 external/storm-kafka/src/jvm/storm/kafka/KafkaConfig.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/5b4c28a0/external/storm-kafka/src/jvm/storm/kafka/KafkaConfig.java
--
diff --git a/external/storm-kafka/src/jvm/storm/kafka/KafkaConfig.java 
b/external/storm-kafka/src/jvm/storm/kafka/KafkaConfig.java
index 5c85983..9db0f5d 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/KafkaConfig.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/KafkaConfig.java
@@ -38,6 +38,7 @@ public class KafkaConfig implements Serializable {
 public long maxOffsetBehind = Long.MAX_VALUE;
 public boolean useStartOffsetTimeIfOffsetOutOfRange = true;
 public int metricsTimeBucketSizeInSecs = 60;
+public boolean tupleMetaData = false; // True to generate tuples from 
MessageAndRealOffset, false to generate only from the message
 
 public KafkaConfig(BrokerHosts hosts, String topic) {
 this(hosts, topic, kafka.api.OffsetRequest.DefaultClientId());

[08/14] storm git commit: STORM-697: Merged in master, resolved conflicts

2015-10-28 Thread kabhwan 
STORM-697: Merged in master, resolved conflicts


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/472567ec
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/472567ec
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/472567ec

Branch: refs/heads/master
Commit: 472567ec775b054d454617ca640adbf9c3d24383
Parents: 9bfd834 7cf4d25
Author: Matt Tieman 
Authored: Sat Oct 3 14:46:56 2015 -0400
Committer: Matt Tieman 
Committed: Sat Oct 3 14:46:56 2015 -0400

--
 .gitignore  | 9 +-
 .travis.yml |21 +
 BYLAWS.md   |96 -
 CHANGELOG.md|   303 +-
 DEVELOPER.md|58 +-
 LICENSE |   146 +-
 NOTICE  | 4 +-
 README.markdown |61 +-
 SECURITY.md |   273 +-
 STORM-UI-REST-API.md|   131 +-
 TODO|   178 -
 bin/storm   |   585 +-
 bin/storm-config.cmd|30 +-
 bin/storm.cmd   |40 +-
 bin/storm.py|   618 +
 conf/defaults.yaml  |26 +-
 conf/jaas_kerberos.conf |17 +
 conf/log4j2.xml |32 +
 conf/logback.xml|28 -
 conf/storm-env.sh   |24 +
 dev-tools/github/__init__.py|   196 +-
 dev-tools/jira-github-join.py   |77 +-
 dev-tools/jira/__init__.py  |   435 +-
 dev-tools/report/__init__.py|14 +
 dev-tools/report/formatter.py   |68 +
 dev-tools/report/report.py  |   252 +
 dev-tools/report/report_builder.py  |86 +
 dev-tools/storm-merge.py|31 +
 dev-tools/test-ns.py|30 +
 .../travis/print-errors-from-test-reports.py|76 +
 dev-tools/travis/save-logs.py   |54 +
 dev-tools/travis/travis-install.sh  |39 +
 dev-tools/travis/travis-script.sh   |44 +
 doap_Storm.rdf  | 6 +-
 docs/README.md  | 9 +
 docs/_includes/header.html  |13 +-
 docs/_posts/2015-03-25-storm094-released.md |24 +
 docs/_posts/2015-06-04-storm095-released.md |23 +
 .../2015-06-15-storm0100-beta-released.md   |   294 +
 docs/about/multi-language.md| 2 +-
 docs/css/main.scss  | 3 +-
 docs/documentation/BYLAWS.md|98 +
 docs/documentation/Clojure-DSL.md   | 4 +-
 docs/documentation/Command-line-client.md   | 2 +-
 docs/documentation/Common-patterns.md   |20 +-
 docs/documentation/Concepts.md  |57 +-
 docs/documentation/Configuration.md | 4 +-
 docs/documentation/Contributing-to-Storm.md | 2 +-
 docs/documentation/Distributed-RPC.md   | 2 +-
 docs/documentation/Documentation.md | 4 +-
 docs/documentation/FAQ.md   | 7 +-
 .../Guaranteeing-message-processing.md  | 8 +-
 docs/documentation/Home.md  | 2 +-
 docs/documentation/Hooks.md | 6 +-
 docs/documentation/Local-mode.md| 4 +-
 docs/documentation/Maven.md | 4 +-
 docs/documentation/Metrics.md   | 2 +-
 docs/documentation/Multilang-protocol.md|68 +-
 docs/documentation/Powered-By.md|   112 +-
 ...unning-topologies-on-a-production-cluster.md |10 +-
 .../Serialization-(prior-to-0.6.0).md   | 4 +-
 docs/documentation/Serialization.md | 2 +-
 .../documentation/Setting-up-a-Storm-cluster.md |17 +-
 docs/documentation/Structure-of-the-codebase.md |10 +-
 docs/documentation/Transactional-topologies.md  |18 +-
 docs/documentation/Trident-API-Overview.md  | 4 +-
 docs/documentation/Troubleshooting.md   |37 +
 docs/documentation/Tutorial.md  |24 +-
 ...nding-the-parallelism-of-a-Storm-topology.md |21 +-
 .../nimbus_ha_leader_election_and_failover.png  |   Bin 0 -> 154316 bytes
 .../images/nimbus_ha_topology_submission.png|   Bin 0 -> 134180 bytes
 docs/documentation/nimbus-ha-design.md  |   217 +
 docs/downloads.html

[14/14] storm git commit: add STORM-697 to CHANGELOG.md

2015-10-28 Thread kabhwan 
add STORM-697 to CHANGELOG.md

* also add Matthew Tieman to the contributors list


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

Branch: refs/heads/master
Commit: ee9e4fffb684d3ba19c0cce8e97775bea5061bb4
Parents: 81f6355
Author: Jungtaek Lim 
Authored: Wed Oct 28 23:12:48 2015 +0900
Committer: Jungtaek Lim 
Committed: Wed Oct 28 23:12:48 2015 +0900

--
 CHANGELOG.md| 1 +
 README.markdown | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/ee9e4fff/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f50307..f7fd810 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.11.0
+ * STORM-697: Support for Emitting Kafka Message Offset and Partition
  * STORM-1074: Add Avro HDFS bolt
  * STORM-566: Improve documentation including incorrect Kryo ser. framework 
docs
  * STORM-1073: Refactor AbstractHdfsBolt

http://git-wip-us.apache.org/repos/asf/storm/blob/ee9e4fff/README.markdown
--
diff --git a/README.markdown b/README.markdown
index 052dcd2..3f66e42 100644
--- a/README.markdown
+++ b/README.markdown
@@ -235,8 +235,9 @@ under the License.
 * Dmytro Dragan ([@3Dragan](https://github.com/3Dragan))
 * Ningyu An ([@jetan9](https://github.com/jetan9))
 * Pete Prokopowicz ([@prokopowicz](https://github.com/prokopowicz))
-* Priyank Shah ([@priyank5485](https://github.com/priyank5485)]
-* Joshua Martell ([@jmartell7](https://github.com/jmartell7)]
+* Priyank Shah ([@priyank5485](https://github.com/priyank5485))
+* Joshua Martell ([@jmartell7](https://github.com/jmartell7))
+* Matthew Tieman ([@mjtieman](https://github.com/mjtieman)])
 
 ## Acknowledgements

[07/14] storm git commit: STORM-697: Changed constructor to accept instance of MessageMetadataScheme. Assures a type-safe cast in deserializeMessageWithMetadata

2015-10-28 Thread kabhwan 
STORM-697: Changed constructor to accept instance of MessageMetadataScheme. 
Assures a type-safe cast in deserializeMessageWithMetadata


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9bfd834a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9bfd834a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9bfd834a

Branch: refs/heads/master
Commit: 9bfd834aaf344a63c1f010a40a7f1bce5a315d4f
Parents: e6d319d
Author: Matt Tieman 
Authored: Sat Apr 11 17:36:17 2015 -0400
Committer: Matt Tieman 
Committed: Sat Apr 11 17:36:17 2015 -0400

--
 .../src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/9bfd834a/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
--
diff --git 
a/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
 
b/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
index 5eb20b5..dcdbf8b 100644
--- 
a/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
+++ 
b/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
@@ -3,13 +3,12 @@ package storm.kafka;
 import java.util.Arrays;
 import java.util.List;
 
-import backtype.storm.spout.Scheme;
 import backtype.storm.spout.SchemeAsMultiScheme;
 
 public class MessageMetadataSchemeAsMultiScheme extends SchemeAsMultiScheme {
 private static final long serialVersionUID = -7172403703813625116L;
 
-public MessageMetadataSchemeAsMultiScheme(Scheme scheme) {
+public MessageMetadataSchemeAsMultiScheme(MessageMetadataScheme scheme) {
 super(scheme);
 }

[12/14] storm git commit: STORM-697: Review feedback: Fixed missing or misplaced licenses. Added a more verbose explaination of MessageMetadataSchemeAsMultiScheme in the README

2015-10-28 Thread kabhwan 
STORM-697: Review feedback: Fixed missing or misplaced licenses. Added a more 
verbose explaination of MessageMetadataSchemeAsMultiScheme in the README


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

Branch: refs/heads/master
Commit: c0c830c1e41059a39a61b6563d77ecab5f333186
Parents: 25e7bc4
Author: matt.tieman 
Authored: Wed Oct 28 09:10:53 2015 -0400
Committer: matt.tieman 
Committed: Wed Oct 28 09:10:53 2015 -0400

--
 external/storm-kafka/README.md  | 44 
 .../jvm/storm/kafka/MessageMetadataScheme.java  | 10 ++---
 .../MessageMetadataSchemeAsMultiScheme.java | 17 
 .../kafka/StringMessageAndMetadataScheme.java   | 17 
 4 files changed, 65 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/c0c830c1/external/storm-kafka/README.md
--
diff --git a/external/storm-kafka/README.md b/external/storm-kafka/README.md
index 1bf14b7..04fb96c 100644
--- a/external/storm-kafka/README.md
+++ b/external/storm-kafka/README.md
@@ -6,16 +6,16 @@ Provides core Storm and Trident spout implementations for 
consuming data from Ap
 ##Spouts
 We support both Trident and core Storm spouts. For both spout implementations, 
we use a BrokerHost interface that
 tracks Kafka broker host to partition mapping and kafkaConfig that controls 
some Kafka related parameters.
- 
+
 ###BrokerHosts
-In order to initialize your Kafka spout/emitter you need to construct an 
instance of the marker interface BrokerHosts. 
+In order to initialize your Kafka spout/emitter you need to construct an 
instance of the marker interface BrokerHosts.
 Currently, we support the following two implementations:
 
 ZkHosts
-ZkHosts is what you should use if you want to dynamically track Kafka broker 
to partition mapping. This class uses 
+ZkHosts is what you should use if you want to dynamically track Kafka broker 
to partition mapping. This class uses
 Kafka's ZooKeeper entries to track brokerHost -> partition mapping. You can 
instantiate an object by calling
 ```java
-public ZkHosts(String brokerZkStr, String brokerZkPath) 
+public ZkHosts(String brokerZkStr, String brokerZkPath)
 public ZkHosts(String brokerZkStr)
 ```
 Where brokerZkStr is just ip:port (e.g. localhost:2181). brokerZkPath is the 
root directory under which all the topics and
@@ -40,7 +40,7 @@ of this class, you need to first construct an instance of 
GlobalPartitionInforma
 ```
 
 ###KafkaConfig
-The second thing needed for constructing a kafkaSpout is an instance of 
KafkaConfig. 
+The second thing needed for constructing a kafkaSpout is an instance of 
KafkaConfig.
 ```java
 public KafkaConfig(BrokerHosts hosts, String topic)
 public KafkaConfig(BrokerHosts hosts, String topic, String clientId)
@@ -103,9 +103,17 @@ also controls the naming of your output field.
   public Fields getOutputFields();
 ```
 
-The default `RawMultiScheme` just takes the `byte[]` and returns a tuple with 
`byte[]` as is. The name of the
-outputField is "bytes".  There are alternative implementations like 
`SchemeAsMultiScheme`,
-`KeyValueSchemeAsMultiScheme`, and `MessageMetadataSchemeAsMultiScheme` which 
can convert the `byte[]` to `String`.
+The default `RawMultiScheme` just takes the `byte[]` and returns a tuple with 
`byte[]` as is. The name of the outputField is "bytes". There are alternative 
implementations like `SchemeAsMultiScheme` and `KeyValueSchemeAsMultiScheme` 
which can convert the `byte[]` to `String`.
+
+There is also an extension of `SchemeAsMultiScheme`, 
`MessageMetadataSchemeAsMultiScheme`,
+which has an additional deserialize method that accepts the message `byte[]` 
in addition to the `Partition` and `offset` associated with the message.
+
+```java
+public Iterable deserializeMessageWithMetadata(byte[] message, 
Partition partition, long offset)
+
+```
+
+This is useful for auditing/replaying messages from arbitrary points on a 
Kafka topic, saving the partition and offset of each message of a discrete 
stream instead of persisting the entire message.
 
 
 ### Examples
@@ -184,7 +192,7 @@ use Kafka 0.8.1.1 built against Scala 2.10, you would use 
the following dependen
 Note that the ZooKeeper and log4j dependencies are excluded to prevent version 
conflicts with Storm's dependencies.
 
 ##Writing to Kafka as part of your topology
-You can create an instance of storm.kafka.bolt.KafkaBolt and attach it as a 
component to your topology or if you 
+You can create an instance of storm.kafka.bolt.KafkaBolt and attach it as

[10/14] storm git commit: STORM-697: Review feedback: Removed tupleMetaData from SpoutConfig, used instanceof check on spout scheme to determine if tuples should be generated with meta data

2015-10-28 Thread kabhwan 
STORM-697: Review feedback: Removed tupleMetaData from SpoutConfig, used 
instanceof check on spout scheme to determine if tuples should be generated 
with meta data


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4d79d9b3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4d79d9b3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4d79d9b3

Branch: refs/heads/master
Commit: 4d79d9b3b66bd381d6654e68fb418d2efad8e922
Parents: 47f4a3c
Author: Matt Tieman 
Authored: Fri Oct 23 23:47:13 2015 -0400
Committer: Matt Tieman 
Committed: Fri Oct 23 23:47:13 2015 -0400

--
 .../src/jvm/storm/kafka/KafkaConfig.java|  4 ++--
 .../src/jvm/storm/kafka/KafkaUtils.java | 11 ++---
 .../MessageMetadataSchemeAsMultiScheme.java |  1 -
 .../src/jvm/storm/kafka/PartitionManager.java   |  8 +--
 .../kafka/trident/TridentKafkaEmitter.java  |  4 ++--
 .../src/test/storm/kafka/KafkaUtilsTest.java| 25 ++--
 6 files changed, 14 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/4d79d9b3/external/storm-kafka/src/jvm/storm/kafka/KafkaConfig.java
--
diff --git a/external/storm-kafka/src/jvm/storm/kafka/KafkaConfig.java 
b/external/storm-kafka/src/jvm/storm/kafka/KafkaConfig.java
index ea0e421..49c7526 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/KafkaConfig.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/KafkaConfig.java
@@ -23,7 +23,8 @@ import backtype.storm.spout.RawMultiScheme;
 import java.io.Serializable;
 
 public class KafkaConfig implements Serializable {
-
+private static final long serialVersionUID = 5276718734571623855L;
+
 public final BrokerHosts hosts;
 public final String topic;
 public final String clientId;
@@ -38,7 +39,6 @@ public class KafkaConfig implements Serializable {
 public long maxOffsetBehind = Long.MAX_VALUE;
 public boolean useStartOffsetTimeIfOffsetOutOfRange = true;
 public int metricsTimeBucketSizeInSecs = 60;
-public boolean tupleMetaData = false; // True to generate tuples from 
MessageAndRealOffset, false to generate only from the message
 
 public KafkaConfig(BrokerHosts hosts, String topic) {
 this(hosts, topic, kafka.api.OffsetRequest.DefaultClientId());

http://git-wip-us.apache.org/repos/asf/storm/blob/4d79d9b3/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
--
diff --git a/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java 
b/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
index 340f629..2e047b3 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
@@ -208,19 +208,12 @@ public class KafkaUtils {
 return tups;
 }
 
-public static Iterable generateTuples(KafkaConfig 
kafkaConfig, Message msg, Partition partition, long offset) {
-Iterable tups;
+public static Iterable 
generateTuples(MessageMetadataSchemeAsMultiScheme scheme, Message msg, 
Partition partition, long offset) {
 ByteBuffer payload = msg.payload();
 if (payload == null) {
 return null;
 }
-
-if (kafkaConfig.scheme instanceof MessageMetadataSchemeAsMultiScheme) {
-tups = ((MessageMetadataSchemeAsMultiScheme) 
kafkaConfig.scheme).deserializeMessageWithMetadata(Utils.toByteArray(payload), 
partition, offset);
-} else {
-tups = kafkaConfig.scheme.deserialize(Utils.toByteArray(payload));
-}
-return tups;
+return 
scheme.deserializeMessageWithMetadata(Utils.toByteArray(payload), partition, 
offset);
 }
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/4d79d9b3/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
--
diff --git 
a/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
 
b/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
index dcdbf8b..e89e391 100644
--- 
a/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
+++ 
b/external/storm-kafka/src/jvm/storm/kafka/MessageMetadataSchemeAsMultiScheme.java
@@ -12,7 +12,6 @@ public class MessageMetadataSchemeAsMultiScheme extends 
SchemeAsMultiScheme {
 super(scheme);
 }
 
-@SuppressWarnings("unchecked")
 public Iterable deserializeMessageWithMetadata(byte[] 
message, Partition partition, long offset) {
 List o = ((MessageMetadataScheme)

[02/14] storm git commit: STORM-697: Overload of generateTuples to accept the Partition and offset

2015-10-28 Thread kabhwan 
STORM-697: Overload of generateTuples to accept the Partition and offset


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

Branch: refs/heads/master
Commit: 6e4fde20af8d285cdf4829e4c2c4aef4cd45d89d
Parents: 5b4c28a
Author: matt.tieman 
Authored: Tue Mar 3 11:47:38 2015 -0500
Committer: matt.tieman 
Committed: Tue Mar 3 11:47:38 2015 -0500

--
 .../storm-kafka/src/jvm/storm/kafka/KafkaUtils.java  | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/6e4fde20/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
--
diff --git a/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java 
b/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
index 137dc99..9af49fe 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
@@ -210,6 +210,21 @@ public class KafkaUtils {
 }
 return tups;
 }
+
+public static Iterable generateTuples(KafkaConfig 
kafkaConfig, Message msg, Partition partition, int offset) {
+Iterable tups;
+ByteBuffer payload = msg.payload();
+if (payload == null) {
+return null;
+}
+
+if (kafkaConfig.scheme instanceof MessageMetadataSchemeAsMultiScheme) {
+tups = ((MessageMetadataSchemeAsMultiScheme) 
kafkaConfig.scheme).deserializeMessageWithMetadata(Utils.toByteArray(payload), 
partition, offset);
+} else {
+tups = kafkaConfig.scheme.deserialize(Utils.toByteArray(payload));
+}
+return tups;
+}
 
 
 public static List 
calculatePartitionsForTask(GlobalPartitionInformation partitionInformation, int 
totalTasks, int taskIndex) {

[4/8] storm git commit: STORM-350: Upgrade to newer version of disruptor

2015-10-28 Thread kishorvpatil 
STORM-350: Upgrade to newer version of disruptor


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/48c55c84
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/48c55c84
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/48c55c84

Branch: refs/heads/master
Commit: 48c55c84cc7a39dc1edf6cc8d6b196dd94b9c8b0
Parents: f582b8f
Author: Robert (Bobby) Evans 
Authored: Fri Sep 18 16:33:39 2015 -0500
Committer: Robert (Bobby) Evans 
Committed: Mon Oct 26 12:43:51 2015 -0500

--
 conf/defaults.yaml  |   1 -
 .../storm/starter/FastWordCountTopology.java| 185 +++
 pom.xml |   4 +-
 storm-core/pom.xml  |   2 +-
 .../src/clj/backtype/storm/daemon/executor.clj  |   3 +-
 .../src/clj/backtype/storm/daemon/worker.clj|   6 +-
 storm-core/src/clj/backtype/storm/disruptor.clj |  32 +---
 storm-core/src/jvm/backtype/storm/Config.java   |  11 +-
 .../backtype/storm/utils/DisruptorQueue.java|  62 ---
 .../utils/DisruptorQueueBackpressureTest.java   |   8 +-
 .../storm/utils/DisruptorQueueTest.java |  65 ++-
 11 files changed, 295 insertions(+), 84 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/48c55c84/conf/defaults.yaml
--
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 7166bd4..f4c189c 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -210,7 +210,6 @@ topology.executor.send.buffer.size: 1024 #individual 
messages
 topology.transfer.buffer.size: 1024 # batched
 topology.tick.tuple.freq.secs: null
 topology.worker.shared.thread.pool.size: 4
-topology.disruptor.wait.strategy: "com.lmax.disruptor.BlockingWaitStrategy"
 topology.spout.wait.strategy: "backtype.storm.spout.SleepSpoutWaitStrategy"
 topology.sleep.spout.wait.strategy.time.ms: 1
 topology.error.throttle.interval.secs: 10

http://git-wip-us.apache.org/repos/asf/storm/blob/48c55c84/examples/storm-starter/src/jvm/storm/starter/FastWordCountTopology.java
--
diff --git 
a/examples/storm-starter/src/jvm/storm/starter/FastWordCountTopology.java 
b/examples/storm-starter/src/jvm/storm/starter/FastWordCountTopology.java
new file mode 100644
index 000..c50c994
--- /dev/null
+++ b/examples/storm-starter/src/jvm/storm/starter/FastWordCountTopology.java
@@ -0,0 +1,185 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package storm.starter;
+
+import backtype.storm.Config;
+import backtype.storm.StormSubmitter;
+import backtype.storm.generated.*;
+import backtype.storm.spout.SpoutOutputCollector;
+import backtype.storm.task.TopologyContext;
+import backtype.storm.topology.BasicOutputCollector;
+import backtype.storm.topology.IRichBolt;
+import backtype.storm.topology.OutputFieldsDeclarer;
+import backtype.storm.topology.TopologyBuilder;
+import backtype.storm.topology.base.BaseBasicBolt;
+import backtype.storm.topology.base.BaseRichSpout;
+import backtype.storm.tuple.Fields;
+import backtype.storm.tuple.Tuple;
+import backtype.storm.tuple.Values;
+import backtype.storm.utils.NimbusClient;
+import backtype.storm.utils.Utils;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * WordCount but teh spout does not stop, and the bolts are implemented in
+ * java.  This can show how fast the word count can run.
+ */
+public class FastWordCountTopology {
+  public static class FastRandomSentenceSpout extends BaseRichSpout {
+SpoutOutputCollector _collector;
+Random _rand;
+
+@Override
+public void open(Map conf, TopologyContext context, SpoutOutputCollector 
collector) {
+  _collector = collector;
+  _rand = ThreadLocalRandom.current();
+}
+
+@Override
+public void nextTuple() {
+  String[] sentences = new String[]{ "the cow jumped over the

[8/8] storm git commit: Added STORM-350 to Changelog.

2015-10-28 Thread kishorvpatil 
Added STORM-350 to Changelog.


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

Branch: refs/heads/master
Commit: c65b07b66f6c1bce0054e28650ff14a50cf59728
Parents: 1a9e1f9
Author: Kishor Patil 
Authored: Wed Oct 28 14:55:55 2015 +
Committer: Kishor Patil 
Committed: Wed Oct 28 14:55:55 2015 +

--
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/c65b07b6/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7fd810..bc60092 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.11.0
+ * STORM-350: Update disruptor to latest version (3.3.2)
  * STORM-697: Support for Emitting Kafka Message Offset and Partition
  * STORM-1074: Add Avro HDFS bolt
  * STORM-566: Improve documentation including incorrect Kryo ser. framework 
docs

svn commit: r10949 - /dev/storm/apache-storm-0.9.6-rc2/

2015-10-28 Thread ptgoetz 
Author: ptgoetz
Date: Wed Oct 28 21:12:37 2015
New Revision: 10949

Log:
stage 0.9.6 rc2 release

Added:
dev/storm/apache-storm-0.9.6-rc2/
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz   (with 
props)
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz.asc
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz.md5
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz.sha
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.zip   (with props)
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.zip.asc
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.zip.md5
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.zip.sha
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6.tar.gz   (with props)
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6.tar.gz.asc
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6.tar.gz.md5
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6.tar.gz.sha
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6.zip   (with props)
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6.zip.asc
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6.zip.md5
dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6.zip.sha

Added: dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz
==
Binary file - no diff available.

Propchange: dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz.asc
==
--- dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz.asc (added)
+++ dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz.asc Wed Oct 
28 21:12:37 2015
@@ -0,0 +1,11 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - https://gpgtools.org
+
+iQEcBAABCgAGBQJWMTk6AAoJEI3gOWLoC4/9dMYIAO17/4aRToXnlIKuXzUiCwfw
+QtpLvgGhHuPcSVUR2zuRY1s8K5m9z7NS5PLkIhjN86CZifP9Si+lm5f9JY0rMRra
+OStQtSvksAqKPe4AQiRVdXotFSl9P5xUpO7xROwSj94myBCKS+B3+0DbjG3QPC8Z
+bueoi43Vc3MXoorLiTkBOxIRZbmuPlgWkjYuWr8Kr8RnXYoG4jBqVI2pf/SRDCJz
+Auh0HggCfYpVwzeYpNdkc5rbc4BP24GvMYn/IHMNqdUmTdg+rocz3FRjGrMhS8t6
+0VsjlvWkd6Oe1dfTprzHdW8xism4FYj1Y889W1BTpP9P9drT5y82zcqQNlf9MMA=
+=Ddte
+-END PGP SIGNATURE-

Added: dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz.md5
==
--- dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz.md5 (added)
+++ dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz.md5 Wed Oct 
28 21:12:37 2015
@@ -0,0 +1 @@
+apache-storm-0.9.6-src.tar.gz: C0 4A D6 27 DA 78 80 F1  88 B2 D1 D5 37 DB EE EA

Added: dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz.sha
==
--- dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz.sha (added)
+++ dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.tar.gz.sha Wed Oct 
28 21:12:37 2015
@@ -0,0 +1,4 @@
+apache-storm-0.9.6-src.tar.gz: 2B23870F A5D5EFDC 332192FA EA47DAF3 03E56DCC
+   5AD395EE 2EB75A05 11B243C2 102409CD DC2CF899
+   986AA0F0 891594D4 56C6ED97 FAD8A6FD F604BB9A
+   073A41B1

Added: dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.zip
==
Binary file - no diff available.

Propchange: dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.zip
--
svn:mime-type = application/octet-stream

Added: dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.zip.asc
==
--- dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.zip.asc (added)
+++ dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.zip.asc Wed Oct 28 
21:12:37 2015
@@ -0,0 +1,11 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - https://gpgtools.org
+
+iQEcBAABCgAGBQJWMTk6AAoJEI3gOWLoC4/937sH/Rk8Hne4SrCfwd1uxgvh8CBM
++teguYyu+Clp4tIY5u8G9zARYDq4FkDvdcNgWQOOxl/bVShVeBsx6qGdOupuoNtZ
+J6bv2/MAGKf2l4NVrfo8w3e4vrpwiTWndzO69p3crPaDDFV/7qmszZsy625TVFPg
+8NTNrxk4B1DxQ9Exeeysi+NtILrwpVAtEvKHmMuRoiXzby5IUWw8fuolf7++ZoTf
+zkXhBJCruWLJTMGpE4ePDKRldyGYWMtAkBUf583XiEN63A5DpTapk3buCSlJSdFs
+G27N70kqx1Tu7KbjwzeAanJ96HOQNlsn8J3lIAyOpbctNtfqPVVHGtfhj2IAWPc=
+=Bejy
+-END PGP SIGNATURE-

Added: dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.zip.md5
==
--- dev/storm/apache-storm-0.9.6-rc2/apache-storm-0.9.6-src.zip.md5 (added)

[6/6] storm git commit: [maven-release-plugin] prepare release v0.9.6

2015-10-28 Thread ptgoetz 
[maven-release-plugin] prepare release v0.9.6


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/90a97ad6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/90a97ad6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/90a97ad6

Branch: refs/heads/0.9.x-branch
Commit: 90a97ad6101de3c01233384e3dd3eeff2dde2ba3
Parents: 2c4e017
Author: P. Taylor Goetz 
Authored: Wed Oct 28 16:31:14 2015 -0400
Committer: P. Taylor Goetz 
Committed: Wed Oct 28 16:31:14 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/90a97ad6/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index f2aacd0..408cd21 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  0.9.6-SNAPSHOT
+  0.9.6
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/90a97ad6/external/storm-hbase/pom.xml
--
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index fe19688..da6c00d 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/90a97ad6/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index a265490..9e48789 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/90a97ad6/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 36f77c3..db8375b 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/90a97ad6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 105838d..bc0bd8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.storm
 storm
-0.9.6-SNAPSHOT
+0.9.6
 pom
 Storm
 Distributed and fault-tolerant realtime 
computation
@@ -166,7 +166,7 @@
 
 
scm:git:https://git-wip-us.apache.org/repos/asf/storm.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/storm.git
-HEAD
+v0.9.6
 https://git-wip-us.apache.org/repos/asf/storm
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/90a97ad6/storm-buildtools/maven-shade-clojure-transformer/pom.xml
--
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml 
b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index dfca2a4..e80b4e8 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/90a97ad6/storm-core/pom.xml
--
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 3b7d177..31ac343 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -20,7 +20,7 @@
 
 storm
 org.apache.storm
-0.9.6-SNAPSHOT
+0.9.6
 
 org.apache.storm
 storm-core

http://git-wip-us.apache.org/repos/asf/storm/blob/90a97ad6/storm-dist/binary/pom.xml

[4/6] storm git commit: Revert "[maven-release-plugin] prepare for next development iteration"

2015-10-28 Thread ptgoetz 
Revert "[maven-release-plugin] prepare for next development iteration"

This reverts commit 45e61777b11ea03014f9944becca1fe511e84fb6.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1b686520
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1b686520
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1b686520

Branch: refs/heads/0.9.x-branch
Commit: 1b6865208c3812a71d08dbbc6fe5a37c763be834
Parents: 266e0fe
Author: P. Taylor Goetz 
Authored: Wed Oct 28 16:22:44 2015 -0400
Committer: P. Taylor Goetz 
Committed: Wed Oct 28 16:22:44 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/1b686520/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 96442b1..408cd21 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  0.9.7-SNAPSHOT
+  0.9.6
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/1b686520/external/storm-hbase/pom.xml
--
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index 6a68a17..da6c00d 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.7-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/1b686520/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 5a97fc2..9e48789 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.7-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/1b686520/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 4f9bf4b..db8375b 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.7-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/1b686520/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9676f86..bc0bd8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.storm
 storm
-0.9.7-SNAPSHOT
+0.9.6
 pom
 Storm
 Distributed and fault-tolerant realtime 
computation
@@ -166,7 +166,7 @@
 
 
scm:git:https://git-wip-us.apache.org/repos/asf/storm.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/storm.git
-HEAD
+v0.9.6
 https://git-wip-us.apache.org/repos/asf/storm
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/1b686520/storm-buildtools/maven-shade-clojure-transformer/pom.xml
--
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml 
b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index 735301b..e80b4e8 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.7-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/1b686520/storm-core/pom.xml
--
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index d21a634..31ac343 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -20,7 +20,7 @@
 
 storm
 org.apache.storm
-0.9.7-SNAPSHOT
+0.9.6
 
 org.apache.storm
 storm-core

[2/6] storm git commit: Merge branch 'oveflow-buffer' of github.com:abhishekagarwal87/storm into 0.9.x-branch

2015-10-28 Thread ptgoetz 
Merge branch 'oveflow-buffer' of github.com:abhishekagarwal87/storm into 
0.9.x-branch


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

Branch: refs/heads/0.9.x-branch
Commit: f8e429bf3fce56850d9faad9cd97bfa1bd80f78e
Parents: 45e6177 e696481
Author: P. Taylor Goetz 
Authored: Wed Oct 28 16:10:07 2015 -0400
Committer: P. Taylor Goetz 
Committed: Wed Oct 28 16:10:07 2015 -0400

--
 .../src/clj/backtype/storm/daemon/executor.clj  | 72 +++-
 1 file changed, 39 insertions(+), 33 deletions(-)
--

storm git commit: [maven-release-plugin] prepare for next development iteration

2015-10-28 Thread ptgoetz 
Repository: storm
Updated Branches:
  refs/heads/0.9.x-branch 90a97ad61 -> e7c0f239b


[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/0.9.x-branch
Commit: e7c0f239bdd1bb85d8f95084feb617bc10041cd4
Parents: 90a97ad
Author: P. Taylor Goetz 
Authored: Wed Oct 28 16:31:26 2015 -0400
Committer: P. Taylor Goetz 
Committed: Wed Oct 28 16:31:26 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/e7c0f239/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 408cd21..96442b1 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  0.9.6
+  0.9.7-SNAPSHOT
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/e7c0f239/external/storm-hbase/pom.xml
--
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index da6c00d..6a68a17 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.7-SNAPSHOT
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/e7c0f239/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 9e48789..5a97fc2 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.7-SNAPSHOT
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/e7c0f239/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index db8375b..4f9bf4b 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.7-SNAPSHOT
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/e7c0f239/pom.xml
--
diff --git a/pom.xml b/pom.xml
index bc0bd8f..9676f86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.storm
 storm
-0.9.6
+0.9.7-SNAPSHOT
 pom
 Storm
 Distributed and fault-tolerant realtime 
computation
@@ -166,7 +166,7 @@
 
 
scm:git:https://git-wip-us.apache.org/repos/asf/storm.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/storm.git
-v0.9.6
+HEAD
 https://git-wip-us.apache.org/repos/asf/storm
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/e7c0f239/storm-buildtools/maven-shade-clojure-transformer/pom.xml
--
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml 
b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index e80b4e8..735301b 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.7-SNAPSHOT
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/e7c0f239/storm-core/pom.xml
--
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 31ac343..d21a634 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -20,7 +20,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.7-SNAPSHOT
 
 org.apache.storm

Git Push Summary

2015-10-28 Thread ptgoetz 
Repository: storm
Updated Tags:  refs/tags/v0.9.6 [deleted] d0ccfa354