datasketches 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eaa8a17efdbc591b3e56f94650e887babd30dc79d95db3a7986df0261184191
-  data.tar.gz: 5544326a0edf165d87373a680d8bf5b80acba2894b9048f92cbdb261fcd66d57
+  metadata.gz: 4a7fef851c11ba93a002a6215f76170b973628f8b1f0a89fb89a5e655f6a421a
+  data.tar.gz: a590d7cde413596640f8bf169db67742696d7e304097be8bc0820244ed32ebd5
 SHA512:
-  metadata.gz: 5a28c093ecda083762367149800770f59fee8e630c0d983d3f29ed32d027fae2e2515dff243ee11bbd41f4875c7cea622f7bc5cc5d7e73176e785503ed19fc0b
-  data.tar.gz: 6b210f2fdca1ae3cbd4e4cbf88e284855014b5a1e1c883085dc96a057da29e370005163ce628e54351c9127b00fae4b7b33a4ca63e6f4b90e0665e93b7742a66
+  metadata.gz: dea9986097b4e9e4c7aba8b6f69108dce21caa2f6fa1e8723a9bf8be2077b925507bf84bd92bc794c1831285963f8ecb8f4739797c3246a15a438a82816043d6
+  data.tar.gz: 64f2ed1ed4656c09057892ae493a9a2c7178b3090dd84c24105b9e2f16d45f9aaed728c2bb6154e6518e018bbd240f5c2e562fa2edbee397b5deccb8b1dd11f5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.2.7 (2022-11-05)
+
+- Updated DataSketches to 3.5.1
+
+## 0.2.6 (2022-07-13)
+
+- Updated DataSketches to 3.5.0
+
 ## 0.2.5 (2022-05-21)
 
 - Updated DataSketches to 3.4.0

data/LICENSE

