[BENCHMARKING] Use Benchmark.realtime to capture total duration

Author: estolfo

profile/benchmarking/complex.rb

@@ -36,7 +36,6 @@ class Complex
       #
       # @since 7.0.0
       def index_documents(opts = {})
-        duration = 0
         results = []
         slices = dataset_slices
 
@@ -46,8 +45,8 @@ def index_documents(opts = {})
           end
         end
 
-        with_cleanup do
-          duration = Benchmark.realtime do
+        duration = with_cleanup do
+          Benchmark.realtime do
             results = measured_repetitions.times.collect do
               Benchmark.realtime do
                 slices.each do |slice|
@@ -75,10 +74,9 @@ def index_documents(opts = {})
       #
       # @since 7.0.0
       def search_documents(opts = {})
-        duration = 0
         results = []
 
-        with_cleanup do
+        duration = with_cleanup do
           slices = dataset_slices
           sample_slice = slices.collect do |slice|
             client.bulk(body: slice)
@@ -93,7 +91,7 @@ def search_documents(opts = {})
             client.search(request)
           end
 
-          duration = Benchmark.realtime do
+          Benchmark.realtime do
             results = measured_repetitions.times.collect do
               Benchmark.realtime do
                 client.search(request)

profile/benchmarking/measurable.rb

@@ -282,11 +282,6 @@ def result_cluster_client
           Elasticsearch::Client.new(opts)
         end
       end
-
-      def current_time
-        # Use monotonic time to provide problems with leap seconds, time changes, syncs etc.
-        Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      end
     end
   end
 end

profile/benchmarking/simple.rb

@@ -70,16 +70,15 @@ def ping(opts = {})
       #
       # @since 7.0.0
       def create_index(opts = {})
-        duration = 0
         results = []
         action_iterations = 10
 
         warmup_repetitions.times do
           client.indices.create(index: "benchmarking-#{Time.now.to_f}")
         end
 
-        with_cleanup do
-          duration = Benchmark.realtime do
+        duration = with_cleanup do
+          Benchmark.realtime do
             results = measured_repetitions.times.collect do |i|
               index_names = action_iterations.times.collect { |j| (measured_repetitions*i) + j }
               Benchmark.realtime do
@@ -108,7 +107,6 @@ def create_index(opts = {})
       #
       # @since 7.0.0
       def index_document_small(opts={})
-        duration = 0
         results = []
         document = small_document
         action_iterations = 10
@@ -117,8 +115,8 @@ def index_document_small(opts={})
           client.create(index: INDEX, body: document)
         end
 
-        with_cleanup do
-          duration = Benchmark.realtime do
+        duration = with_cleanup do
+          Benchmark.realtime do
             results = measured_repetitions.times.collect do
               Benchmark.realtime do
                 action_iterations.times do
@@ -149,7 +147,6 @@ def index_document_small(opts={})
       #
       # @since 7.0.0
       def index_document_large(opts={})
-        duration = 0
         results = []
         document = large_document
         action_iterations = 1_000
@@ -158,8 +155,8 @@ def index_document_large(opts={})
           client.create(index: INDEX, body: document)
         end
 
-        with_cleanup do
-          duration = Benchmark.realtime do
+        duration = with_cleanup do
+          Benchmark.realtime do
             results = measured_repetitions.times.collect do
               Benchmark.realtime do
                 action_iterations.times do
@@ -190,17 +187,16 @@ def index_document_large(opts={})
       #
       # @since 7.0.0
       def get_document_small(opts={})
-        duration = 0
         results = []
         action_iterations = 1_000
 
-        with_cleanup do
+        duration = with_cleanup do
           id = client.create(index: INDEX, body: small_document)['_id']
           warmup_repetitions.times do
             client.get(index: INDEX, id: id)
           end
 
-          duration = Benchmark.realtime do
+          Benchmark.realtime do
             results = measured_repetitions.times.collect do
               Benchmark.realtime do
                 action_iterations.times do
@@ -235,13 +231,13 @@ def get_document_large(opts={})
         results = []
         action_iterations = 1_000
 
-        with_cleanup do
+        duration = with_cleanup do
           id = client.create(index: INDEX, body: large_document)['_id']
           warmup_repetitions.times do
             client.get(index: INDEX, id: id)
           end
 
-          duration = Benchmark.realtime do
+          Benchmark.realtime do
             results = measured_repetitions.times.collect do
               Benchmark.realtime do
                 action_iterations.times do
@@ -276,7 +272,7 @@ def search_document_small(opts={})
         results = []
         action_iterations = 1_000
 
-        with_cleanup do
+        duration = with_cleanup do
           client.create(index: INDEX, body: small_document)
           search_criteria = { match: { cuisine: 'mexican' } }
           request = { body: { query: search_criteria } }
@@ -290,7 +286,7 @@ def search_document_small(opts={})
             client.search(request)
           end
 
-          duration = Benchmark.realtime do
+          Benchmark.realtime do
             results = measured_repetitions.times.collect do
               Benchmark.realtime do
                 action_iterations.times do
@@ -321,11 +317,10 @@ def search_document_small(opts={})
       #
       # @since 7.0.0
       def search_document_large(opts={})
-        duration = 0
         results = []
         action_iterations = 1_000
 
-        with_cleanup do
+        duration = with_cleanup do
           client.create(index: INDEX, body: large_document)
           search_criteria = { match: { 'user.lang': 'en' } }
           request = { body: { query: search_criteria } }
@@ -338,7 +333,7 @@ def search_document_large(opts={})
             client.search(request)
           end
 
-          duration = Benchmark.realtime do
+          Benchmark.realtime do
             results = measured_repetitions.times.collect do
               Benchmark.realtime do
                 action_iterations.times do
@@ -369,11 +364,10 @@ def search_document_large(opts={})
       #
       # @since 7.0.0
       def update_document(opts={})
-        duration = 0
         results = []
         action_iterations = 1_000
 
-        with_cleanup do
+        duration = with_cleanup do
           document = small_document
           id = client.create(index: INDEX, body: document)['_id']
           field = document.find { |k,v| k != 'id' && v.is_a?(String) }.first
@@ -384,7 +378,7 @@ def update_document(opts={})
                           body: { doc: { field:  "#{document[field]}-#{i}" } })
           end
 
-          duration = Benchmark.realtime do
+          Benchmark.realtime do
             results = measured_repetitions.times.collect do
               Benchmark.realtime do
                 action_iterations.times do |i|