dataoperations-aggregate 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af4af69996bbbaf33b749eded827f3d6f695e44bfcd1be0bda98ed8e027cd0f1
-  data.tar.gz: 94d67f60c8ff46462c84a9d0a186c6d240d99ca533d4db624cef97895efc5050
+  metadata.gz: 641acf44ae266d4790320ae506cc968b20fe9fdcbc63b7fb50b0cb41c13a77b6
+  data.tar.gz: adeed75be0d03687fa1700e3ee5c8048885a904b0e8ad5667969328e8a4472a0
 SHA512:
-  metadata.gz: a4cfe7be327d99b497d134d3ea3fad255aa46a8bf5b0153f96e5d2cd49bcc41ff444ada6b0cc08d2c0f2a398ff90f447f1959f7945dc3e0b8f506c1a90321c09
-  data.tar.gz: 754c6c3920f28c29d9c03dbd7a1c5a00fbd71f560f72e8e000dca1b7eb68283c61ca85e6bfde1a689d68dd1d2953d593549aa0ec72dc37573feddd3320ffce1b
+  metadata.gz: 3b7f039bc8f7046051a8150576eb6a29ba10edb6287251bd0980a211eecec41b69bcda10dde9cf8d920f5dcf07c7be1752b2b211dda5419f7fd7c5686cfd0195
+  data.tar.gz: 12f5981b5fc696c4cb0b36a68dd38a5ad814085bf8f3aded30cfb2e2446607f0971a6adc9220cb29f3615ca44a9673c8dcac18f8d825bd1a28755bdb4e92a3cd

data/lib/dataoperations-aggregate.rb

@@ -72,6 +72,7 @@ module DataOperations
         end
       end
 
+      @aggregator_mutex = Mutex.new
       # TODO:
       # - Duplicate intervals - Done
       # - Sort intervals - Done
@@ -116,14 +117,14 @@ module DataOperations
         aggregator_item['aggregate_fields'] = aggregate_detail
         aggregator_item['intervals'] = interval_detail
 
-        @aggregator[hash_group_key] = aggregator_item
+        @aggregator_mutex.synchronize {@aggregator[hash_group_key] = aggregator_item}
       end
 
       if !aggregator_item['aggregate_fields'].key?(aggregator_hash_key)
         hash_aggregator = {}
         hash_aggregator[:time_started] = Time.now.to_i
         hash_aggregator['processed'] = 1
-        aggregator_item['aggregate_fields'][aggregator_hash_key] = hash_aggregator
+        @aggregator_mutex.synchronize {aggregator_item['aggregate_fields'][aggregator_hash_key] = hash_aggregator}
       else
         aggregator_item['aggregate_fields'][aggregator_hash_key]['processed'] += 1
       end
@@ -150,14 +151,15 @@ module DataOperations
       aggregate_data = {}
 
       # @log.debug @aggregator
-      # @aggregator_mutex.synchronize do
-      current_time = Time.now.to_i
-      @aggregator.each do |group_item_key, group_item_value|
-        aggregate_first_interval(aggregate_data, current_time, group_item_value)
-
-        # Calculate subsecuents aggregations
-        group_item_value['intervals'].keys[1..-1].each do |s_interval|
-          aggregate_subsequents_intervals(aggregate_data, current_time, group_item_value, s_interval)
+      @aggregator_mutex.synchronize do
+        current_time = Time.now.to_i
+        @aggregator.each do |group_item_key, group_item_value|
+          aggregate_first_interval(aggregate_data, current_time, group_item_value)
+
+          # Calculate subsecuents aggregations
+          group_item_value['intervals'].keys[1..-1].each do |s_interval|
+            aggregate_subsequents_intervals(aggregate_data, current_time, group_item_value, s_interval)
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dataoperations-aggregate
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Victor Guillen