dataoperations-aggregate 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 641acf44ae266d4790320ae506cc968b20fe9fdcbc63b7fb50b0cb41c13a77b6
-  data.tar.gz: adeed75be0d03687fa1700e3ee5c8048885a904b0e8ad5667969328e8a4472a0
+  metadata.gz: e2cf76bae5e748e46672c8d59f8859358452f2fca813499b148e85dfa61f38c9
+  data.tar.gz: 7a9fbbd0115edefa597b9d374407576f4dfedb133da781dffe066c3e4ba6f73a
 SHA512:
-  metadata.gz: 3b7f039bc8f7046051a8150576eb6a29ba10edb6287251bd0980a211eecec41b69bcda10dde9cf8d920f5dcf07c7be1752b2b211dda5419f7fd7c5686cfd0195
-  data.tar.gz: 12f5981b5fc696c4cb0b36a68dd38a5ad814085bf8f3aded30cfb2e2446607f0971a6adc9220cb29f3615ca44a9673c8dcac18f8d825bd1a28755bdb4e92a3cd
+  metadata.gz: 403435362bd15744b154604e6322dcbba89ea9952e36d82ffe3ac3299f3ad28cd5c29187843e780cf149dabf2abdb4fbb6700f1e8ddce8e792ab033adf174255
+  data.tar.gz: f883f091f074ebbe48e18c46790ceb37c5ba98d7a879ec8259f69c88a19225130864897ab8bb63e47c7ab31dbcc5a400ae6c7fe68f3b8a27abec476c6e34123d

data/lib/dataoperations-aggregate.rb

@@ -9,6 +9,7 @@ module DataOperations
     DEFAULT_INTERVALS = [10].freeze
     DEFAULT_FLUSH_INTERVAL = 5
     DEFAULT_PROCESSING_MODE = :batch
+    DEFAULT_TIME_STARTED_MODE = :first_message
     DEFAULT_FIELD_NO_DATA_VALUE = 'no_data'.freeze
     DEFAULT_AGGREGATIONS = %w[sum min max mean median variance standard_deviation].freeze
     VALID_AGGREGATIONS = %w[sum min max mean median variance standard_deviation].freeze
@@ -24,6 +25,7 @@ module DataOperations
                    keep_interval: DEFAULT_KEEP_INTERVAL,
                    field_no_data_value: DEFAULT_FIELD_NO_DATA_VALUE,
                    processing_mode: DEFAULT_PROCESSING_MODE,
+                   time_started_mode: DEFAULT_TIME_STARTED_MODE,
                    aggregator_name: nil,
                    log: Logger.new(STDOUT),
                    aggregation_names:,
@@ -39,6 +41,7 @@ module DataOperations
       @keep_interval = keep_interval
       @field_no_data_value = field_no_data_value
       @processing_mode = processing_mode
+      @time_started_mode = time_started_mode
       @aggregator_name = aggregator_name
 
 
@@ -117,14 +120,14 @@ module DataOperations
         aggregator_item['aggregate_fields'] = aggregate_detail
         aggregator_item['intervals'] = interval_detail
 
-        @aggregator_mutex.synchronize {@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_mutex.synchronize {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
@@ -249,7 +252,9 @@ module DataOperations
       # @log.debug  "interval_aggregator_item_key: #{interval_aggregator_item_key}"
 
       if interval_aggregator_item_value = group_item_value['intervals'][interval_secs][interval_aggregator_item_key]
-        if interval_aggregator_item_value[:time_started] < aggregator_item_value[:time_started]
+        if @time_started_mode == :first_event && aggregator_item_value[:time_started] < interval_aggregator_item_value[:time_started]
+          interval_aggregator_item_value[:time_started] = aggregator_item_value[:time_started]
+        elseif @time_started_mode == :last_event && aggregator_item_value[:time_started] > interval_aggregator_item_value[:time_started]
           interval_aggregator_item_value[:time_started] = aggregator_item_value[:time_started]
         end
         interval_aggregator_item_value['processed'] += aggregator_item_value['processed']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dataoperations-aggregate
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Victor Guillen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-26 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: descriptive_statistics