concord-ruby 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7148f6b105896761a9d27d55836a1174181ea40c
-  data.tar.gz: bdf1a8f0fc8877a328fa02daf57417f47e5c14fb
+  metadata.gz: 08571768242c5bc9df4c4bb4a8b244fb4eccdae8
+  data.tar.gz: 3f7e011a7820b7a3f7ba3eadcf56fae50c0cd457
 SHA512:
-  metadata.gz: 752883abf0045ffc9288fcc4df7d74b31a2010c598e1f72e79534f0315c4dc40f27ea1415e60449da5016a0d39d70fb968b0e4df2e52b6b87656e9c3ef6fad4d
-  data.tar.gz: 8363b268d3f0c1eae2a334301c4c097f3f18d18467e26e7c44130a6bd23e9da9876c44700b4da772d814c500b1aa36f686820a74c5b2c799a4635c3bef13f88e
+  metadata.gz: f6d84315b854e079052842633510d6038bee3a06ba1953921fb63a0cc90fb9a7da437511587aa46180542cd34d26e3416343c5097e26c03258d0b887b0cc28e8
+  data.tar.gz: 21565c0841687b55f0be764c9e6f76c2781f99e89cdd4fd9fdab4e39cf12bcaa36f8cfc9b897ab6086f1ff6b9f73a74c7060a0ca2a5ad6e66f8d38672e912a92

data/lib/concord.rb

@@ -113,10 +113,15 @@ module Concord
       transport = ::Thrift::ServerSocket.new(listen_host, Integer(listen_port))
       transport_factory = ::Thrift::FramedTransportFactory.new
       protocol_factory = ::Thrift::BinaryProtocolAcceleratedFactory.new
-      server = ::Thrift::ThreadedServer.new(processor,
-                                            transport,
-                                            transport_factory,
-                                            protocol_factory)
+      # The reason the client computations MUST use a simple blocking server
+      # is that we have process_timer and process_record both which exec as
+      # a callback in the work thread pool which means that you might get
+      # 2 callbacks whichs makes the code multi threaded - we guarantee single
+      # thread for each callback
+      server = ::Thrift::SimpleServer.new(processor,
+                                          transport,
+                                          transport_factory,
+                                          protocol_factory)
       # Register with localhost proxy. Note that this method is `oneway'
       # which means after final TCP 'ack' it finishes.
       handler.register_with_scheduler
@@ -210,23 +215,21 @@ module Concord
     end
 
     def enrich_metadata(metadata)
-      enrich_stream = ->(stream) {
-        name = nil
-        grouping = nil
+      def enrich_stream(stream)
+        sm = ::Concord::Thrift::StreamMetadata.new
         if stream.is_a?(Array)
-          name, grouping = stream
+          sm.name = stream.first
+          sm.grouping = stream.last
         else
-          name = stream
+          sm.name = stream
         end
-        sm = ::Concord::Thrift::StreamMetadata.new
-        sm.name = name
-        sm.grouping = grouping unless grouping.nil?
         sm
-      }
+      end
+
       cm = ::Concord::Thrift::ComputationMetadata.new
       cm.name = metadata.name
-      cm.istreams = metadata.istreams.map { |x| enrich_stream.call(x) }
-      cm.ostreams = metadata.ostreams.map { |x| enrich_stream.call(x) }
+      cm.istreams = metadata.istreams.map { |x| enrich_stream(x) }
+      cm.ostreams = metadata.ostreams.map { |x| enrich_stream(x) }
       cm.proxyEndpoint = ::Concord::Thrift::Endpoint.new
       cm.proxyEndpoint.ip = proxy_host
       cm.proxyEndpoint.port = proxy_port

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concord-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Cole Brown