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 2020/07/18 18:59:13 UTC

[incubator-datasketches-java] branch master updated (eead07c -> d735da7)

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

leerho pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-java.git.


    from eead07c  Merge pull request #323 from apache/SmallCleanup
     add 3a79cec  Current evolution of setOp and compact changes
     add dbd0350  Interim 2
     add bc77a08  Interim changes, all tests work.
     add 85d4442  Interim.  This removed much of the code in the PairwiseSetOperations class and replaced it with references to the now equivalent classes that extend SetOperation.
     add f421f79  Eliminated two Classes: DirectCompactOrderedSketch and DirectCompactUnorderedSketch.
     add f4317e5  Consolidated all compacting operations into CompactOperations.
     add 184623e  Interim with errors
     add 50f49bf  Deprecated getCurrentBytes(boolean). Replaced by getCompactBytes() and getCurrentBytes().
     add 8736b03  Interm: Completed major rewrite of Concurrent Theta Sketch unit tests and cleaned up main code as well.
     add 46746a8  Merge branch 'master' into Refactor_Theta_Tuple
     add 65897ed  Allow for future extension of Theta.
     add e3f4ad2  Close to final set of changes.
     add 644ab85  Add unit tests
     add 026eb3e  Interim.
     add 9ee4403  Changes as a result of initial review of PR #324
     add 88c23df  Debug why travis fails but it does not fail locally.
     add 3df81f6  change to oracleJDK8 to fix travis bug
     add 6b64482  Fix Travis bug (hopefully)
     add d87b9e1  Fixed several issues related to the PR feedback as well as 3 bugs:
     add 46451a2  Fixes relevant to last PR #324 review.
     add 00fd703  Fix test so that recovered ResizeFactor is detected correctly.
     add dfd3f08  Fixed all issues with PR #324.
     new d735da7  Merge pull request #324 from apache/Refactor_Theta_Tuple

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.


