You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2021/01/10 23:47:29 UTC
[datasketches-java] 05/08: Fix conflicts with Master
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch ReqExperiment
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
commit 827d25b196927c1675253602637367df956f2cb0
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Sun Jan 10 14:45:08 2021 -0800
Fix conflicts with Master
---
src/main/java/org/apache/datasketches/req/ReqCompactor.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/main/java/org/apache/datasketches/req/ReqCompactor.java b/src/main/java/org/apache/datasketches/req/ReqCompactor.java
index ca7d886..80e0f6c 100644
--- a/src/main/java/org/apache/datasketches/req/ReqCompactor.java
+++ b/src/main/java/org/apache/datasketches/req/ReqCompactor.java
@@ -232,12 +232,8 @@ class ReqCompactor {
private boolean ensureEnoughSections() {
final float szf;
final int ne;
-<<<<<<< HEAD
if (state >= 1L << numSections - 1 //TODO try adding: && sectionSize > MIN_K
-=======
- if (state >= 1L << numSections - 1
&& sectionSize > MIN_K
->>>>>>> refs/heads/master
&& (ne = nearestEven(szf = (float)(sectionSizeFlt / SQRT2))) >= MIN_K)
{
sectionSizeFlt = szf;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org