incubator-s4-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmo...@apache.org
Subject [15/15] git commit: Merge branch 'S4-95' into dev
Date Fri, 18 Jan 2013 12:16:45 GMT
Updated Branches:
  refs/heads/dev 57a3999d3 -> 2a95d3549


Merge branch 'S4-95' into dev


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

Branch: refs/heads/dev
Commit: 2a95d3549573f02c2fb8462121d7b54ac0bd4dfd
Parents: 57a3999 8c4c7a5
Author: Matthieu Morel <mmorel@apache.org>
Authored: Fri Jan 18 12:58:10 2013 +0100
Committer: Matthieu Morel <mmorel@apache.org>
Committed: Fri Jan 18 12:58:10 2013 +0100

----------------------------------------------------------------------
 build.gradle                                       |   23 +-
 lib/reflectasm-1.07-shaded.jar                     |  Bin 0 -> 65612 bytes
 settings.gradle                                    |    7 +-
 .../src/main/java/org/apache/s4/base/Emitter.java  |    8 +-
 .../src/main/java/org/apache/s4/base/Event.java    |   14 +-
 .../main/java/org/apache/s4/base/EventMessage.java |   72 -----
 .../src/main/java/org/apache/s4/base/Listener.java |   13 +-
 .../src/main/java/org/apache/s4/base/Receiver.java |   24 ++
 .../src/main/java/org/apache/s4/base/Sender.java   |   32 +++
 .../org/apache/s4/base/SerializerDeserializer.java |    8 +-
 .../main/java/org/apache/s4/base/package-info.java |    3 +
 subprojects/s4-benchmarks/README.md                |  100 +++++++
 subprojects/s4-benchmarks/bench-cluster.sh         |   92 ++++++
 subprojects/s4-benchmarks/config/injector.config   |    7 +
 subprojects/s4-benchmarks/config/node.config       |    3 +
 subprojects/s4-benchmarks/s4-benchmarks.gradle     |   82 ++++++
 .../java/org/apache/s4/benchmark/dag/DagApp.java   |  109 ++++++++
 .../java/org/apache/s4/benchmark/dag/FirstPE.java  |   42 +++
 .../java/org/apache/s4/benchmark/dag/LastPE.java   |   30 ++
 .../java/org/apache/s4/benchmark/dag/PipePE.java   |   42 +++
 .../s4/benchmark/prodcon/ProducerConsumerApp.java  |   79 ++++++
 .../org/apache/s4/benchmark/prodcon/SimplePE1.java |   36 +++
 .../org/apache/s4/benchmark/prodcon/SimplePE2.java |   30 ++
 .../s4/benchmark/utils/InjectionLimiterModule.java |   15 +
 .../org/apache/s4/benchmark/utils/Injector.java    |  207 ++++++++++++++
 .../java/org/apache/s4/benchmark/utils/Utils.java  |   70 +++++
 .../s4-benchmarks/src/main/resources/logback.xml   |   14 +
 subprojects/s4-benchmarks/startInjector.sh         |   19 ++
 subprojects/s4-benchmarks/startNode.sh             |   16 +
 .../java/org/apache/s4/comm/DefaultCommModule.java |   16 +-
 .../s4/comm/DeserializerExecutorFactory.java       |   29 ++
 .../org/apache/s4/comm/serialize/KryoSerDeser.java |   71 +++---
 .../serialize/SerializerDeserializerFactory.java   |    9 +
 .../BlockingDeserializerExecutorFactory.java       |   26 ++
 .../staging/BlockingThreadPoolExecutorService.java |  214 +++++++++++++++
 .../MemoryAwareDeserializerExecutorFactory.java    |   44 +++
 .../ThrottlingThreadPoolExecutorService.java       |  142 ++++++++++
 .../org/apache/s4/comm/tcp/RemoteEmitters.java     |   17 +-
 .../java/org/apache/s4/comm/tcp/TCPEmitter.java    |   71 ++++-
 .../java/org/apache/s4/comm/tcp/TCPListener.java   |   61 ++--
 .../org/apache/s4/comm/tcp/TCPRemoteEmitter.java   |   10 +-
 .../java/org/apache/s4/comm/udp/UDPEmitter.java    |   14 +-
 .../java/org/apache/s4/comm/udp/UDPListener.java   |   31 ++-
 .../org/apache/s4/comm/udp/UDPRemoteEmitter.java   |    5 +-
 .../org/apache/s4/comm/util/EmitterMetrics.java    |   26 ++
 .../src/main/resources/default.s4.comm.properties  |   27 ++-
 .../java/org/apache/s4/comm/DeliveryTestUtil.java  |  159 -----------
 .../s4/comm/tcp/MultiPartitionDeliveryTest.java    |   34 ---
 .../org/apache/s4/comm/tcp/SimpleDeliveryTest.java |   34 ---
 .../java/org/apache/s4/comm/tcp/TCPBasicTest.java  |   45 +++
 .../java/org/apache/s4/comm/tcp/TCPCommTest.java   |   68 -----
 .../s4/comm/topology/AssignmentsFromZKTest1.java   |    3 +-
 .../s4/comm/topology/ClustersFromZKTest.java       |    3 +-
 .../org/apache/s4/comm/topology/ZKBaseTest.java    |   44 ---
 .../s4/comm/udp/MultiPartitionDeliveryTest.java    |   27 --
 .../org/apache/s4/comm/udp/SimpleDeliveryTest.java |   27 --
 .../java/org/apache/s4/comm/udp/UDPBasicTest.java  |   42 +++
 .../java/org/apache/s4/comm/udp/UDPCommTest.java   |   79 ------
 .../org/apache/s4/comm/util/PartitionInfo.java     |  196 -------------
 .../org/apache/s4/comm/util/ProtocolTestUtil.java  |  116 --------
 .../java/org/apache/s4/fixtures/CommTestUtils.java |    3 +
 .../java/org/apache/s4/fixtures/MockReceiver.java  |   38 +++
 .../org/apache/s4/fixtures/MockReceiverModule.java |   27 ++
 .../java/org/apache/s4/fixtures/NoOpReceiver.java  |   22 ++
 .../org/apache/s4/fixtures/NoOpReceiverModule.java |   27 ++
 .../org/apache/s4/fixtures/TCPTransportModule.java |   18 ++
 .../org/apache/s4/fixtures/UDPTransportModule.java |   18 ++
 .../java/org/apache/s4/fixtures/ZkBasedTest.java   |   17 ++
 .../src/test/resources/udp.s4.comm.properties      |    7 +
 subprojects/s4-core/s4-core.gradle                 |    3 +-
 .../src/main/java/org/apache/s4/core/App.java      |   33 ++-
 .../main/java/org/apache/s4/core/AppModule.java    |   38 +++
 .../java/org/apache/s4/core/DefaultCoreModule.java |   18 +-
 .../src/main/java/org/apache/s4/core/Main.java     |   18 ++
 .../java/org/apache/s4/core/ProcessingElement.java |   14 +-
 .../src/main/java/org/apache/s4/core/Receiver.java |  121 --------
 .../main/java/org/apache/s4/core/ReceiverImpl.java |  116 ++++++++
 .../main/java/org/apache/s4/core/RemoteSender.java |   22 +-
 .../java/org/apache/s4/core/RemoteSenders.java     |   82 ++++--
 .../main/java/org/apache/s4/core/RemoteStream.java |    7 +-
 .../src/main/java/org/apache/s4/core/Sender.java   |  124 ---------
 .../main/java/org/apache/s4/core/SenderImpl.java   |  178 ++++++++++++
 .../src/main/java/org/apache/s4/core/Server.java   |    9 +-
 .../src/main/java/org/apache/s4/core/Stream.java   |  195 ++++++++------
 .../ft/FileSystemBackendCheckpointingModule.java   |    3 +-
 .../java/org/apache/s4/core/ft/SafeKeeper.java     |   19 +-
 .../s4/core/gen/OverloadDispatcherGenerator.java   |    2 +-
 ...lockingRemoteSendersExecutorServiceFactory.java |   22 ++
 .../BlockingSenderExecutorServiceFactory.java      |   35 +++
 .../BlockingStreamExecutorServiceFactory.java      |   28 ++
 ...heddingRemoteSendersExecutorServiceFactory.java |   20 ++
 .../LoadSheddingSenderExecutorServiceFactory.java  |   62 +++++
 .../LoadSheddingStreamExecutorServiceFactory.java  |   63 +++++
 .../RemoteSendersExecutorServiceFactory.java       |   12 +
 .../core/staging/SenderExecutorServiceFactory.java |   13 +
 .../core/staging/StreamExecutorServiceFactory.java |   31 ++
 ...ottlingRemoteSendersExecutorServiceFactory.java |   21 ++
 .../ThrottlingSenderExecutorServiceFactory.java    |   43 +++
 .../java/org/apache/s4/core/util/S4Metrics.java    |  197 +++++++++++++
 .../test/java/org/apache/s4/core/TriggerTest.java  |    8 +-
 .../org/apache/s4/core/ft/CheckpointingTest.java   |   13 +-
 .../org/apache/s4/core/ft/FTWordCountTest.java     |   12 +-
 .../java/org/apache/s4/core/ft/RecoveryTest.java   |   26 ++-
 .../apache/s4/core/timers/MultithreadingTest.java  |    9 +-
 .../org/apache/s4/core/windowing/WindowingPE1.java |    1 -
 .../apache/s4/core/windowing/WindowingPETest.java  |   10 +-
 .../apache/s4/deploy/TestAutomaticDeployment.java  |   10 +-
 .../java/org/apache/s4/fixtures/CoreTestUtils.java |   12 +-
 .../org/apache/s4/fixtures/MockCommModule.java     |   20 +-
 .../org/apache/s4/fixtures/MockCoreModule.java     |   29 ++-
 .../org/apache/s4/wordcount/WordCountTest.java     |   15 +-
 .../java/org/apache/s4/example/counter/MyApp.java  |   11 +-
 .../s4/example/twitter/TwitterCounterApp.java      |   21 ++
 113 files changed, 3350 insertions(+), 1460 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/2a95d354/subprojects/s4-core/s4-core.gradle
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/2a95d354/subprojects/s4-core/src/main/java/org/apache/s4/core/Stream.java
----------------------------------------------------------------------
diff --cc subprojects/s4-core/src/main/java/org/apache/s4/core/Stream.java
index e5ef775,00137b8..14baa2b
--- a/subprojects/s4-core/src/main/java/org/apache/s4/core/Stream.java
+++ b/subprojects/s4-core/src/main/java/org/apache/s4/core/Stream.java
@@@ -45,14 -47,17 +47,12 @@@ public class Stream<T extends Event> im
      private static final Logger logger = LoggerFactory.getLogger(Stream.class);
  
      final static private String DEFAULT_SEPARATOR = "^";
      private String name;
      protected Key<T> key;
      private ProcessingElement[] targetPEs;
-     protected final BlockingQueue<EventMessage> queue = new ArrayBlockingQueue<EventMessage>(CAPACITY);
-     private Thread thread;
 -    // protected final BlockingQueue<Event> queue = new ArrayBlockingQueue<Event>(CAPACITY);
 -    // final BlockingQueue<StreamEventProcessingTask> taskQueue = new ArrayBlockingQueue<StreamEventProcessingTask>(
 -    // CAPACITY);
+     private Executor eventProcessingExecutor;
      final private Sender sender;
-     final private Receiver receiver;
+     final private ReceiverImpl receiver;
      // final private int id;
      final private App app;
      private Class<T> eventType = null;

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/2a95d354/subprojects/s4-core/src/test/java/org/apache/s4/deploy/TestAutomaticDeployment.java
----------------------------------------------------------------------


Mime
View raw message