Summary of changes:
 .travis.yml                                        |    2 +-
 .../datasketches/BoundsOnBinomialProportions.java  |   27 +-
 .../datasketches/BoundsOnRatiosInSampledSets.java  |   43 +-
 .../BoundsOnRatiosInThetaSketchedSets.java         |   49 +-
 .../org/apache/datasketches/HashOperations.java    |  219 ++--
 src/main/java/org/apache/datasketches/Util.java    |   11 +-
 .../java/org/apache/datasketches/theta/AnotB.java  |  202 +++-
 .../org/apache/datasketches/theta/AnotBimpl.java   |  237 ++++
 .../datasketches/theta/CompactOperations.java      |  385 +++++++
 .../apache/datasketches/theta/CompactSketch.java   |  128 +--
 .../theta/ConcurrentHeapThetaBuffer.java           |  104 +-
 .../theta/ConcurrentSharedThetaSketch.java         |   19 +-
 .../theta/DirectCompactOrderedSketch.java          |   87 --
 .../datasketches/theta/DirectCompactSketch.java    |   90 +-
 .../theta/DirectCompactUnorderedSketch.java        |   84 --
 .../theta/DirectQuickSelectSketch.java             |   29 +-
 .../theta/DirectQuickSelectSketchR.java            |   61 +-
 .../datasketches/theta/EmptyCompactSketch.java     |   28 +-
 .../datasketches/theta/ForwardCompatibility.java   |    9 +-
 .../apache/datasketches/theta/HeapAlphaSketch.java |   43 +-
 .../org/apache/datasketches/theta/HeapAnotB.java   |  345 ------
 .../theta/HeapCompactOrderedSketch.java            |  103 --
 .../datasketches/theta/HeapCompactSketch.java      |   68 +-
 .../theta/HeapCompactUnorderedSketch.java          |  106 --
 .../datasketches/theta/HeapQuickSelectSketch.java  |   59 +-
 .../datasketches/theta/HeapUpdateSketch.java       |   28 +-
 .../apache/datasketches/theta/Intersection.java    |   48 +-
 .../datasketches/theta/IntersectionImpl.java       |   38 +-
 .../datasketches/theta/IntersectionImplR.java      |   66 +-
 .../datasketches/theta/JaccardSimilarity.java      |   18 +-
 .../datasketches/theta/PairwiseSetOperations.java  |  169 +--
 .../apache/datasketches/theta/PreambleUtil.java    |   41 +-
 .../apache/datasketches/theta/SetOperation.java    |   79 +-
 .../datasketches/theta/SetOperationBuilder.java    |    4 +-
 .../datasketches/theta/SingleItemSketch.java       |  101 +-
 .../java/org/apache/datasketches/theta/Sketch.java |  246 ++---
 .../org/apache/datasketches/theta/Sketches.java    |   12 +
 .../java/org/apache/datasketches/theta/Union.java  |   30 +
 .../org/apache/datasketches/theta/UnionImpl.java   |   37 +-
 .../datasketches/theta/UpdateReturnState.java      |   26 +-
 .../apache/datasketches/theta/UpdateSketch.java    |  163 +--
 .../datasketches/theta/UpdateSketchBuilder.java    |    6 +-
 .../java/org/apache/datasketches/tuple/AnotB.java  |  583 +++++-----
 .../apache/datasketches/tuple/CompactSketch.java   |    5 +
 .../apache/datasketches/tuple/Intersection.java    |    6 +-
 .../datasketches/tuple/QuickSelectSketch.java      |   40 +-
 .../datasketches/tuple/SerializerDeserializer.java |    2 -
 .../java/org/apache/datasketches/tuple/Sketch.java |   10 +
 .../java/org/apache/datasketches/tuple/Util.java   |    5 +-
 .../tuple/arrayofdoubles/ArrayOfDoublesUnion.java  |    1 +
 .../DirectArrayOfDoublesQuickSelectSketch.java     |    6 +-
 src/main/javadoc/resources/dictionary.html         |    2 +-
 .../BoundsOnRatiosInThetaSketchedSetsTest.java     |    4 +-
 .../apache/datasketches/HashOperationsTest.java    |   23 +-
 .../apache/datasketches/theta/AnotBimplTest.java   |  335 ++++++
 .../datasketches/theta/BackwardConversions.java    |    4 +-
 .../datasketches/theta/CompactSketchTest.java      |  238 +++-
 .../ConcurrentDirectQuickSelectSketchTest.java     | 1150 +++++++++-----------
 .../theta/ConcurrentHeapQuickSelectSketchTest.java |  507 ++++-----
 .../datasketches/theta/DirectIntersectionTest.java |  213 ++--
 .../theta/DirectQuickSelectSketchTest.java         |   29 +-
 .../apache/datasketches/theta/DirectUnionTest.java |   23 +-
 .../org/apache/datasketches/theta/EmptyTest.java   |   39 +-
 .../theta/ForwardCompatibilityTest.java            |   27 +-
 .../datasketches/theta/HeapAlphaSketchTest.java    |   58 +-
 .../apache/datasketches/theta/HeapAnotBTest.java   |  391 -------
 .../datasketches/theta/HeapIntersectionTest.java   |  221 ++--
 .../theta/HeapQuickSelectSketchTest.java           |   41 +-
 .../apache/datasketches/theta/HeapUnionTest.java   |   19 +-
 .../theta/PairwiseCornerCasesTest.java             |  457 --------
 .../theta/PairwiseSetOperationsTest.java           |   71 +-
 .../datasketches/theta/PreambleUtilTest.java       |   85 +-
 .../datasketches/theta/ReadOnlyMemoryTest.java     |   17 +-
 .../datasketches/theta/SetOperationTest.java       |   16 +-
 .../datasketches/theta/SetOpsCornerCasesTest.java  |  493 +++++++++
 .../datasketches/theta/SingleItemSketchTest.java   |   49 +-
 .../org/apache/datasketches/theta/SketchTest.java  |   77 +-
 .../apache/datasketches/theta/UnionImplTest.java   |   19 +-
 .../datasketches/theta/UpdateSketchTest.java       |   71 +-
 .../tuple/adouble/AdoubleAnotBTest.java            |   33 +-
 80 files changed, 4541 insertions(+), 4479 deletions(-)
 create mode 100644 src/main/java/org/apache/datasketches/theta/AnotBimpl.java
 create mode 100644 src/main/java/org/apache/datasketches/theta/CompactOperations.java
 delete mode 100644 src/main/java/org/apache/datasketches/theta/DirectCompactOrderedSketch.java
 delete mode 100644 src/main/java/org/apache/datasketches/theta/DirectCompactUnorderedSketch.java
 delete mode 100644 src/main/java/org/apache/datasketches/theta/HeapAnotB.java
 delete mode 100644 src/main/java/org/apache/datasketches/theta/HeapCompactOrderedSketch.java
 delete mode 100644 src/main/java/org/apache/datasketches/theta/HeapCompactUnorderedSketch.java
 create mode 100644 src/test/java/org/apache/datasketches/theta/AnotBimplTest.java
 delete mode 100644 src/test/java/org/apache/datasketches/theta/HeapAnotBTest.java
 delete mode 100644 src/test/java/org/apache/datasketches/theta/PairwiseCornerCasesTest.java
 create mode 100644 src/test/java/org/apache/datasketches/theta/SetOpsCornerCasesTest.java


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


