[incubator-datasketches-cpp] 02/02: use new interface in python wrappers

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

alsay pushed a commit to branch api_vector
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-cpp.git

commit 7cea129b5f3d2eef633a6a5b69451f9a1255f971
Author: AlexanderSaydakov <Al...@users.noreply.github.com>
AuthorDate: Tue Dec 17 10:48:02 2019 -0800

    use new interface in python wrappers
---
 python/src/cpc_wrapper.cpp   | 2 +-
 python/src/fi_wrapper.cpp    | 2 +-
 python/src/hll_wrapper.cpp   | 8 ++++----
 python/src/kll_wrapper.cpp   | 2 +-
 python/src/theta_wrapper.cpp | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/python/src/cpc_wrapper.cpp b/python/src/cpc_wrapper.cpp
index e120c24..9031ba4 100644
--- a/python/src/cpc_wrapper.cpp
+++ b/python/src/cpc_wrapper.cpp
@@ -37,7 +37,7 @@ cpc_sketch* cpc_sketch_deserialize(py::bytes skBytes) {
 
 py::object cpc_sketch_serialize(const cpc_sketch& sk) {
   auto serResult = sk.serialize();
-  return py::bytes((char*)serResult.first.get(), serResult.second);
+  return py::bytes((char*)serResult.data(), serResult.size());
 }
 
 std::string cpc_sketch_to_string(const cpc_sketch& sk) {
diff --git a/python/src/fi_wrapper.cpp b/python/src/fi_wrapper.cpp
index 92bc2b9..271ce83 100644
--- a/python/src/fi_wrapper.cpp
+++ b/python/src/fi_wrapper.cpp
@@ -36,7 +36,7 @@ frequent_items_sketch<T> fi_sketch_deserialize(py::bytes skBytes) {
 template<typename T>
 py::object fi_sketch_serialize(const frequent_items_sketch<T>& sk) {
   auto serResult = sk.serialize();
-  return py::bytes((char*)serResult.first.get(), serResult.second);
+  return py::bytes((char*)serResult.data(), serResult.size());
 }
 
 // maybe possible to disambiguate the static vs method get_epsilon calls, but
diff --git a/python/src/hll_wrapper.cpp b/python/src/hll_wrapper.cpp
index 4accbe9..24b3530 100644
--- a/python/src/hll_wrapper.cpp
+++ b/python/src/hll_wrapper.cpp
@@ -33,12 +33,12 @@ hll_sketch hll_sketch_deserialize(py::bytes skBytes) {
 
 py::object hll_sketch_serialize_compact(const hll_sketch& sk) {
   auto serResult = sk.serialize_compact();
-  return py::bytes((char*)serResult.first.get(), serResult.second);
+  return py::bytes((char*)serResult.data(), serResult.size());
 }
 
 py::object hll_sketch_serialize_updatable(const hll_sketch& sk) {
   auto serResult = sk.serialize_updatable();
-  return py::bytes((char*)serResult.first.get(), serResult.second);
+  return py::bytes((char*)serResult.data(), serResult.size());
 }
 
 hll_union hll_union_deserialize(py::bytes uBytes) {
@@ -48,12 +48,12 @@ hll_union hll_union_deserialize(py::bytes uBytes) {
 
 py::object hll_union_serialize_compact(const hll_union& u) {
   auto serResult = u.serialize_compact();
-  return py::bytes((char*)serResult.first.get(), serResult.second);
+  return py::bytes((char*)serResult.data(), serResult.size());
 }
 
 py::object hll_union_serialize_updatable(const hll_union& u) {
   auto serResult = u.serialize_updatable();
-  return py::bytes((char*)serResult.first.get(), serResult.second);
+  return py::bytes((char*)serResult.data(), serResult.size());
 }
 
 }
diff --git a/python/src/kll_wrapper.cpp b/python/src/kll_wrapper.cpp
index 120c3dd..0740f11 100644
--- a/python/src/kll_wrapper.cpp
+++ b/python/src/kll_wrapper.cpp
@@ -37,7 +37,7 @@ kll_sketch<T> kll_sketch_deserialize(py::bytes skBytes) {
 template<typename T>
 py::object kll_sketch_serialize(const kll_sketch<T>& sk) {
   auto serResult = sk.serialize();
-  return py::bytes((char*)serResult.first.get(), serResult.second);
+  return py::bytes((char*)serResult.data(), serResult.size());
 }
 
 // maybe possible to disambiguate the static vs method rank error calls, but
diff --git a/python/src/theta_wrapper.cpp b/python/src/theta_wrapper.cpp
index 9ec2335..5eb27e8 100644
--- a/python/src/theta_wrapper.cpp
+++ b/python/src/theta_wrapper.cpp
@@ -54,7 +54,7 @@ theta_sketch* theta_sketch_deserialize(py::bytes skBytes,
 
 py::object theta_sketch_serialize(const theta_sketch& sk) {
   auto serResult = sk.serialize();
-  return py::bytes((char*)serResult.first.get(), serResult.second);
+  return py::bytes((char*)serResult.data(), serResult.size());
 }
 
 std::string theta_sketch_to_string(const theta_sketch& sk,


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org