You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by jm...@apache.org on 2019/08/27 07:38:28 UTC
[incubator-datasketches-java] branch sampling_cleanup created (now
c75d1a2)
This is an automated email from the ASF dual-hosted git repository.
jmalkin pushed a change to branch sampling_cleanup
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-java.git.
at c75d1a2 remove unused, commented-out code
This branch includes the following new commits:
new c75d1a2 remove unused, commented-out code
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-java] 01/01: remove unused,
commented-out code
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmalkin pushed a commit to branch sampling_cleanup
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-java.git
commit c75d1a22e3b3395511b8a254e6a1534f4854be81
Author: jmalkin <jm...@users.noreply.github.com>
AuthorDate: Tue Aug 27 00:38:09 2019 -0700
remove unused, commented-out code
---
.../sampling/ReservoirItemsSketchTest.java | 22 ------
.../sketches/sampling/VersionConverterTest.java | 89 ----------------------
2 files changed, 111 deletions(-)
diff --git a/src/test/java/com/yahoo/sketches/sampling/ReservoirItemsSketchTest.java b/src/test/java/com/yahoo/sketches/sampling/ReservoirItemsSketchTest.java
index c4b71b6..86e01ce 100644
--- a/src/test/java/com/yahoo/sketches/sampling/ReservoirItemsSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/sampling/ReservoirItemsSketchTest.java
@@ -413,28 +413,6 @@ public class ReservoirItemsSketchTest {
assertTrue((ris.getImplicitSampleWeight() - 1.5) < EPS);
}
- /*
- @Test
- public void checkReadOnlyHeapify() {
- final ArrayOfLongsSerDe serDe = new ArrayOfLongsSerDe();
- Memory sketchMem = getBasicSerializedLongsRIS();
-
- // Load from read-only and writable memory to ensure they deserialize identically
- ReservoirItemsSketch<Long> ris = ReservoirItemsSketch.heapify(sketchMem.asReadOnlyMemory(),
- serDe);
- ReservoirItemsSketch<Long> fromWritable = ReservoirItemsSketch.heapify(sketchMem, serDe);
- validateReservoirEquality(ris, fromWritable);
-
- // Same with an empty sketch
- final byte[] sketchBytes = ReservoirItemsSketch.<Long>newInstance(32).toByteArray(serDe);
- sketchMem = new NativeMemory(sketchBytes);
-
- ris = ReservoirItemsSketch.heapify(sketchMem.asReadOnlyMemory(), serDe);
- fromWritable = ReservoirItemsSketch.heapify(sketchMem, serDe);
- validateReservoirEquality(ris, fromWritable);
- }
- */
-
@Test
public void checkVersionConversion() {
// version change from 1 to 2 only impact first preamble long, so empty sketch is sufficient
diff --git a/src/test/java/com/yahoo/sketches/sampling/VersionConverterTest.java b/src/test/java/com/yahoo/sketches/sampling/VersionConverterTest.java
deleted file mode 100644
index b7fc4c7..0000000
--- a/src/test/java/com/yahoo/sketches/sampling/VersionConverterTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package com.yahoo.sketches.sampling;
-/*
-import static com.yahoo.sketches.sampling.PreambleUtil.RESERVOIR_SIZE_INT;
-import static com.yahoo.sketches.sampling.PreambleUtil.RESERVOIR_SIZE_SHORT;
-import static com.yahoo.sketches.sampling.PreambleUtil.SERDE_ID_SHORT;
-import static com.yahoo.sketches.sampling.PreambleUtil.SER_VER_BYTE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
-
-import org.testng.annotations.Test;
-
-import com.yahoo.memory.Memory;
-import com.yahoo.memory.NativeMemory;
-import com.yahoo.sketches.ArrayOfLongsSerDe;
-*/
-
-/**
- * Most parts of the class are tested in the sketch and union tests. This class handles only the
- * edge cases not easily tested elsewhere.
- */
-public class VersionConverterTest {
-/*
- @Test
- public void checkReadOnlyMemory() {
- final int k = 32768;
- final short encK = ReservoirSize.computeSize(k);
- final ArrayOfLongsSerDe serDe = new ArrayOfLongsSerDe();
-
- final ReservoirItemsSketch<Long> ris = ReservoirItemsSketch.newInstance(k);
-
- // get a new byte[], manually revert to v1, then reconstruct
- final byte[] sketchBytes = ris.toByteArray(serDe);
- final Memory sketchMem = new NativeMemory(sketchBytes);
- revertToV1(sketchMem, encK);
-
- final Memory readOnlyMem = sketchMem.asReadOnlyMemory();
-
- // read-only input should generate a new Memory
- Memory convertedSketch = VersionConverter.convertSketch1to2(readOnlyMem);
- assertNotEquals(readOnlyMem, convertedSketch);
-
- // same process on writable Memory should be in-place
- convertedSketch = VersionConverter.convertSketch1to2(sketchMem);
- assertEquals(sketchMem, convertedSketch);
- }
-
- @SuppressWarnings("deprecation")
- @Test
- public void checkDeprecatedPreambleMethods() {
- final byte[] headerBytes = new byte[SERDE_ID_SHORT + Short.BYTES];
- final Memory headerMem = new NativeMemory(headerBytes);
- final ArrayOfLongsSerDe serDe = new ArrayOfLongsSerDe();
-
- final Object memObj = headerMem.array(); // may be null
- final long memAddr = headerMem.getCumulativeOffset(0L);
-
- // SerDe ID
- PreambleUtil.insertSerDeId(memObj, memAddr, serDe.getId());
- assertEquals(serDe.getId(), PreambleUtil.extractSerDeId(memObj, memAddr));
- }
-
- private static Memory revertToV1(final Memory mem, final short encodedK) {
- mem.putByte(SER_VER_BYTE, (byte) 1);
- mem.putInt(RESERVOIR_SIZE_INT, 0); // zero out all 4 bytes
- mem.putShort(RESERVOIR_SIZE_SHORT, encodedK);
-
- return mem;
- }
- */
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org