RCBC-393: fix type conversion for query metrics

Author: avsej

ext/couchbase.cxx

@@ -3797,22 +3797,14 @@ cb_Backend_document_query(VALUE self, VALUE statement, VALUE options)
         if (resp.meta.metrics) {
             VALUE metrics = rb_hash_new();
             rb_hash_aset(meta, rb_id2sym(rb_intern("metrics")), metrics);
-            rb_hash_aset(metrics, rb_id2sym(rb_intern("elapsed_time")), resp.meta.metrics->elapsed_time.count());
-            rb_hash_aset(metrics, rb_id2sym(rb_intern("execution_time")), resp.meta.metrics->execution_time.count());
+            rb_hash_aset(metrics, rb_id2sym(rb_intern("elapsed_time")), ULL2NUM(resp.meta.metrics->elapsed_time.count()));
+            rb_hash_aset(metrics, rb_id2sym(rb_intern("execution_time")), ULL2NUM(resp.meta.metrics->execution_time.count()));
             rb_hash_aset(metrics, rb_id2sym(rb_intern("result_count")), ULL2NUM(resp.meta.metrics->result_count));
             rb_hash_aset(metrics, rb_id2sym(rb_intern("result_size")), ULL2NUM(resp.meta.metrics->result_size));
-            if (resp.meta.metrics->sort_count > 0) {
-                rb_hash_aset(metrics, rb_id2sym(rb_intern("sort_count")), ULL2NUM(resp.meta.metrics->sort_count));
-            }
-            if (resp.meta.metrics->mutation_count > 0) {
-                rb_hash_aset(metrics, rb_id2sym(rb_intern("mutation_count")), ULL2NUM(resp.meta.metrics->mutation_count));
-            }
-            if (resp.meta.metrics->error_count > 0) {
-                rb_hash_aset(metrics, rb_id2sym(rb_intern("error_count")), ULL2NUM(resp.meta.metrics->error_count));
-            }
-            if (resp.meta.metrics->warning_count > 0) {
-                rb_hash_aset(metrics, rb_id2sym(rb_intern("warning_count")), ULL2NUM(resp.meta.metrics->warning_count));
-            }
+            rb_hash_aset(metrics, rb_id2sym(rb_intern("sort_count")), ULL2NUM(resp.meta.metrics->sort_count));
+            rb_hash_aset(metrics, rb_id2sym(rb_intern("mutation_count")), ULL2NUM(resp.meta.metrics->mutation_count));
+            rb_hash_aset(metrics, rb_id2sym(rb_intern("error_count")), ULL2NUM(resp.meta.metrics->error_count));
+            rb_hash_aset(metrics, rb_id2sym(rb_intern("warning_count")), ULL2NUM(resp.meta.metrics->warning_count));
         }
 
         return res;

lib/couchbase/query_options.rb

@@ -71,12 +71,12 @@ def initialize
     end
 
     class QueryMetrics
-      # @return [Integer] The total time taken for the request, that is the time from when the request was received until the results were
-      #   returned.
+      # @return [Integer] The total time taken for the request (in nanoseconds), that is the time from when the request
+      #   was received until the results were returned.
       attr_accessor :elapsed_time
 
-      # @return [Integer] The time taken for the execution of the request, that is the time from when query execution started until the
-      #   results were returned
+      # @return [Integer] The time taken for the execution of the request (in nanoseconds), that is the time from when
+      #   query execution started until the results were returned
       attr_accessor :execution_time
 
       # @return [Integer] the total number of results selected by the engine before restriction through LIMIT clause.

test/active_support/behaviors/cache_delete_matched_behavior.rb

@@ -12,8 +12,13 @@ def test_delete_matched
     @cache.write("fu", "baz")
     @cache.write("foo/bar", "baz")
     @cache.write("fu/baz", "bar")
-    deleted = @cache.delete_matched(/oo/)
-    assert deleted >= 2
+    total_deleted = 0
+    loop do
+      deleted = @cache.delete_matched(/oo/)
+      break if deleted == 0
+      total_deleted += deleted
+    end
+    assert total_deleted >= 2, "delete_matched performed #{total_deleted} mutations"
     sleep(0.3) while @cache.exist?("foo") || @cache.exist?("foo/bar") # HACK: to ensure that query changes have been propagated
     assert_not @cache.exist?("foo")
     assert @cache.exist?("fu")

test/active_support/cache_store_test.rb

@@ -93,9 +93,14 @@ def test_delete_matched
       @cache.write(foo, "value_foo")
       bar = uniq_id(:bar)
       @cache.write(bar, "value_bar")
-      deleted = @cache.delete_matched(/foo/)
-
-      assert_predicate deleted, :positive?
+      total_deleted = 0
+      loop do
+        deleted = @cache.delete_matched(/foo/)
+        break if deleted == 0
+        total_deleted += deleted
+      end
+
+      assert_predicate deleted, :positive?, "delete_matched performed #{total_deleted} mutations"
       sleep(0.3) while @cache.exist?(foo) # HACK: to ensure that query changes have been propagated
 
       assert_nil @cache.read(foo)

test/query_test.rb

@@ -61,8 +61,10 @@ def test_query_with_metrics
 
       metrics = res.meta_data.metrics
 
-      refute metrics.error_count
-      refute metrics.warning_count
+      assert_predicate metrics.elapsed_time, :positive?
+      assert_predicate metrics.execution_time, :positive?
+      assert_equal 0, metrics.error_count
+      assert_equal 0, metrics.warning_count
       assert_equal 1, metrics.result_count
     end