[incubator-datasketches-java] 01/01: Merge pull request #324 from apache/Refactor_Theta_Tuple

Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-java.git

commit d735da7c5ffd1ed72e3c4374de3064a2ef71cb12
Merge: eead07c dfd3f08
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Sat Jul 18 11:59:06 2020 -0700

    Merge pull request #324 from apache/Refactor_Theta_Tuple
    
    Refactor theta tuple

 .travis.yml                                        |    2 +-
 .../datasketches/BoundsOnBinomialProportions.java  |   27 +-
 .../datasketches/BoundsOnRatiosInSampledSets.java  |   43 +-
 .../BoundsOnRatiosInThetaSketchedSets.java         |   49 +-
 .../org/apache/datasketches/HashOperations.java    |  219 ++--
 src/main/java/org/apache/datasketches/Util.java    |   11 +-
 .../java/org/apache/datasketches/theta/AnotB.java  |  202 +++-
 .../org/apache/datasketches/theta/AnotBimpl.java   |  237 ++++
 .../datasketches/theta/CompactOperations.java      |  385 +++++++
 .../apache/datasketches/theta/CompactSketch.java   |  128 +--
 .../theta/ConcurrentHeapThetaBuffer.java           |  104 +-
 .../theta/ConcurrentSharedThetaSketch.java         |   19 +-
 .../theta/DirectCompactOrderedSketch.java          |   87 --
 .../datasketches/theta/DirectCompactSketch.java    |   90 +-
 .../theta/DirectCompactUnorderedSketch.java        |   84 --
 .../theta/DirectQuickSelectSketch.java             |   29 +-
 .../theta/DirectQuickSelectSketchR.java            |   61 +-
 .../datasketches/theta/EmptyCompactSketch.java     |   28 +-
 .../datasketches/theta/ForwardCompatibility.java   |    9 +-
 .../apache/datasketches/theta/HeapAlphaSketch.java |   43 +-
 .../org/apache/datasketches/theta/HeapAnotB.java   |  345 ------
 .../theta/HeapCompactOrderedSketch.java            |  103 --
 .../datasketches/theta/HeapCompactSketch.java      |   68 +-
 .../theta/HeapCompactUnorderedSketch.java          |  106 --
 .../datasketches/theta/HeapQuickSelectSketch.java  |   59 +-
 .../datasketches/theta/HeapUpdateSketch.java       |   28 +-
 .../apache/datasketches/theta/Intersection.java    |   48 +-
 .../datasketches/theta/IntersectionImpl.java       |   38 +-
 .../datasketches/theta/IntersectionImplR.java      |   66 +-
 .../datasketches/theta/JaccardSimilarity.java      |   18 +-
 .../datasketches/theta/PairwiseSetOperations.java  |  169 +--
 .../apache/datasketches/theta/PreambleUtil.java    |   41 +-
 .../apache/datasketches/theta/SetOperation.java    |   79 +-
 .../datasketches/theta/SetOperationBuilder.java    |    4 +-
 .../datasketches/theta/SingleItemSketch.java       |  101 +-
 .../java/org/apache/datasketches/theta/Sketch.java |  246 ++---
 .../org/apache/datasketches/theta/Sketches.java    |   12 +
 .../java/org/apache/datasketches/theta/Union.java  |   30 +
 .../org/apache/datasketches/theta/UnionImpl.java   |   37 +-
 .../datasketches/theta/UpdateReturnState.java      |   26 +-
 .../apache/datasketches/theta/UpdateSketch.java    |  163 +--
 .../datasketches/theta/UpdateSketchBuilder.java    |    6 +-
 .../java/org/apache/datasketches/tuple/AnotB.java  |  583 +++++-----
 .../apache/datasketches/tuple/CompactSketch.java   |    5 +
 .../apache/datasketches/tuple/Intersection.java    |    6 +-
 .../datasketches/tuple/QuickSelectSketch.java      |   40 +-
 .../datasketches/tuple/SerializerDeserializer.java |    2 -
 .../java/org/apache/datasketches/tuple/Sketch.java |   10 +
 .../java/org/apache/datasketches/tuple/Util.java   |    5 +-
 .../tuple/arrayofdoubles/ArrayOfDoublesUnion.java  |    1 +
 .../DirectArrayOfDoublesQuickSelectSketch.java     |    6 +-
 src/main/javadoc/resources/dictionary.html         |    2 +-
 .../BoundsOnRatiosInThetaSketchedSetsTest.java     |    4 +-
 .../apache/datasketches/HashOperationsTest.java    |   23 +-
 .../apache/datasketches/theta/AnotBimplTest.java   |  335 ++++++
 .../datasketches/theta/BackwardConversions.java    |    4 +-
 .../datasketches/theta/CompactSketchTest.java      |  238 +++-
 .../ConcurrentDirectQuickSelectSketchTest.java     | 1150 +++++++++-----------
 .../theta/ConcurrentHeapQuickSelectSketchTest.java |  507 ++++-----
 .../datasketches/theta/DirectIntersectionTest.java |  213 ++--
 .../theta/DirectQuickSelectSketchTest.java         |   29 +-
 .../apache/datasketches/theta/DirectUnionTest.java |   23 +-
 .../org/apache/datasketches/theta/EmptyTest.java   |   39 +-
 .../theta/ForwardCompatibilityTest.java            |   27 +-
 .../datasketches/theta/HeapAlphaSketchTest.java    |   58 +-
 .../apache/datasketches/theta/HeapAnotBTest.java   |  391 -------
 .../datasketches/theta/HeapIntersectionTest.java   |  221 ++--
 .../theta/HeapQuickSelectSketchTest.java           |   41 +-
 .../apache/datasketches/theta/HeapUnionTest.java   |   19 +-
 .../theta/PairwiseCornerCasesTest.java             |  457 --------
 .../theta/PairwiseSetOperationsTest.java           |   71 +-
 .../datasketches/theta/PreambleUtilTest.java       |   85 +-
 .../datasketches/theta/ReadOnlyMemoryTest.java     |   17 +-
 .../datasketches/theta/SetOperationTest.java       |   16 +-
 .../datasketches/theta/SetOpsCornerCasesTest.java  |  493 +++++++++
 .../datasketches/theta/SingleItemSketchTest.java   |   49 +-
 .../org/apache/datasketches/theta/SketchTest.java  |   77 +-
 .../apache/datasketches/theta/UnionImplTest.java   |   19 +-
 .../datasketches/theta/UpdateSketchTest.java       |   71 +-
 .../tuple/adouble/AdoubleAnotBTest.java            |   33 +-
 80 files changed, 4541 insertions(+), 4479 deletions(-)


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