Merge pull request #274 from apache/RenamePackages

Refactor / Rename package hierarchies.
apache · Aug 28, 2019 · ee9d8ed · ee9d8ed
2 parents f6c44f9 + 5d990f7
commit ee9d8ed
Show file tree

Hide file tree

Showing 399 changed files with 2,693 additions and 2,692 deletions.
diff --git a/pom.xml b/pom.xml
@@ -83,7 +83,7 @@ under the License.
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
         <!-- Dependencies -->
-        <datasketches-memory.version>0.12.2</datasketches-memory.version>
+        <datasketches-memory.version>1.1.0-incubating</datasketches-memory.version>
         <testng.version>6.14.3</testng.version>
         <slf4j-api.version>1.7.25</slf4j-api.version>
 
@@ -129,8 +129,8 @@ under the License.
 
     <dependencies>
         <dependency>
-            <groupId>com.yahoo.datasketches</groupId> <!-- Temporary until artifacts created in Apache -->
-            <artifactId>memory</artifactId>
+            <groupId>org.apache.datasketches</groupId>
+            <artifactId>datasketches-memory</artifactId>
             <version>${datasketches-memory.version}</version>
         </dependency>
 

diff --git a/.../yahoo/sketches/ArrayOfBooleansSerDe.java → ...he/datasketches/ArrayOfBooleansSerDe.java b/.../yahoo/sketches/ArrayOfBooleansSerDe.java → ...he/datasketches/ArrayOfBooleansSerDe.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
-import com.yahoo.memory.Memory;
-import com.yahoo.memory.UnsafeUtil;
-import com.yahoo.memory.WritableMemory;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.UnsafeUtil;
+import org.apache.datasketches.memory.WritableMemory;
 
 /**
  * Methods of serializing and deserializing arrays of Boolean as a bit array.

diff --git a/...m/yahoo/sketches/ArrayOfDoublesSerDe.java → ...che/datasketches/ArrayOfDoublesSerDe.java b/...m/yahoo/sketches/ArrayOfDoublesSerDe.java → ...che/datasketches/ArrayOfDoublesSerDe.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
-import com.yahoo.memory.Memory;
-import com.yahoo.memory.UnsafeUtil;
-import com.yahoo.memory.WritableMemory;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.UnsafeUtil;
+import org.apache.datasketches.memory.WritableMemory;
 
 /**
  * Methods of serializing and deserializing arrays of Double.

diff --git a/...com/yahoo/sketches/ArrayOfItemsSerDe.java → ...pache/datasketches/ArrayOfItemsSerDe.java b/...com/yahoo/sketches/ArrayOfItemsSerDe.java → ...pache/datasketches/ArrayOfItemsSerDe.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
-import com.yahoo.memory.Memory;
+import org.apache.datasketches.memory.Memory;
 
 /**
  * Base class for serializing and deserializing custom types.

diff --git a/...com/yahoo/sketches/ArrayOfLongsSerDe.java → ...pache/datasketches/ArrayOfLongsSerDe.java b/...com/yahoo/sketches/ArrayOfLongsSerDe.java → ...pache/datasketches/ArrayOfLongsSerDe.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
-import com.yahoo.memory.Memory;
-import com.yahoo.memory.UnsafeUtil;
-import com.yahoo.memory.WritableMemory;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.UnsafeUtil;
+import org.apache.datasketches.memory.WritableMemory;
 
 /**
  * Methods of serializing and deserializing arrays of Long.

diff --git a/...m/yahoo/sketches/ArrayOfNumbersSerDe.java → ...che/datasketches/ArrayOfNumbersSerDe.java b/...m/yahoo/sketches/ArrayOfNumbersSerDe.java → ...che/datasketches/ArrayOfNumbersSerDe.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
-import com.yahoo.memory.Memory;
-import com.yahoo.memory.UnsafeUtil;
-import com.yahoo.memory.WritableMemory;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.UnsafeUtil;
+import org.apache.datasketches.memory.WritableMemory;
 
 /**
  * Methods of serializing and deserializing arrays of the object version of primitive types of

diff --git a/...m/yahoo/sketches/ArrayOfStringsSerDe.java → ...che/datasketches/ArrayOfStringsSerDe.java b/...m/yahoo/sketches/ArrayOfStringsSerDe.java → ...che/datasketches/ArrayOfStringsSerDe.java
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
 import java.nio.charset.StandardCharsets;
 
-import com.yahoo.memory.Memory;
-import com.yahoo.memory.UnsafeUtil;
-import com.yahoo.memory.WritableMemory;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.UnsafeUtil;
+import org.apache.datasketches.memory.WritableMemory;
 
 /**
  * Methods of serializing and deserializing arrays of String.

diff --git a/...oo/sketches/ArrayOfUtf16StringsSerDe.java → ...atasketches/ArrayOfUtf16StringsSerDe.java b/...oo/sketches/ArrayOfUtf16StringsSerDe.java → ...atasketches/ArrayOfUtf16StringsSerDe.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
-import com.yahoo.memory.Memory;
-import com.yahoo.memory.UnsafeUtil;
-import com.yahoo.memory.WritableMemory;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.UnsafeUtil;
+import org.apache.datasketches.memory.WritableMemory;
 
 /**
  * Methods of serializing and deserializing arrays of String.

diff --git a/...a/com/yahoo/sketches/BinomialBoundsN.java → .../apache/datasketches/BinomialBoundsN.java b/...a/com/yahoo/sketches/BinomialBoundsN.java → .../apache/datasketches/BinomialBoundsN.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
 /**
  * This class enables the estimation of error bounds given a sample set size, the sampling

diff --git a/...sketches/BoundsOnBinomialProportions.java → ...sketches/BoundsOnBinomialProportions.java b/...sketches/BoundsOnBinomialProportions.java → ...sketches/BoundsOnBinomialProportions.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
 /**
  * Confidence intervals for binomial proportions.

diff --git a/...sketches/BoundsOnRatiosInSampledSets.java → ...sketches/BoundsOnRatiosInSampledSets.java b/...sketches/BoundsOnRatiosInSampledSets.java → ...sketches/BoundsOnRatiosInSampledSets.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
-import static com.yahoo.sketches.BoundsOnBinomialProportions.approximateLowerBoundOnP;
-import static com.yahoo.sketches.BoundsOnBinomialProportions.approximateUpperBoundOnP;
+import static org.apache.datasketches.BoundsOnBinomialProportions.approximateLowerBoundOnP;
+import static org.apache.datasketches.BoundsOnBinomialProportions.approximateUpperBoundOnP;
 
 /**
  * This class is used to compute the bounds on the estimate of the ratio <i>|B| / |A|</i>, where:

diff --git a/...es/BoundsOnRatiosInThetaSketchedSets.java → ...es/BoundsOnRatiosInThetaSketchedSets.java b/...es/BoundsOnRatiosInThetaSketchedSets.java → ...es/BoundsOnRatiosInThetaSketchedSets.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
-import com.yahoo.sketches.theta.Sketch;
+import org.apache.datasketches.theta.Sketch;
 
 /**
  * This class is used to compute the bounds on the estimate of the ratio <i>B / A</i>, where:

diff --git a/...ava/com/yahoo/sketches/ByteArrayUtil.java → ...rg/apache/datasketches/ByteArrayUtil.java b/...ava/com/yahoo/sketches/ByteArrayUtil.java → ...rg/apache/datasketches/ByteArrayUtil.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
 /**
  * Useful methods for byte arrays.

diff --git a/.../java/com/yahoo/sketches/EquivTables.java → .../org/apache/datasketches/EquivTables.java b/.../java/com/yahoo/sketches/EquivTables.java → .../org/apache/datasketches/EquivTables.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
 /**
  * Tables for BinomialBoundsN calculations.

diff --git a/src/main/java/com/yahoo/sketches/Family.java → .../java/org/apache/datasketches/Family.java b/src/main/java/com/yahoo/sketches/Family.java → .../java/org/apache/datasketches/Family.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...va/com/yahoo/sketches/HashOperations.java → ...g/apache/datasketches/HashOperations.java b/...va/com/yahoo/sketches/HashOperations.java → ...g/apache/datasketches/HashOperations.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
-import com.yahoo.memory.Memory;
-import com.yahoo.memory.WritableMemory;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableMemory;
 
 /**
  * Helper class for the common hash table methods.

diff --git a/...a/com/yahoo/sketches/QuantilesHelper.java → .../apache/datasketches/QuantilesHelper.java b/...a/com/yahoo/sketches/QuantilesHelper.java → .../apache/datasketches/QuantilesHelper.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
 /**
  * Common static methods for quantiles sketches

diff --git a/.../java/com/yahoo/sketches/QuickSelect.java → .../org/apache/datasketches/QuickSelect.java b/.../java/com/yahoo/sketches/QuickSelect.java → .../org/apache/datasketches/QuickSelect.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
 /**
  * QuickSelect algorithm improved from Sedgewick. Gets the kth order value

diff --git a/...java/com/yahoo/sketches/ResizeFactor.java → ...org/apache/datasketches/ResizeFactor.java b/...java/com/yahoo/sketches/ResizeFactor.java → ...org/apache/datasketches/ResizeFactor.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
 /**
  * For the Families that accept this configuration parameter, it controls the size multiple that

diff --git a/...o/sketches/SketchesArgumentException.java → ...tasketches/SketchesArgumentException.java b/...o/sketches/SketchesArgumentException.java → ...tasketches/SketchesArgumentException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
 /**
  * Illegal Arguments Exception class for the library

diff --git a/...com/yahoo/sketches/SketchesException.java → ...pache/datasketches/SketchesException.java b/...com/yahoo/sketches/SketchesException.java → ...pache/datasketches/SketchesException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
 /**
  * Exception class for the library

diff --git a/...o/sketches/SketchesReadOnlyException.java → ...tasketches/SketchesReadOnlyException.java b/...o/sketches/SketchesReadOnlyException.java → ...tasketches/SketchesReadOnlyException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
 /**
  * Write operation attempted on a read-only class.

diff --git a/...ahoo/sketches/SketchesStateException.java → .../datasketches/SketchesStateException.java b/...ahoo/sketches/SketchesStateException.java → .../datasketches/SketchesStateException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
 /**
  * Illegal State Exception class for the library

diff --git a/src/main/java/com/yahoo/sketches/Util.java → ...in/java/org/apache/datasketches/Util.java b/src/main/java/com/yahoo/sketches/Util.java → ...in/java/org/apache/datasketches/Util.java
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package com.yahoo.sketches;
+package org.apache.datasketches;
 
-import static com.yahoo.sketches.hash.MurmurHash3.hash;
 import static java.lang.Math.ceil;
 import static java.lang.Math.floor;
 import static java.lang.Math.log;
 import static java.lang.Math.pow;
 import static java.lang.Math.round;
+import static org.apache.datasketches.hash.MurmurHash3.hash;
 
 /**
  * Common utility functions.

diff --git a/...m/yahoo/sketches/cpc/CompressedState.java → ...che/datasketches/cpc/CompressedState.java b/...m/yahoo/sketches/cpc/CompressedState.java → ...che/datasketches/cpc/CompressedState.java
@@ -17,38 +17,38 @@
  * under the License.
  */
 