@@ -255,10 +255,8 @@ APPENDIX B: Additional licenses relevant to this product.
     =============================================================
     Boost License  (https://www.boost.org/LICENSE_1_0.txt)
     =============================================================
-    Original source code:
-      https://github.com/catchorg/Catch2/blob/master/single_include/catch2/catch.hpp
-    -------------------------------------------------------------
-    Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved.
+    Original source:
+       https://github.com/catchorg/Catch2/blob/v2.x/LICENSE.txt
 
     Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -285,8 +283,8 @@ APPENDIX B: Additional licenses relevant to this product.
     DEALINGS IN THE SOFTWARE.
     -------------------------------------------------------------
     Code Locations:
-      * https://github.com/apache/datasketches-cpp/blob/master/common/test/catch.hpp
-    that is adapted from the above.
+    Found in the Catch2 unit test code that is downloaded from github.com as part
+    of CMake configuration if configured to build tests.
 
 
     =============================================================

data/NOTICE

@@ -1,11 +1,12 @@
-Apache DataSketches-cpp
-Copyright 2020-2021 The Apache Software Foundation
+Apache DataSketches C++ and Python
+Copyright 2022 The Apache Software Foundation
 
-Copyright 2015-2018 Yahoo
-Copyright 2019 Verizon Media
+Copyright 2015-2018 Yahoo Inc.
+Copyright 2019-2020 Verizon Media
+Copyright 2021 Yahoo Inc.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 Prior to moving to ASF, the software for this project was developed at
-Yahoo (now Verizon Media) (https://developer.yahoo.com).
+Yahoo Inc. (https://developer.yahoo.com).

data/ext/datasketches/kll_wrapper.cpp

@@ -55,12 +55,12 @@ void bind_kll_sketch(Rice::Module& m, const char* name) {
       })
     .define_method(
       "pmf",
-      [](kll_sketch<T>& self, std::vector<T> split_points) {
+      [](kll_sketch<T>& self, const std::vector<T>& split_points) {
         return self.get_PMF(&split_points[0], split_points.size());
       })
     .define_method(
       "cdf",
-      [](kll_sketch<T>& self, std::vector<T> split_points) {
+      [](kll_sketch<T>& self, const std::vector<T>& split_points) {
         return self.get_CDF(&split_points[0], split_points.size());
       })
     .define_method(

data/lib/datasketches/version.rb

@@ -1,3 +1,3 @@
 module DataSketches
-  VERSION = "0.2.5"
+  VERSION = "0.2.7"
 end

data/vendor/datasketches-cpp/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 cmake_minimum_required(VERSION 3.16.0)
 project(DataSketches
-        VERSION 3.4.0
+        VERSION 3.5.1
         LANGUAGES CXX)
 
 include(GNUInstallDirs)

data/vendor/datasketches-cpp/LICENSE

@@ -255,10 +255,8 @@ APPENDIX B: Additional licenses relevant to this product.
     =============================================================
     Boost License  (https://www.boost.org/LICENSE_1_0.txt)
     =============================================================
-    Original source code:
-      https://github.com/catchorg/Catch2/blob/master/single_include/catch2/catch.hpp
-    ------------------------------------------------------------- 
-    Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved.
+    Original source:
+       https://github.com/catchorg/Catch2/blob/v2.x/LICENSE.txt
 
     Boost Software License - Version 1.0 - August 17th, 2003
     
@@ -285,8 +283,8 @@ APPENDIX B: Additional licenses relevant to this product.
     DEALINGS IN THE SOFTWARE.
     -------------------------------------------------------------
     Code Locations:
-      * https://github.com/apache/datasketches-cpp/blob/master/common/test/catch.hpp
-    that is adapted from the above.
+    Found in the Catch2 unit test code that is downloaded from github.com as part
+    of CMake configuration if configured to build tests.
 
 
     =============================================================

data/vendor/datasketches-cpp/MANIFEST.in

@@ -7,8 +7,6 @@ global-include *.bin
 
 global-exclude .git*
 
-recursive-include python/pybind11 *
-
 graft cmake
 graft common
 graft cpc

data/vendor/datasketches-cpp/NOTICE

@@ -1,11 +1,12 @@
-Apache DataSketches-cpp
-Copyright 2020-2021 The Apache Software Foundation
+Apache DataSketches C++ and Python
+Copyright 2022 The Apache Software Foundation
 
-Copyright 2015-2018 Yahoo
-Copyright 2019 Verizon Media
+Copyright 2015-2018 Yahoo Inc.
+Copyright 2019-2020 Verizon Media
+Copyright 2021 Yahoo Inc.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 Prior to moving to ASF, the software for this project was developed at
-Yahoo (now Verizon Media) (https://developer.yahoo.com).
+Yahoo Inc. (https://developer.yahoo.com).

data/vendor/datasketches-cpp/common/CMakeLists.txt

@@ -43,8 +43,8 @@ install(FILES
 			include/conditional_forward.hpp
 			include/ceiling_power_of_2.hpp
 			include/bounds_binomial_proportions.hpp
-			include/kolmogorov_smirnov.hpp
-			include/kolmogorov_smirnov_impl.hpp
 			include/quantile_sketch_sorted_view.hpp
 			include/quantile_sketch_sorted_view_impl.hpp
+			include/kolmogorov_smirnov.hpp
+			include/kolmogorov_smirnov_impl.hpp
   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/DataSketches")

data/vendor/datasketches-cpp/common/test/CMakeLists.txt

@@ -21,6 +21,18 @@
 # common dependencies for tests
 add_library(common_test OBJECT "")
 
+include(FetchContent)
+
+FetchContent_Declare(
+  Catch2
+  GIT_REPOSITORY https://github.com/catchorg/Catch2
+  GIT_TAG        v2.13.9
+)
+
+FetchContent_MakeAvailable(Catch2)
+
+target_link_libraries(common_test PUBLIC Catch2::Catch2)
+
 set_target_properties(common_test PROPERTIES
   CXX_STANDARD 11
   CXX_STANDARD_REQUIRED YES
@@ -33,7 +45,6 @@ target_include_directories(common_test
 
 target_sources(common_test
   INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/catch.hpp  
     ${CMAKE_CURRENT_SOURCE_DIR}/test_allocator.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_type.hpp
   PRIVATE
@@ -59,4 +70,4 @@ add_test(
 target_sources(integration_test
   PRIVATE
     integration_test.cpp
-)
+)

data/vendor/datasketches-cpp/common/test/catch_runner.cpp

@@ -1,7 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 #ifndef _TEST_COMMON_HPP_
 #define _TEST_COMMON_HPP_
 
+// this largely just ensures that, for our simple test cases at least,
+// we define main() exactly once per test executable
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 
 #endif // _TEST_COMMON_HPP_

data/vendor/datasketches-cpp/common/test/integration_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include "cpc_sketch.hpp"
 #include "cpc_union.hpp"

data/vendor/datasketches-cpp/cpc/include/cpc_compressor_impl.hpp

@@ -297,6 +297,7 @@ void cpc_compressor<A>::compress_sliding_flavor(const cpc_sketch_alloc<A>& sourc
     // changes the implied ordering of the pairs, so we must do it before sorting.
 
     const uint8_t pseudo_phase = determine_pseudo_phase(source.get_lg_k(), source.get_num_coupons());
+    if (pseudo_phase >= 16) throw std::logic_error("unexpected pseudo phase for sliding flavor");
     const uint8_t* permutation = column_permutations_for_encoding[pseudo_phase];
 
     const uint8_t offset = source.window_offset;
@@ -333,7 +334,7 @@ void cpc_compressor<A>::uncompress_sliding_flavor(const compressed_state<A>& sou
         lg_k, source.table_data.get_allocator());
 
     const uint8_t pseudo_phase = determine_pseudo_phase(lg_k, num_coupons);
-    if (pseudo_phase >= 16) throw std::logic_error("pseudo phase >= 16");
+    if (pseudo_phase >= 16) throw std::logic_error("unexpected pseudo phase for sliding flavor");
     const uint8_t* permutation = column_permutations_for_decoding[pseudo_phase];
 
     uint8_t offset = cpc_sketch_alloc<A>::determine_correct_offset(lg_k, num_coupons);

data/vendor/datasketches-cpp/cpc/test/compression_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <algorithm>
 
 #include "cpc_compressor.hpp"

data/vendor/datasketches-cpp/cpc/test/cpc_sketch_allocation_test.cpp

@@ -22,7 +22,7 @@
 #include <sstream>
 #include <fstream>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include "cpc_sketch.hpp"
 #include "cpc_union.hpp"

data/vendor/datasketches-cpp/cpc/test/cpc_sketch_test.cpp

@@ -23,7 +23,7 @@
 #include <fstream>
 #include <stdexcept>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include "cpc_sketch.hpp"
 

data/vendor/datasketches-cpp/cpc/test/cpc_union_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include "cpc_union.hpp"
 

data/vendor/datasketches-cpp/fi/include/reverse_purge_hash_map_impl.hpp

@@ -71,8 +71,8 @@ states_(nullptr)
       if (other.states_[i] > 0) {
         new (&keys_[i]) K(other.keys_[i]);
         values_[i] = other.values_[i];
+         if (--num == 0) break;
       }
-      if (--num == 0) break;
     }
   }
   std::copy(other.states_, other.states_ + size, states_);

data/vendor/datasketches-cpp/fi/test/frequent_items_sketch_custom_type_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <sstream>
 #include <stdexcept>
 

data/vendor/datasketches-cpp/fi/test/frequent_items_sketch_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <sstream>
 #include <fstream>
 #include <stdexcept>

data/vendor/datasketches-cpp/fi/test/reverse_purge_hash_map_test.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <reverse_purge_hash_map.hpp>
 

data/vendor/datasketches-cpp/hll/test/AuxHashMapTest.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <memory>
 #include <stdexcept>
 

data/vendor/datasketches-cpp/hll/test/CouponHashSetTest.cpp

@@ -21,7 +21,7 @@
 #include "CouponHashSet.hpp"
 #include "HllUtil.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <ostream>
 #include <cmath>
 #include <string>

data/vendor/datasketches-cpp/hll/test/CouponListTest.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <ostream>
 #include <sstream>
 #include <cmath>

data/vendor/datasketches-cpp/hll/test/CrossCountingTest.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <ostream>
 #include <cmath>
 #include <string>

data/vendor/datasketches-cpp/hll/test/HllArrayTest.cpp

@@ -22,7 +22,7 @@
 #include <exception>
 #include <sstream>
 #include <stdexcept>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 namespace datasketches {
 

data/vendor/datasketches-cpp/hll/test/HllSketchTest.cpp

@@ -21,7 +21,7 @@
 
 #include "hll.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <test_allocator.hpp>
 
 namespace datasketches {

data/vendor/datasketches-cpp/hll/test/HllUnionTest.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <sstream>
 #include <stdexcept>
 

data/vendor/datasketches-cpp/hll/test/IsomorphicTest.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <cstdio>
 

data/vendor/datasketches-cpp/hll/test/TablesTest.cpp

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

data/vendor/datasketches-cpp/hll/test/ToFromByteArrayTest.cpp

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <fstream>
 
 #include "hll.hpp"

data/vendor/datasketches-cpp/kll/include/kll_helper_impl.hpp

@@ -230,7 +230,7 @@ kll_helper::compress_result kll_helper::general_compress(uint16_t k, uint8_t m,
       // move level over as is
       // make sure we are not moving data upwards
       if (raw_beg < out_levels[current_level]) throw std::logic_error("wrong move");
-      std::move(&items[raw_beg], &items[raw_lim], &items[out_levels[current_level]]);
+      std::move(items + raw_beg, items + raw_lim, items + out_levels[current_level]);
       out_levels[current_level + 1] = out_levels[current_level] + raw_pop;
     } else {
       // The sketch is too full AND this level is too full, so we compact it
@@ -251,7 +251,7 @@ kll_helper::compress_result kll_helper::general_compress(uint16_t k, uint8_t m,
 
       // level zero might not be sorted, so we must sort it if we wish to compact it
       if ((current_level == 0) && !is_level_zero_sorted) {
-        std::sort(&items[adj_beg], &items[adj_beg + adj_pop], C());
+        std::sort(items + adj_beg, items + adj_beg + adj_pop, C());
       }
 
       if (pop_above == 0) { // Level above is empty, so halve up

data/vendor/datasketches-cpp/kll/include/kll_sketch.hpp

@@ -170,7 +170,7 @@ class kll_sketch {
     using comparator = C;
 
     static const uint8_t DEFAULT_M = 8;
-    // TODO: Redundant and deprecated. Will be remove din next major version.
+    // TODO: Redundant and deprecated. Will be removed in next major version.
     static const uint16_t DEFAULT_K = kll_constants::DEFAULT_K;
     static const uint16_t MIN_K = DEFAULT_M;
     static const uint16_t MAX_K = (1 << 16) - 1;
@@ -182,6 +182,14 @@ class kll_sketch {
     kll_sketch& operator=(const kll_sketch& other);
     kll_sketch& operator=(kll_sketch&& other);
 
+    /*
+     * Type converting constructor.
+     * @param other sketch of a different type
+     * @param allocator instance of an Allocator
+     */
+    template<typename TT, typename CC, typename SS, typename AA>
+    explicit kll_sketch(const kll_sketch<TT, CC, SS, AA>& other, const A& allocator = A());
+
     /**
      * Updates this sketch with the given data item.
      * @param value an item from a stream of items
@@ -390,7 +398,7 @@ class kll_sketch {
     /**
      * Computes size needed to serialize the current state of the sketch.
      * This version is for fixed-size arithmetic types (integral and floating point).
-     * @param instance of a SerDe
+     * @param serde instance of a SerDe
      * @return size in bytes needed to serialize this sketch
      */
     template<typename TT = T, typename SerDe = S, typename std::enable_if<std::is_arithmetic<TT>::value, int>::type = 0>
@@ -399,7 +407,7 @@ class kll_sketch {
     /**
      * Computes size needed to serialize the current state of the sketch.
      * This version is for all other types and can be expensive since every item needs to be looked at.
-     * @param instance of a SerDe
+     * @param serde instance of a SerDe
      * @return size in bytes needed to serialize this sketch
      */
     template<typename TT = T, typename SerDe = S, typename std::enable_if<!std::is_arithmetic<TT>::value, int>::type = 0>
@@ -459,7 +467,7 @@ class kll_sketch {
     /**
      * This method deserializes a sketch from a given stream.
      * @param is input stream
-     * @param instance of an Allocator
+     * @param allocator instance of an Allocator
      * @return an instance of a sketch
      *
      * Deprecated, to be removed in the next major version
@@ -469,8 +477,8 @@ class kll_sketch {
     /**
      * This method deserializes a sketch from a given stream.
      * @param is input stream
-     * @param instance of a SerDe
-     * @param instance of an Allocator
+     * @param serde instance of a SerDe
+     * @param allocator instance of an Allocator
      * @return an instance of a sketch
      */
     template<typename SerDe = S>
@@ -480,7 +488,7 @@ class kll_sketch {
      * This method deserializes a sketch from a given array of bytes.
      * @param bytes pointer to the array of bytes
      * @param size the size of the array
-     * @param instance of an Allocator
+     * @param allocator instance of an Allocator
      * @return an instance of a sketch
      *
      * Deprecated, to be removed in the next major version
@@ -491,8 +499,8 @@ class kll_sketch {
      * This method deserializes a sketch from a given array of bytes.
      * @param bytes pointer to the array of bytes
      * @param size the size of the array
-     * @param instance of a SerDe
-     * @param instance of an Allocator
+     * @param serde instance of a SerDe
+     * @param allocator instance of an Allocator
      * @return an instance of a sketch
      */
     template<typename SerDe = S>
@@ -606,6 +614,8 @@ class kll_sketch {
     static void check_serial_version(uint8_t serial_version);
     static void check_family_id(uint8_t family_id);
 
+    void check_sorting() const;
+
     // implementations for floating point types
     template<typename TT = T, typename std::enable_if<std::is_floating_point<TT>::value, int>::type = 0>
     static const TT& get_invalid_value() {
@@ -629,6 +639,9 @@ class kll_sketch {
       return true;
     }
 
+    // for type converting constructor
+    template<typename TT, typename CC, typename SS, typename AA>
+    friend class kll_sketch;
 };
 
 template<typename T, typename C, typename S, typename A>