[GitHub] [commons-collections] Claudenw commented on a change in pull request #131: Added caching hasher
Claudenw commented on a change in pull request #131: Added caching hasher
URL:
https://github.com/apache/commons-collections/pull/131#discussion_r389242973
##
File path:
src/test/java/org/apache/commons/collections4/bloomfilter/hasher/CachingHasherTest.java
##
@@ -0,0 +1,241 @@
+/*
+ * 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 org.apache.commons.collections4.bloomfilter.hasher;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.PrimitiveIterator;
+import java.util.PrimitiveIterator.OfInt;
+
+import org.apache.commons.collections4.bloomfilter.hasher.function.MD5Cyclic;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests the {@link CachingHasher}.
+ */
+public class CachingHasherTest {
+private CachingHasher.Builder builder;
+private Shape shape;
+
+private final HashFunctionIdentity testFunction = new
HashFunctionIdentity() {
+
+@Override
+public String getName() {
+return "Test Function";
+}
+
+@Override
+public ProcessType getProcessType() {
+return ProcessType.CYCLIC;
+}
+
+@Override
+public String getProvider() {
+return "Apache Commons Collection Tests";
+}
+
+@Override
+public long getSignature() {
+return 0;
+}
+
+@Override
+public Signedness getSignedness() {
+return Signedness.SIGNED;
+}
+};
+
+/**
+ * Sets up the CachingHasher.
+ */
+@Before
+public void setup() {
+builder = new CachingHasher.Builder(new MD5Cyclic());
+shape = new Shape(new MD5Cyclic(), 3, 72, 17);
+}
+
+/**
+ * Tests that the expected bits are returned from hashing.
+ */
+@Test
+public void testGetBits() {
+
+final int[] expected = { 6, 69, 44, 19, 10, 57, 48, 23, 70, 61, 36,
11, 2, 49, 24, 15, 62 };
+
+final Hasher hasher = builder.with("Hello").build();
+
+final OfInt iter = hasher.getBits(shape);
+
+for (final int element : expected) {
+assertTrue(iter.hasNext());
+assertEquals(element, iter.nextInt());
+}
+assertFalse(iter.hasNext());
+}
+
+/**
+ * Tests that bits from multiple hashes are returned correctly.
+ */
+@Test
+public void testGetBits_MultipleHashes() {
+final int[] expected = { 6, 69, 44, 19, 10, 57, 48, 23, 70, 61, 36,
11, 2, 49, 24, 15, 62, 1, 63, 53, 43, 17, 7,
+69, 59, 49, 39, 13, 3, 65, 55, 45, 35, 25 };
+
+final Hasher hasher = builder.with("Hello").with("World").build();
+
+final OfInt iter = hasher.getBits(shape);
+
+for (final int element : expected) {
+assertTrue(iter.hasNext());
+assertEquals(element, iter.nextInt());
+}
+assertFalse(iter.hasNext());
+try {
+iter.next();
+fail("Should have thown NoSuchElementException");
+} catch (final NoSuchElementException ignore) {
+// do nothing
+}
+}
+
+/**
+ * Tests that retrieving bits for the wrong shape throws an exception.
+ */
+@Test
+public void testGetBits_WongShape() {
+
+final Hasher hasher = builder.with("Hello").build();
+
+try {
+hasher.getBits(new Shape(testFunction, 3, 72, 17));
+fail("Should have thown IllegalArgumentException");
+} catch (final IllegalArgumentException expected) {
+// do nothing
+}
+}
+
+/**
+ * Tests if isEmpty() reports correctly and the iterator returns no values.
+ */
+@Test
+public void testIsEmpty() {
+CachingHasher hasher = builder.build();
+assertTrue(hasher.isEmpty());
+final OfInt iter = hasher.getBits(shape);
+assertFalse(iter.hasNext());
+try {
+iter.next();
+fail("Should have thown NoSuchElementException");
+} catch (final
[GitHub] [commons-collections] Claudenw commented on a change in pull request #131: Added caching hasher
Claudenw commented on a change in pull request #131: Added caching hasher
URL:
https://github.com/apache/commons-collections/pull/131#discussion_r389242984
##
File path:
src/test/java/org/apache/commons/collections4/bloomfilter/hasher/CachingHasherTest.java
##
@@ -0,0 +1,241 @@
+/*
+ * 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 org.apache.commons.collections4.bloomfilter.hasher;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.PrimitiveIterator;
+import java.util.PrimitiveIterator.OfInt;
+
+import org.apache.commons.collections4.bloomfilter.hasher.function.MD5Cyclic;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests the {@link CachingHasher}.
+ */
+public class CachingHasherTest {
+private CachingHasher.Builder builder;
+private Shape shape;
+
+private final HashFunctionIdentity testFunction = new
HashFunctionIdentity() {
+
+@Override
+public String getName() {
+return "Test Function";
+}
+
+@Override
+public ProcessType getProcessType() {
+return ProcessType.CYCLIC;
+}
+
+@Override
+public String getProvider() {
+return "Apache Commons Collection Tests";
+}
+
+@Override
+public long getSignature() {
+return 0;
+}
+
+@Override
+public Signedness getSignedness() {
+return Signedness.SIGNED;
+}
+};
+
+/**
+ * Sets up the CachingHasher.
+ */
+@Before
+public void setup() {
+builder = new CachingHasher.Builder(new MD5Cyclic());
+shape = new Shape(new MD5Cyclic(), 3, 72, 17);
+}
+
+/**
+ * Tests that the expected bits are returned from hashing.
+ */
+@Test
+public void testGetBits() {
+
+final int[] expected = { 6, 69, 44, 19, 10, 57, 48, 23, 70, 61, 36,
11, 2, 49, 24, 15, 62 };
+
+final Hasher hasher = builder.with("Hello").build();
+
+final OfInt iter = hasher.getBits(shape);
+
+for (final int element : expected) {
+assertTrue(iter.hasNext());
+assertEquals(element, iter.nextInt());
+}
+assertFalse(iter.hasNext());
+}
+
+/**
+ * Tests that bits from multiple hashes are returned correctly.
+ */
+@Test
+public void testGetBits_MultipleHashes() {
+final int[] expected = { 6, 69, 44, 19, 10, 57, 48, 23, 70, 61, 36,
11, 2, 49, 24, 15, 62, 1, 63, 53, 43, 17, 7,
+69, 59, 49, 39, 13, 3, 65, 55, 45, 35, 25 };
+
+final Hasher hasher = builder.with("Hello").with("World").build();
+
+final OfInt iter = hasher.getBits(shape);
+
+for (final int element : expected) {
+assertTrue(iter.hasNext());
+assertEquals(element, iter.nextInt());
+}
+assertFalse(iter.hasNext());
+try {
+iter.next();
+fail("Should have thown NoSuchElementException");
+} catch (final NoSuchElementException ignore) {
+// do nothing
+}
+}
+
+/**
+ * Tests that retrieving bits for the wrong shape throws an exception.
+ */
+@Test
+public void testGetBits_WongShape() {
+
+final Hasher hasher = builder.with("Hello").build();
+
+try {
+hasher.getBits(new Shape(testFunction, 3, 72, 17));
+fail("Should have thown IllegalArgumentException");
+} catch (final IllegalArgumentException expected) {
+// do nothing
+}
+}
+
+/**
+ * Tests if isEmpty() reports correctly and the iterator returns no values.
+ */
+@Test
+public void testIsEmpty() {
+CachingHasher hasher = builder.build();
+assertTrue(hasher.isEmpty());
+final OfInt iter = hasher.getBits(shape);
+assertFalse(iter.hasNext());
+try {
+iter.next();
+fail("Should have thown NoSuchElementException");
+} catch (final
[GitHub] [commons-collections] Claudenw commented on a change in pull request #131: Added caching hasher
Claudenw commented on a change in pull request #131: Added caching hasher
URL:
https://github.com/apache/commons-collections/pull/131#discussion_r389242943
##
File path:
src/test/java/org/apache/commons/collections4/bloomfilter/hasher/CachingHasherTest.java
##
@@ -0,0 +1,241 @@
+/*
+ * 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 org.apache.commons.collections4.bloomfilter.hasher;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.PrimitiveIterator;
+import java.util.PrimitiveIterator.OfInt;
+
+import org.apache.commons.collections4.bloomfilter.hasher.function.MD5Cyclic;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests the {@link CachingHasher}.
+ */
+public class CachingHasherTest {
+private CachingHasher.Builder builder;
+private Shape shape;
+
+private final HashFunctionIdentity testFunction = new
HashFunctionIdentity() {
+
+@Override
+public String getName() {
+return "Test Function";
+}
+
+@Override
+public ProcessType getProcessType() {
+return ProcessType.CYCLIC;
+}
+
+@Override
+public String getProvider() {
+return "Apache Commons Collection Tests";
+}
+
+@Override
+public long getSignature() {
+return 0;
+}
+
+@Override
+public Signedness getSignedness() {
+return Signedness.SIGNED;
+}
+};
+
+/**
+ * Sets up the CachingHasher.
+ */
+@Before
+public void setup() {
+builder = new CachingHasher.Builder(new MD5Cyclic());
+shape = new Shape(new MD5Cyclic(), 3, 72, 17);
+}
+
+/**
+ * Tests that the expected bits are returned from hashing.
+ */
+@Test
+public void testGetBits() {
+
+final int[] expected = { 6, 69, 44, 19, 10, 57, 48, 23, 70, 61, 36,
11, 2, 49, 24, 15, 62 };
+
+final Hasher hasher = builder.with("Hello").build();
+
+final OfInt iter = hasher.getBits(shape);
+
+for (final int element : expected) {
+assertTrue(iter.hasNext());
+assertEquals(element, iter.nextInt());
+}
+assertFalse(iter.hasNext());
+}
+
+/**
+ * Tests that bits from multiple hashes are returned correctly.
+ */
+@Test
+public void testGetBits_MultipleHashes() {
+final int[] expected = { 6, 69, 44, 19, 10, 57, 48, 23, 70, 61, 36,
11, 2, 49, 24, 15, 62, 1, 63, 53, 43, 17, 7,
+69, 59, 49, 39, 13, 3, 65, 55, 45, 35, 25 };
+
+final Hasher hasher = builder.with("Hello").with("World").build();
+
+final OfInt iter = hasher.getBits(shape);
+
+for (final int element : expected) {
+assertTrue(iter.hasNext());
+assertEquals(element, iter.nextInt());
+}
+assertFalse(iter.hasNext());
+try {
+iter.next();
+fail("Should have thown NoSuchElementException");
+} catch (final NoSuchElementException ignore) {
+// do nothing
+}
+}
+
+/**
+ * Tests that retrieving bits for the wrong shape throws an exception.
+ */
+@Test
+public void testGetBits_WongShape() {
+
+final Hasher hasher = builder.with("Hello").build();
+
+try {
+hasher.getBits(new Shape(testFunction, 3, 72, 17));
+fail("Should have thown IllegalArgumentException");
+} catch (final IllegalArgumentException expected) {
+// do nothing
+}
+}
+
+/**
+ * Tests if isEmpty() reports correctly and the iterator returns no values.
+ */
+@Test
+public void testIsEmpty() {
+CachingHasher hasher = builder.build();
+assertTrue(hasher.isEmpty());
+final OfInt iter = hasher.getBits(shape);
+assertFalse(iter.hasNext());
+try {
+iter.next();
+fail("Should have thown NoSuchElementException");
+} catch (final
[GitHub] [commons-collections] Claudenw commented on a change in pull request #131: Added caching hasher
Claudenw commented on a change in pull request #131: Added caching hasher
URL:
https://github.com/apache/commons-collections/pull/131#discussion_r389242956
##
File path:
src/test/java/org/apache/commons/collections4/bloomfilter/hasher/CachingHasherTest.java
##
@@ -0,0 +1,241 @@
+/*
+ * 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 org.apache.commons.collections4.bloomfilter.hasher;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.PrimitiveIterator;
+import java.util.PrimitiveIterator.OfInt;
+
+import org.apache.commons.collections4.bloomfilter.hasher.function.MD5Cyclic;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests the {@link CachingHasher}.
+ */
+public class CachingHasherTest {
+private CachingHasher.Builder builder;
+private Shape shape;
+
+private final HashFunctionIdentity testFunction = new
HashFunctionIdentity() {
Review comment:
fixed
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [commons-collections] Claudenw commented on a change in pull request #131: Added caching hasher
Claudenw commented on a change in pull request #131: Added caching hasher
URL:
https://github.com/apache/commons-collections/pull/131#discussion_r389242994
##
File path:
src/test/java/org/apache/commons/collections4/bloomfilter/hasher/CachingHasherTest.java
##
@@ -0,0 +1,241 @@
+/*
+ * 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 org.apache.commons.collections4.bloomfilter.hasher;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.PrimitiveIterator;
+import java.util.PrimitiveIterator.OfInt;
+
+import org.apache.commons.collections4.bloomfilter.hasher.function.MD5Cyclic;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests the {@link CachingHasher}.
+ */
+public class CachingHasherTest {
+private CachingHasher.Builder builder;
+private Shape shape;
+
+private final HashFunctionIdentity testFunction = new
HashFunctionIdentity() {
+
+@Override
+public String getName() {
+return "Test Function";
+}
+
+@Override
+public ProcessType getProcessType() {
+return ProcessType.CYCLIC;
+}
+
+@Override
+public String getProvider() {
+return "Apache Commons Collection Tests";
+}
+
+@Override
+public long getSignature() {
+return 0;
+}
+
+@Override
+public Signedness getSignedness() {
+return Signedness.SIGNED;
+}
+};
+
+/**
+ * Sets up the CachingHasher.
+ */
+@Before
+public void setup() {
+builder = new CachingHasher.Builder(new MD5Cyclic());
+shape = new Shape(new MD5Cyclic(), 3, 72, 17);
+}
+
+/**
+ * Tests that the expected bits are returned from hashing.
+ */
+@Test
+public void testGetBits() {
+
+final int[] expected = { 6, 69, 44, 19, 10, 57, 48, 23, 70, 61, 36,
11, 2, 49, 24, 15, 62 };
+
+final Hasher hasher = builder.with("Hello").build();
+
+final OfInt iter = hasher.getBits(shape);
+
+for (final int element : expected) {
+assertTrue(iter.hasNext());
+assertEquals(element, iter.nextInt());
+}
+assertFalse(iter.hasNext());
+}
+
+/**
+ * Tests that bits from multiple hashes are returned correctly.
+ */
+@Test
+public void testGetBits_MultipleHashes() {
+final int[] expected = { 6, 69, 44, 19, 10, 57, 48, 23, 70, 61, 36,
11, 2, 49, 24, 15, 62, 1, 63, 53, 43, 17, 7,
+69, 59, 49, 39, 13, 3, 65, 55, 45, 35, 25 };
+
+final Hasher hasher = builder.with("Hello").with("World").build();
+
+final OfInt iter = hasher.getBits(shape);
+
+for (final int element : expected) {
+assertTrue(iter.hasNext());
+assertEquals(element, iter.nextInt());
+}
+assertFalse(iter.hasNext());
+try {
+iter.next();
+fail("Should have thown NoSuchElementException");
+} catch (final NoSuchElementException ignore) {
+// do nothing
+}
+}
+
+/**
+ * Tests that retrieving bits for the wrong shape throws an exception.
+ */
+@Test
+public void testGetBits_WongShape() {
+
Review comment:
fixed
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [commons-collections] Claudenw commented on a change in pull request #131: Added caching hasher
Claudenw commented on a change in pull request #131: Added caching hasher
URL:
https://github.com/apache/commons-collections/pull/131#discussion_r389242913
##
File path:
src/main/java/org/apache/commons/collections4/bloomfilter/hasher/CachingHasher.java
##
@@ -0,0 +1,233 @@
+/*
+ * 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 org.apache.commons.collections4.bloomfilter.hasher;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.PrimitiveIterator;
+
+import
org.apache.commons.collections4.bloomfilter.hasher.HashFunctionIdentity.ProcessType;
+
+/**
+ * An implementation of Hasher that attempts to leak as little data as
possible.
+ * Each item in the hasher is represented by two (2) longs. So this Hasher
will
+ * still indicate how many items are in the hasher but will not leak the
buffers
+ * that are being hashed as the @code DynamicHasher} does.
+ *
+ * This hasher only accepts HashFunctions that are cyclic in nature.
+ *
+ * @see DynamicHasher
+ * @see ProcessType
+ */
+public class CachingHasher implements Hasher {
+
+/**
+ * The list of byte arrays that are to be hashed.
+ */
+private final List buffers;
+
+/**
+ * The hash function identity
+ */
+private final HashFunctionIdentity functionIdentity;
+
+/**
+ * Constructs a CachingHasher from a list of arrays of hash values.
+ *
+ * The list of hash values comprises a @code{Listlong[]} where
each @code{long[]}
+ * is comprises two (2) values that are the result of hashing the original
buffer. Thus a
+ * CachingHasher that was built from five (5) buffers will have five
arrays of two @code{longs}
+ * each.
+ *
+ * @param functionIdentity The identity of the function.
+ * @param buffers a list of @code{long} arrays comprising two (2)
values.
+ * @throws IllegalArgumentException if the name does not indicate a cyclic
+ * hashing function.
+ */
+public CachingHasher(HashFunctionIdentity functionIdentity, List
buffers) {
+this.functionIdentity = checkIdentity(functionIdentity);
+this.buffers = new ArrayList(buffers);
+}
+
+/**
+ * Constructs a CachingHasher from an array of arrys of hash values.
+ *
+ * @param functionIdentity The identity of the function.
+ * @param buffers an array of @code{long} arrays comprising two
(2) values.
+ * @throws IllegalArgumentException if the name does not indicate a cyclic
+ * hashing function.
+ */
+public CachingHasher(HashFunctionIdentity functionIdentity, long[][]
buffers) {
+this.functionIdentity = checkIdentity(functionIdentity);
+this.buffers = Arrays.asList(buffers);
+}
+
+/**
+ * Checks that the name is valid for this hasher.
+ *
+ * @param functionIdentity the Function Identity to check.
+ */
+private static HashFunctionIdentity checkIdentity(HashFunctionIdentity
functionIdentity) {
+if (functionIdentity.getProcessType() != ProcessType.CYCLIC) {
+throw new IllegalArgumentException("Only cyclic hash functions may
be used in a caching hasher");
+}
+return functionIdentity;
+}
+
+@Override
+public HashFunctionIdentity getHashFunctionIdentity() {
+return functionIdentity;
+}
+
+@Override
+public boolean isEmpty() {
+return buffers.isEmpty();
+}
+
+
+@Override
+public PrimitiveIterator.OfInt getBits(Shape shape) {
+HashFunctionValidator.checkAreEqual(getHashFunctionIdentity(),
+shape.getHashFunctionIdentity());
+return new IntIterator(shape);
+}
+
+/**
+ * Gets the long representations of the buffers.
+ *
+ * This method returns the long representations of the buffers. This is
commonly used
+ * to transmit the Hasher from one system to another.
+ *
+ * @return a copy if the long buffer representation.
+ */
+public List getBuffers() {
+return new
[GitHub] [commons-collections] Claudenw commented on a change in pull request #131: Added caching hasher
Claudenw commented on a change in pull request #131: Added caching hasher
URL:
https://github.com/apache/commons-collections/pull/131#discussion_r389242932
##
File path:
src/test/java/org/apache/commons/collections4/bloomfilter/hasher/CachingHasherBuilderTest.java
##
@@ -0,0 +1,103 @@
+/*
+ * 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 org.apache.commons.collections4.bloomfilter.hasher;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.PrimitiveIterator.OfInt;
+
+import org.apache.commons.collections4.bloomfilter.hasher.function.MD5Cyclic;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * {@link CachingHasher.Builder} tests.
+ */
+public class CachingHasherBuilderTest {
+
+private CachingHasher.Builder builder;
+private final Shape shape = new Shape(new MD5Cyclic(), 1,
Integer.MAX_VALUE, 1);
+
+/**
+ * Tests that hashing a byte works as expected.
+ */
+@Test
+public void buildTest_byte() {
+final CachingHasher hasher = builder.with((byte) 0x1).build();
+
+final int expected = 1483089307;
+
+final OfInt iter = hasher.getBits(shape);
+
+assertTrue(iter.hasNext());
+assertEquals(expected, iter.nextInt());
+assertFalse(iter.hasNext());
+}
+
+/**
+ * Tests that hashing a byte array works as expected.
+ */
+@Test
+public void buildTest_byteArray() {
+final CachingHasher hasher = builder.with("Hello".getBytes()).build();
+final int expected = 1519797563;
+
+final OfInt iter = hasher.getBits(shape);
+
+assertTrue(iter.hasNext());
+assertEquals(expected, iter.nextInt());
+assertFalse(iter.hasNext());
+}
+
+/**
+ * Tests that an empty hasher works as expected.
+ */
+@Test
+public void buildTest_Empty() {
+final CachingHasher hasher = builder.build();
+
+final OfInt iter = hasher.getBits(shape);
+
+assertFalse(iter.hasNext());
+}
+
+/**
+ * Tests that hashing a string works as expected.
+ */
+@Test
+public void buildTest_String() {
+final CachingHasher hasher = builder.with("Hello").build();
+final int expected = 1519797563;
+
+final OfInt iter = hasher.getBits(shape);
+
+assertTrue(iter.hasNext());
+assertEquals(expected, iter.nextInt());
+assertFalse(iter.hasNext());
+}
+
+/**
+ * Sets up the builder for testing.
+ */
+@Before
Review comment:
fixed
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [commons-collections] Claudenw commented on a change in pull request #131: Added caching hasher
Claudenw commented on a change in pull request #131: Added caching hasher
URL:
https://github.com/apache/commons-collections/pull/131#discussion_r389242745
##
File path:
src/main/java/org/apache/commons/collections4/bloomfilter/hasher/CachingHasher.java
##
@@ -0,0 +1,233 @@
+/*
+ * 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 org.apache.commons.collections4.bloomfilter.hasher;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.PrimitiveIterator;
+
+import
org.apache.commons.collections4.bloomfilter.hasher.HashFunctionIdentity.ProcessType;
+
+/**
+ * An implementation of Hasher that attempts to leak as little data as
possible.
+ * Each item in the hasher is represented by two (2) longs. So this Hasher
will
+ * still indicate how many items are in the hasher but will not leak the
buffers
+ * that are being hashed as the @code DynamicHasher} does.
+ *
+ * This hasher only accepts HashFunctions that are cyclic in nature.
+ *
+ * @see DynamicHasher
+ * @see ProcessType
+ */
+public class CachingHasher implements Hasher {
+
+/**
+ * The list of byte arrays that are to be hashed.
+ */
+private final List buffers;
+
+/**
+ * The hash function identity
+ */
+private final HashFunctionIdentity functionIdentity;
+
+/**
+ * Constructs a CachingHasher from a list of arrays of hash values.
+ *
+ * The list of hash values comprises a @code{Listlong[]} where
each @code{long[]}
+ * is comprises two (2) values that are the result of hashing the original
buffer. Thus a
+ * CachingHasher that was built from five (5) buffers will have five
arrays of two @code{longs}
+ * each.
+ *
+ * @param functionIdentity The identity of the function.
+ * @param buffers a list of @code{long} arrays comprising two (2)
values.
+ * @throws IllegalArgumentException if the name does not indicate a cyclic
+ * hashing function.
+ */
+public CachingHasher(HashFunctionIdentity functionIdentity, List
buffers) {
+this.functionIdentity = checkIdentity(functionIdentity);
+this.buffers = new ArrayList(buffers);
+}
+
+/**
+ * Constructs a CachingHasher from an array of arrys of hash values.
+ *
+ * @param functionIdentity The identity of the function.
+ * @param buffers an array of @code{long} arrays comprising two
(2) values.
+ * @throws IllegalArgumentException if the name does not indicate a cyclic
+ * hashing function.
+ */
+public CachingHasher(HashFunctionIdentity functionIdentity, long[][]
buffers) {
+this.functionIdentity = checkIdentity(functionIdentity);
+this.buffers = Arrays.asList(buffers);
+}
+
+/**
+ * Checks that the name is valid for this hasher.
+ *
+ * @param functionIdentity the Function Identity to check.
+ */
+private static HashFunctionIdentity checkIdentity(HashFunctionIdentity
functionIdentity) {
+if (functionIdentity.getProcessType() != ProcessType.CYCLIC) {
+throw new IllegalArgumentException("Only cyclic hash functions may
be used in a caching hasher");
+}
+return functionIdentity;
+}
+
+@Override
+public HashFunctionIdentity getHashFunctionIdentity() {
+return functionIdentity;
+}
+
+@Override
+public boolean isEmpty() {
+return buffers.isEmpty();
+}
+
+
+@Override
+public PrimitiveIterator.OfInt getBits(Shape shape) {
+HashFunctionValidator.checkAreEqual(getHashFunctionIdentity(),
+shape.getHashFunctionIdentity());
+return new IntIterator(shape);
+}
+
+/**
+ * Gets the long representations of the buffers.
+ *
+ * This method returns the long representations of the buffers. This is
commonly used
+ * to transmit the Hasher from one system to another.
+ *
+ * @return a copy if the long buffer representation.
+ */
+public List getBuffers() {
+return new
[GitHub] [commons-collections] Claudenw commented on a change in pull request #131: Added caching hasher
Claudenw commented on a change in pull request #131: Added caching hasher
URL:
https://github.com/apache/commons-collections/pull/131#discussion_r389242724
##
File path:
src/main/java/org/apache/commons/collections4/bloomfilter/hasher/CachingHasher.java
##
@@ -0,0 +1,233 @@
+/*
+ * 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 org.apache.commons.collections4.bloomfilter.hasher;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.PrimitiveIterator;
+
+import
org.apache.commons.collections4.bloomfilter.hasher.HashFunctionIdentity.ProcessType;
+
+/**
+ * An implementation of Hasher that attempts to leak as little data as
possible.
+ * Each item in the hasher is represented by two (2) longs. So this Hasher
will
+ * still indicate how many items are in the hasher but will not leak the
buffers
+ * that are being hashed as the @code DynamicHasher} does.
+ *
+ * This hasher only accepts HashFunctions that are cyclic in nature.
+ *
+ * @see DynamicHasher
+ * @see ProcessType
+ */
+public class CachingHasher implements Hasher {
+
+/**
+ * The list of byte arrays that are to be hashed.
+ */
+private final List buffers;
+
+/**
+ * The hash function identity
+ */
+private final HashFunctionIdentity functionIdentity;
+
+/**
+ * Constructs a CachingHasher from a list of arrays of hash values.
+ *
+ * The list of hash values comprises a @code{Listlong[]} where
each @code{long[]}
+ * is comprises two (2) values that are the result of hashing the original
buffer. Thus a
+ * CachingHasher that was built from five (5) buffers will have five
arrays of two @code{longs}
+ * each.
+ *
+ * @param functionIdentity The identity of the function.
+ * @param buffers a list of @code{long} arrays comprising two (2)
values.
+ * @throws IllegalArgumentException if the name does not indicate a cyclic
+ * hashing function.
+ */
+public CachingHasher(HashFunctionIdentity functionIdentity, List
buffers) {
+this.functionIdentity = checkIdentity(functionIdentity);
+this.buffers = new ArrayList(buffers);
+}
+
+/**
+ * Constructs a CachingHasher from an array of arrys of hash values.
+ *
+ * @param functionIdentity The identity of the function.
+ * @param buffers an array of @code{long} arrays comprising two
(2) values.
Review comment:
fixed
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [commons-collections] Claudenw commented on a change in pull request #131: Added caching hasher
Claudenw commented on a change in pull request #131: Added caching hasher
URL:
https://github.com/apache/commons-collections/pull/131#discussion_r389242733
##
File path:
src/main/java/org/apache/commons/collections4/bloomfilter/hasher/CachingHasher.java
##
@@ -0,0 +1,233 @@
+/*
+ * 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 org.apache.commons.collections4.bloomfilter.hasher;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.PrimitiveIterator;
+
+import
org.apache.commons.collections4.bloomfilter.hasher.HashFunctionIdentity.ProcessType;
+
+/**
+ * An implementation of Hasher that attempts to leak as little data as
possible.
+ * Each item in the hasher is represented by two (2) longs. So this Hasher
will
+ * still indicate how many items are in the hasher but will not leak the
buffers
+ * that are being hashed as the @code DynamicHasher} does.
+ *
+ * This hasher only accepts HashFunctions that are cyclic in nature.
+ *
+ * @see DynamicHasher
+ * @see ProcessType
+ */
+public class CachingHasher implements Hasher {
+
+/**
+ * The list of byte arrays that are to be hashed.
+ */
+private final List buffers;
+
+/**
+ * The hash function identity
+ */
+private final HashFunctionIdentity functionIdentity;
+
+/**
+ * Constructs a CachingHasher from a list of arrays of hash values.
+ *
+ * The list of hash values comprises a @code{Listlong[]} where
each @code{long[]}
+ * is comprises two (2) values that are the result of hashing the original
buffer. Thus a
+ * CachingHasher that was built from five (5) buffers will have five
arrays of two @code{longs}
+ * each.
+ *
+ * @param functionIdentity The identity of the function.
+ * @param buffers a list of @code{long} arrays comprising two (2)
values.
+ * @throws IllegalArgumentException if the name does not indicate a cyclic
+ * hashing function.
+ */
+public CachingHasher(HashFunctionIdentity functionIdentity, List
buffers) {
+this.functionIdentity = checkIdentity(functionIdentity);
+this.buffers = new ArrayList(buffers);
+}
+
+/**
+ * Constructs a CachingHasher from an array of arrys of hash values.
+ *
+ * @param functionIdentity The identity of the function.
+ * @param buffers an array of @code{long} arrays comprising two
(2) values.
+ * @throws IllegalArgumentException if the name does not indicate a cyclic
+ * hashing function.
+ */
+public CachingHasher(HashFunctionIdentity functionIdentity, long[][]
buffers) {
+this.functionIdentity = checkIdentity(functionIdentity);
+this.buffers = Arrays.asList(buffers);
+}
+
+/**
+ * Checks that the name is valid for this hasher.
+ *
+ * @param functionIdentity the Function Identity to check.
+ */
+private static HashFunctionIdentity checkIdentity(HashFunctionIdentity
functionIdentity) {
+if (functionIdentity.getProcessType() != ProcessType.CYCLIC) {
+throw new IllegalArgumentException("Only cyclic hash functions may
be used in a caching hasher");
+}
+return functionIdentity;
+}
+
+@Override
+public HashFunctionIdentity getHashFunctionIdentity() {
+return functionIdentity;
+}
+
+@Override
+public boolean isEmpty() {
+return buffers.isEmpty();
+}
+
+
+@Override
+public PrimitiveIterator.OfInt getBits(Shape shape) {
+HashFunctionValidator.checkAreEqual(getHashFunctionIdentity(),
+shape.getHashFunctionIdentity());
+return new IntIterator(shape);
+}
+
+/**
+ * Gets the long representations of the buffers.
+ *
Review comment:
fixed
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this
[GitHub] [commons-collections] Claudenw commented on a change in pull request #131: Added caching hasher
Claudenw commented on a change in pull request #131: Added caching hasher
URL:
https://github.com/apache/commons-collections/pull/131#discussion_r389242645
##
File path:
src/main/java/org/apache/commons/collections4/bloomfilter/hasher/CachingHasher.java
##
@@ -0,0 +1,233 @@
+/*
+ * 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 org.apache.commons.collections4.bloomfilter.hasher;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.PrimitiveIterator;
+
+import
org.apache.commons.collections4.bloomfilter.hasher.HashFunctionIdentity.ProcessType;
+
+/**
+ * An implementation of Hasher that attempts to leak as little data as
possible.
+ * Each item in the hasher is represented by two (2) longs. So this Hasher
will
+ * still indicate how many items are in the hasher but will not leak the
buffers
+ * that are being hashed as the @code DynamicHasher} does.
+ *
+ * This hasher only accepts HashFunctions that are cyclic in nature.
+ *
+ * @see DynamicHasher
+ * @see ProcessType
+ */
+public class CachingHasher implements Hasher {
+
+/**
+ * The list of byte arrays that are to be hashed.
+ */
+private final List buffers;
+
+/**
+ * The hash function identity
+ */
+private final HashFunctionIdentity functionIdentity;
+
+/**
+ * Constructs a CachingHasher from a list of arrays of hash values.
+ *
+ * The list of hash values comprises a @code{Listlong[]} where
each @code{long[]}
Review comment:
fixed
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [commons-collections] Claudenw commented on a change in pull request #131: Added caching hasher
Claudenw commented on a change in pull request #131: Added caching hasher URL: https://github.com/apache/commons-collections/pull/131#discussion_r389242640 ## File path: src/main/java/org/apache/commons/collections4/bloomfilter/hasher/CachingHasher.java ## @@ -0,0 +1,233 @@ +/* + * 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 org.apache.commons.collections4.bloomfilter.hasher; + +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.PrimitiveIterator; + +import org.apache.commons.collections4.bloomfilter.hasher.HashFunctionIdentity.ProcessType; + +/** + * An implementation of Hasher that attempts to leak as little data as possible. + * Each item in the hasher is represented by two (2) longs. So this Hasher will + * still indicate how many items are in the hasher but will not leak the buffers + * that are being hashed as the @code DynamicHasher} does. Review comment: fixed This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [commons-collections] Claudenw commented on a change in pull request #131: Added caching hasher
Claudenw commented on a change in pull request #131: Added caching hasher
URL:
https://github.com/apache/commons-collections/pull/131#discussion_r389242584
##
File path:
src/main/java/org/apache/commons/collections4/bloomfilter/hasher/HashFunctionIdentityImpl.java
##
@@ -51,7 +51,8 @@ public HashFunctionIdentityImpl(final HashFunctionIdentity
identity) {
* @param process the processes of the hash function.
* @param signature the signature for the hash function.
*/
-public HashFunctionIdentityImpl(final String provider, final String name,
final Signedness signedness, final ProcessType process,
+public HashFunctionIdentityImpl(final String provider, final String name,
final Signedness signedness,
Review comment:
reversed
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [commons-collections] Claudenw commented on a change in pull request #131: Added caching hasher
Claudenw commented on a change in pull request #131: Added caching hasher
URL:
https://github.com/apache/commons-collections/pull/131#discussion_r389242559
##
File path:
src/main/java/org/apache/commons/collections4/bloomfilter/hasher/HashFunctionValidator.java
##
@@ -20,7 +20,7 @@
/**
* Contains validation for hash functions.
*/
-final class HashFunctionValidator {
+public final class HashFunctionValidator {
Review comment:
reversed - unintended for this pull
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
