Claudenw commented on a change in pull request #258: URL: https://github.com/apache/commons-collections/pull/258#discussion_r800195731
########## File path: src/main/java/org/apache/commons/collections4/bloomfilter/hasher/SimpleHasher.java ########## @@ -0,0 +1,128 @@ +/* + * 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.util.Objects; +import java.util.function.IntPredicate; + +import org.apache.commons.collections4.bloomfilter.IndexProducer; +import org.apache.commons.collections4.bloomfilter.Shape; + +/** + * A Hasher that implements combinatorial hashing as as described by + * <a href="https://www.eecs.harvard.edu/~michaelm/postscripts/tr-02-05.pdf";>Krisch amd Mitzenmacher</a>. + * <p> + * Common use for this hasher is to generate a byte array as the output of a hashing + * or MessageDigest algorithm.</p> + * + * @since 4.5 + */ +public final class SimpleHasher implements Hasher { + + /** + * The initial hash value. + */ + private final long initial; + + /** + * The value to increment the hash value by. + */ + private final long increment; + + /** + * Convert bytes to long. + * @param byteArray the byte array to extract the values from. + * @param offset the offset to start extraction from. + * @param len the length of the extraction, may be longer than 8. + * @return + */ + private static long toLong(byte[] byteArray, int offset, int len) { + long val = 0; + len = Math.min(len, Long.BYTES); + for (int i = 0; i < len; i++) { + val <<= 8; + val |= (byteArray[offset + i] & 0x00FF); + } + return val; + } + + /** + * Constructs the SimpleHasher from a byte array. + * <p>The byte array is split in 2 and each half is interpreted as a long value. + * Excess bytes are ignored. This simplifies the conversion from a Digest or hasher algorithm output + * to the two values used by the SimpleHasher.</p> + * @param buffer the buffer to extract the longs from. + * @throws IllegalArgumentException is buffer length is zero. + */ + public SimpleHasher(byte[] buffer) { + if (buffer.length == 0) { + throw new IllegalArgumentException("buffer length must be greater than 0"); + } + int segment = buffer.length / 2; + this.initial = toLong(buffer, 0, segment); + this.increment = toLong(buffer, segment, buffer.length - segment); + } + + /** + * Constructs the SimpleHasher from 2 longs. The long values will be interpreted as unsigned values. + * @param initial The initial value for the hasher. + * @param increment The value to increment the hash by on each iteration. + */ + public SimpleHasher(long initial, long increment) { + this.initial = initial; + this.increment = increment; + } + + /** + * Gets an IndexProducer that produces indices based on the shape. + * The iterator will not return the same value multiple + * times. Values will be returned in ascending order. + * + * @param shape {@inheritDoc} + * @return {@inheritDoc} + * @throws IllegalArgumentException {@inheritDoc} + */ + @Override + public IndexProducer indices(final Shape shape) { + Objects.requireNonNull(shape, "shape"); + + return new IndexProducer() { + + /** The index of the next item. */ + private long next = SimpleHasher.this.initial; + + @Override + public boolean forEachIndex(IntPredicate consumer) { + Objects.requireNonNull(consumer, "consumer"); + FilteredIntPredicate filtered = new FilteredIntPredicate(shape.getNumberOfBits(), consumer); Review comment: Removed FilteredIntPredicate class. Created o.a.c.c.bloomfilter.hasher.filter package and placed Filter in there. Created `IndexTracker`, an interface with single method `boolean seen( int number )`. Created 2 implementations of IndexTracker: `BitMapTracker` (from the earlier code) and `ArrayTracker` using a fixed array. Modified `Filter` to implement `IntPredicate` and have 2 constructors: - `(Shape, IntPredicate)` which determines the best IndexTracker implementation to use. - `(Shape, IntPredicate, IndexTracker)` to force a specific index tracker implementation to be used. This significantly simplifies the usage of the filter, and allows for new implementations of the tracking to be added as they are developed. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