-package com.yahoo.sketches.cpc;
+package org.apache.datasketches.cpc;
 
-import static com.yahoo.sketches.Util.computeSeedHash;
-import static com.yahoo.sketches.cpc.PreambleUtil.checkCapacity;
-import static com.yahoo.sketches.cpc.PreambleUtil.checkLoPreamble;
-import static com.yahoo.sketches.cpc.PreambleUtil.getDefinedPreInts;
-import static com.yahoo.sketches.cpc.PreambleUtil.getFiCol;
-import static com.yahoo.sketches.cpc.PreambleUtil.getFormatOrdinal;
-import static com.yahoo.sketches.cpc.PreambleUtil.getHipAccum;
-import static com.yahoo.sketches.cpc.PreambleUtil.getKxP;
-import static com.yahoo.sketches.cpc.PreambleUtil.getLgK;
-import static com.yahoo.sketches.cpc.PreambleUtil.getNumCoupons;
-import static com.yahoo.sketches.cpc.PreambleUtil.getNumSv;
-import static com.yahoo.sketches.cpc.PreambleUtil.getPreInts;
-import static com.yahoo.sketches.cpc.PreambleUtil.getSeedHash;
-import static com.yahoo.sketches.cpc.PreambleUtil.getSvLengthInts;
-import static com.yahoo.sketches.cpc.PreambleUtil.getSvStream;
-import static com.yahoo.sketches.cpc.PreambleUtil.getWLengthInts;
-import static com.yahoo.sketches.cpc.PreambleUtil.getWStream;
-import static com.yahoo.sketches.cpc.PreambleUtil.isCompressed;
-import static com.yahoo.sketches.cpc.PreambleUtil.putEmptyHip;
-import static com.yahoo.sketches.cpc.PreambleUtil.putEmptyMerged;
-import static com.yahoo.sketches.cpc.PreambleUtil.putPinnedSlidingHip;
-import static com.yahoo.sketches.cpc.PreambleUtil.putPinnedSlidingHipNoSv;
-import static com.yahoo.sketches.cpc.PreambleUtil.putPinnedSlidingMerged;
-import static com.yahoo.sketches.cpc.PreambleUtil.putPinnedSlidingMergedNoSv;
-import static com.yahoo.sketches.cpc.PreambleUtil.putSparseHybridHip;
-import static com.yahoo.sketches.cpc.PreambleUtil.putSparseHybridMerged;
-import static com.yahoo.sketches.cpc.RuntimeAsserts.rtAssert;
+import static org.apache.datasketches.Util.computeSeedHash;
+import static org.apache.datasketches.cpc.PreambleUtil.checkCapacity;
+import static org.apache.datasketches.cpc.PreambleUtil.checkLoPreamble;
+import static org.apache.datasketches.cpc.PreambleUtil.getDefinedPreInts;
+import static org.apache.datasketches.cpc.PreambleUtil.getFiCol;
+import static org.apache.datasketches.cpc.PreambleUtil.getFormatOrdinal;
+import static org.apache.datasketches.cpc.PreambleUtil.getHipAccum;
+import static org.apache.datasketches.cpc.PreambleUtil.getKxP;
+import static org.apache.datasketches.cpc.PreambleUtil.getLgK;
+import static org.apache.datasketches.cpc.PreambleUtil.getNumCoupons;
+import static org.apache.datasketches.cpc.PreambleUtil.getNumSv;
+import static org.apache.datasketches.cpc.PreambleUtil.getPreInts;
+import static org.apache.datasketches.cpc.PreambleUtil.getSeedHash;
+import static org.apache.datasketches.cpc.PreambleUtil.getSvLengthInts;
+import static org.apache.datasketches.cpc.PreambleUtil.getSvStream;
+import static org.apache.datasketches.cpc.PreambleUtil.getWLengthInts;
+import static org.apache.datasketches.cpc.PreambleUtil.getWStream;
+import static org.apache.datasketches.cpc.PreambleUtil.isCompressed;
+import static org.apache.datasketches.cpc.PreambleUtil.putEmptyHip;
+import static org.apache.datasketches.cpc.PreambleUtil.putEmptyMerged;
+import static org.apache.datasketches.cpc.PreambleUtil.putPinnedSlidingHip;
+import static org.apache.datasketches.cpc.PreambleUtil.putPinnedSlidingHipNoSv;
+import static org.apache.datasketches.cpc.PreambleUtil.putPinnedSlidingMerged;
+import static org.apache.datasketches.cpc.PreambleUtil.putPinnedSlidingMergedNoSv;
+import static org.apache.datasketches.cpc.PreambleUtil.putSparseHybridHip;
+import static org.apache.datasketches.cpc.PreambleUtil.putSparseHybridMerged;
+import static org.apache.datasketches.cpc.RuntimeAsserts.rtAssert;
 
