[incubator-datasketches-cpp] branch hll_out_of_order_flag created (now c360a29)

[al...@apache.org]

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

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


      at c360a29  ooo flag fix

This branch includes the following new commits:

     new c360a29  ooo flag fix

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



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

[incubator-datasketches-cpp] 01/01: ooo flag fix

[al...@apache.org]

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

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

commit c360a29b0f1d336645979f7130c1b3a9c245c254
Author: AlexanderSaydakov <Al...@users.noreply.github.com>
AuthorDate: Wed Feb 19 11:20:16 2020 -0800

    ooo flag fix
---
 hll/include/HllUnion-internal.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hll/include/HllUnion-internal.hpp b/hll/include/HllUnion-internal.hpp
index 7735cf7..829af1d 100644
--- a/hll/include/HllUnion-internal.hpp
+++ b/hll/include/HllUnion-internal.hpp
@@ -337,12 +337,12 @@ void hll_union_alloc<A>::union_impl(const hll_sketch_alloc<A>& sketch, const int
       }
       const HllArray<A>* src = static_cast<const HllArray<A>*>(src_impl);
       static_cast<Hll8Array<A>*>(dst_impl)->mergeHll(*src);
+      dst_impl->putOutOfOrderFlag(true);
     }
   } else { // src is HLL, gadget is empty
     dst_impl = copy_or_downsample(src_impl, lg_max_k);
     gadget.sketch_impl->get_deleter()(gadget.sketch_impl); // gadget replaced
   }
-  dst_impl->putOutOfOrderFlag(dst_impl->isOutOfOrderFlag() | src_impl->isOutOfOrderFlag());
   gadget.sketch_impl = dst_impl;
 }
 


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