datasketches 0.2.6 → 0.2.7

data/vendor/datasketches-cpp/tuple/include/tuple_sketch_impl.hpp

@@ -353,8 +353,7 @@ size_t compact_tuple_sketch<S, A>::get_serialized_size_summaries_bytes(const SD&
 template<typename S, typename A>
 template<typename SerDe>
 void compact_tuple_sketch<S, A>::serialize(std::ostream& os, const SerDe& sd) const {
-  const bool is_single_item = entries_.size() == 1 && !this->is_estimation_mode();
-  const uint8_t preamble_longs = this->is_empty() || is_single_item ? 1 : this->is_estimation_mode() ? 3 : 2;
+  const uint8_t preamble_longs = this->is_estimation_mode() ? 3 : this->is_empty() || entries_.size() == 1 ? 1 : 2;
   write(os, preamble_longs);
   const uint8_t serial_version = SERIAL_VERSION;
   write(os, serial_version);
@@ -373,28 +372,25 @@ void compact_tuple_sketch<S, A>::serialize(std::ostream& os, const SerDe& sd) co
   write(os, flags_byte);
   const uint16_t seed_hash = get_seed_hash();
   write(os, seed_hash);
-  if (!this->is_empty()) {
-    if (!is_single_item) {
-      const uint32_t num_entries = static_cast<uint32_t>(entries_.size());
-      write(os, num_entries);
-      const uint32_t unused32 = 0;
-      write(os, unused32);
-      if (this->is_estimation_mode()) {
-        write(os, this->theta_);
-      }
-    }
-    for (const auto& it: entries_) {
-      write(os, it.first);
-      sd.serialize(os, &it.second, 1);
-    }
+  if (preamble_longs > 1) {
+    const uint32_t num_entries = static_cast<uint32_t>(entries_.size());
+    write(os, num_entries);
+    const uint32_t unused32 = 0;
+    write(os, unused32);
+  }
+  if (this->is_estimation_mode()) {
+    write(os, this->theta_);
+  }
+  for (const auto& it: entries_) {
+    write(os, it.first);
+    sd.serialize(os, &it.second, 1);
   }
 }
 
 template<typename S, typename A>
 template<typename SerDe>
 auto compact_tuple_sketch<S, A>::serialize(unsigned header_size_bytes, const SerDe& sd) const -> vector_bytes {
-  const bool is_single_item = entries_.size() == 1 && !this->is_estimation_mode();
-  const uint8_t preamble_longs = this->is_empty() || is_single_item ? 1 : this->is_estimation_mode() ? 3 : 2;
+  const uint8_t preamble_longs = this->is_estimation_mode() ? 3 : this->is_empty() || entries_.size() == 1 ? 1 : 2;
   const size_t size = header_size_bytes + sizeof(uint64_t) * preamble_longs
       + sizeof(uint64_t) * entries_.size() + get_serialized_size_summaries_bytes(sd);
   vector_bytes bytes(size, 0, entries_.get_allocator());
@@ -418,19 +414,17 @@ auto compact_tuple_sketch<S, A>::serialize(unsigned header_size_bytes, const Ser
   ptr += copy_to_mem(flags_byte, ptr);
   const uint16_t seed_hash = get_seed_hash();
   ptr += copy_to_mem(seed_hash, ptr);
-  if (!this->is_empty()) {
-    if (!is_single_item) {
-      const uint32_t num_entries = static_cast<uint32_t>(entries_.size());
-      ptr += copy_to_mem(num_entries, ptr);
-      ptr += sizeof(uint32_t); // unused
-      if (this->is_estimation_mode()) {
-        ptr += copy_to_mem(theta_, ptr);
-      }
-    }
-    for (const auto& it: entries_) {
-      ptr += copy_to_mem(it.first, ptr);
-      ptr += sd.serialize(ptr, end_ptr - ptr, &it.second, 1);
-    }
+  if (preamble_longs > 1) {
+    const uint32_t num_entries = static_cast<uint32_t>(entries_.size());
+    ptr += copy_to_mem(num_entries, ptr);
+    ptr += sizeof(uint32_t); // unused
+  }
+  if (this->is_estimation_mode()) {
+    ptr += copy_to_mem(theta_, ptr);
+  }
+  for (const auto& it: entries_) {
+    ptr += copy_to_mem(it.first, ptr);
+    ptr += sd.serialize(ptr, end_ptr - ptr, &it.second, 1);
   }
   return bytes;
 }

data/vendor/datasketches-cpp/tuple/test/array_of_doubles_sketch_test.cpp

@@ -22,7 +22,7 @@
 #include <sstream>
 #include <array>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <array_of_doubles_sketch.hpp>
 #include <array_of_doubles_union.hpp>
 #include <array_of_doubles_intersection.hpp>

data/vendor/datasketches-cpp/tuple/test/tuple_a_not_b_test.cpp

@@ -19,7 +19,7 @@
 
 #include <iostream>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <tuple_a_not_b.hpp>
 #include <theta_sketch.hpp>
 #include <stdexcept>

data/vendor/datasketches-cpp/tuple/test/tuple_intersection_test.cpp

@@ -19,7 +19,7 @@
 
 #include <iostream>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <tuple_intersection.hpp>
 #include <theta_sketch.hpp>
 #include <stdexcept>

data/vendor/datasketches-cpp/tuple/test/tuple_jaccard_similarity_test.cpp

@@ -19,7 +19,7 @@
 
 #include <iostream>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include "tuple_jaccard_similarity.hpp"
 

data/vendor/datasketches-cpp/tuple/test/tuple_sketch_allocation_test.cpp

@@ -19,7 +19,7 @@
 
 #include <iostream>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <tuple_sketch.hpp>
 #include <test_allocator.hpp>
 #include <test_type.hpp>

data/vendor/datasketches-cpp/tuple/test/tuple_sketch_test.cpp

@@ -32,7 +32,7 @@ std::ostream& operator<<(std::ostream& os, const three_doubles& tuple) {
 
 }
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <tuple_sketch.hpp>
 
 namespace datasketches {

data/vendor/datasketches-cpp/tuple/test/tuple_union_test.cpp

@@ -20,7 +20,7 @@
 #include <iostream>
 #include <stdexcept>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <tuple_union.hpp>
 #include <theta_sketch.hpp>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datasketches
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -69,12 +69,10 @@ files:
 - vendor/datasketches-cpp/common/include/quantile_sketch_sorted_view_impl.hpp
 - vendor/datasketches-cpp/common/include/serde.hpp
 - vendor/datasketches-cpp/common/test/CMakeLists.txt
-- vendor/datasketches-cpp/common/test/catch.hpp
 - vendor/datasketches-cpp/common/test/catch_runner.cpp
 - vendor/datasketches-cpp/common/test/integration_test.cpp
 - vendor/datasketches-cpp/common/test/test_allocator.cpp
 - vendor/datasketches-cpp/common/test/test_allocator.hpp
-- vendor/datasketches-cpp/common/test/test_runner.cpp
 - vendor/datasketches-cpp/common/test/test_type.hpp
 - vendor/datasketches-cpp/cpc/CMakeLists.txt
 - vendor/datasketches-cpp/cpc/include/compression_data.hpp