-import com.yahoo.memory.Memory;
-import com.yahoo.memory.WritableMemory;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableMemory;
 
 /**
  * @author Lee Rhodes

diff --git a/...m/yahoo/sketches/cpc/CompressionData.java → ...che/datasketches/cpc/CompressionData.java b/...m/yahoo/sketches/cpc/CompressionData.java → ...che/datasketches/cpc/CompressionData.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.yahoo.sketches.cpc;
+package org.apache.datasketches.cpc;
 
 /**
  * The 23 length-limited Huffman codes in this file were created by the ocaml program

diff --git a/...om/yahoo/sketches/cpc/CpcCompression.java → ...ache/datasketches/cpc/CpcCompression.java b/...om/yahoo/sketches/cpc/CpcCompression.java → ...ache/datasketches/cpc/CpcCompression.java
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package com.yahoo.sketches.cpc;
-
-import static com.yahoo.sketches.cpc.CompressionData.columnPermutationsForDecoding;
-import static com.yahoo.sketches.cpc.CompressionData.columnPermutationsForEncoding;
-import static com.yahoo.sketches.cpc.CompressionData.decodingTablesForHighEntropyByte;
-import static com.yahoo.sketches.cpc.CompressionData.encodingTablesForHighEntropyByte;
-import static com.yahoo.sketches.cpc.CompressionData.lengthLimitedUnaryDecodingTable65;
-import static com.yahoo.sketches.cpc.CompressionData.lengthLimitedUnaryEncodingTable65;
-import static com.yahoo.sketches.cpc.PairTable.introspectiveInsertionSort;
-//import static com.yahoo.sketches.cpc.RuntimeAsserts.rtAssertEquals;
+package org.apache.datasketches.cpc;
+
+import static org.apache.datasketches.cpc.CompressionData.columnPermutationsForDecoding;
+import static org.apache.datasketches.cpc.CompressionData.columnPermutationsForEncoding;
+import static org.apache.datasketches.cpc.CompressionData.decodingTablesForHighEntropyByte;
+import static org.apache.datasketches.cpc.CompressionData.encodingTablesForHighEntropyByte;
+import static org.apache.datasketches.cpc.CompressionData.lengthLimitedUnaryDecodingTable65;
+import static org.apache.datasketches.cpc.CompressionData.lengthLimitedUnaryEncodingTable65;
+import static org.apache.datasketches.cpc.PairTable.introspectiveInsertionSort;
+//import static org.apache.datasketches.cpc.RuntimeAsserts.rtAssertEquals;
 
 /**
  * @author Lee Rhodes