diff --git a/src/java/org/apache/commons/collections/StaticBucketMap.java b/src/java/org/apache/commons/collections/StaticBucketMap.java new file mode 100644 index 000000000..32d678c03 --- /dev/null +++ b/src/java/org/apache/commons/collections/StaticBucketMap.java @@ -0,0 +1,530 @@ +/* + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/StaticBucketMap.java,v 1.1 2002/06/21 06:17:45 mas Exp $ + * $Revision: 1.1 $ + * $Date: 2002/06/21 06:17:45 $ + * + * ==================================================================== + * + * The Apache Software License, Version 1.1 + * + * Copyright (c) 1999-2002 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowlegement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements normally appear. + * + * 4. The names "The Jakarta Project", "Commons", and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ +package org.apache.commons.collections; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.ArrayList; + +/** + * A StaticBucketMap is an efficient thread-safe implementation of the + * java.util.Map. The map supports get, + * put, and contains methods most efficiently. + * The other methods are supported, but are ver inneficient compared to + * other java.util.Map implementations. + * + * @author Berin Loritsch + * @author Gerhard Froehlich + * @author Michael A. Smith + * @version CVS $Revision: 1.1 $ $Date: 2002/06/21 06:17:45 $ + * @since Avalon 4.0 + */ +public final class StaticBucketMap implements Map +{ + private static final int DEFAULT_BUCKETS = 255; + private final Node[] m_buckets; + private final Object[] m_locks; + + /** + * Initializes the map with the default number of buckets (255). + */ + public StaticBucketMap() + { + this( DEFAULT_BUCKETS ); + } + + /** + * Initializes the map with a specified number of buckets. The number + * of buckets is never below 17, and is always an odd number (StaticBucketMap + * ensures this). The number of buckets is inversely proportional to the + * chances for thread contention. The fewer buckets, the more chances for + * thread contention. The more buckets the fewer chances for thread + * contention. + */ + public StaticBucketMap( int numBuckets ) + { + int size = Math.max( 17, numBuckets ); + + // Ensure that bucketSize is never a power of 2 (to ensure maximal distribution) + if( size % 2 == 0 ) + { + size--; + } + + m_buckets = new Node[ size ]; + m_locks = new Object[ size ]; + + for( int i = 0; i < size; i++ ) + { + m_locks[ i ] = new Object(); + } + } + + /** + * Determine the exact hash entry for the key. The hash algorithm + * is rather simplistic, but it does the job: + * + *
+     *   He = |Hk mod n|
+     * 
+ * + *

+ * He is the entry's hashCode, Hk is the key's hashCode, and n is + * the number of buckets. + *

+ */ + private final int getHash( Object key ) + { + if( key == null ) return 0; + final int hash = key.hashCode() % m_buckets.length; + return ( hash < 0 ) ? hash * -1 : hash; + } + + /** + * Obtain a Set for the keys. This operation crosses bucket boundaries, + * so it is less efficient, and greatly increases the chance for thread + * contention. + */ + public Set keySet() + { + Set keySet = new HashSet(); + + for( int i = 0; i < m_buckets.length; i++ ) + { + synchronized( m_locks[ i ] ) + { + Node n = m_buckets[ i ]; + + while( n != null ) + { + keySet.add( n.key ); + n = n.next; + } + } + } + + return keySet; + } + + /** + * Returns the current number of key, value pairs. + */ + public int size() + { + int cnt = 0; + + for( int i = 0; i < m_buckets.length; i++ ) + { + synchronized( m_locks[ i ] ) + { + Node n = m_buckets[ i ]; + + while( n != null ) + { + cnt++; + n = n.next; + } + } + } + + return cnt; + } + + /** + * Put a reference in the Map. + */ + public Object put( final Object key, final Object value ) + { + int hash = getHash( key ); + + synchronized( m_locks[ hash ] ) + { + Node n = m_buckets[ hash ]; + + if( n == null ) + { + n = new Node(); + n.key = key; + n.value = value; + m_buckets[ hash ] = n; + return null; + } + + // Set n to the last node in the linked list. Check each key along the way + // If the key is found, then change the value of that node and return + // the old value. + for( Node next = n; next != null; next = next.next ) + { + n = next; + + if( n.key == key || ( n.key != null && n.key.equals( key ) ) ) + { + Object returnVal = n.value; + n.value = value; + return returnVal; + } + } + + // The key was not found in the current list of nodes, add it to the end + // in a new node. + Node newNode = new Node(); + newNode.key = key; + newNode.value = value; + n.next = newNode; + } + + return null; + } + + /** + * Get an object from the Map by the key + */ + public Object get( final Object key ) + { + int hash = getHash( key ); + + synchronized( m_locks[ hash ] ) + { + Node n = m_buckets[ hash ]; + + while( n != null ) + { + if( n.key == key || ( n.key != null && n.key.equals( key ) ) ) + { + return n.value; + } + + n = n.next; + } + } + + return null; + } + + /** + * Checks to see if the provided key exists in the Map. + */ + public boolean containsKey( final Object key ) + { + int hash = getHash( key ); + + synchronized( m_locks[ hash ] ) + { + Node n = m_buckets[ hash ]; + + while( n != null ) + { + if( n.key == null || ( n.key != null && n.key.equals( key ) ) ) + { + return true; + } + + n = n.next; + } + } + + return false; + } + + /** + * Checks to see if a value exists. This operation crosses bucket + * boundaries, so it is less efficient, and greatly increases the chance + * for thread contention. + */ + public boolean containsValue( final Object value ) + { + for( int i = 0; i < m_buckets.length; i++ ) + { + synchronized( m_locks[ i ] ) + { + Node n = m_buckets[ i ]; + + while( n != null ) + { + if( n.value == value || + (n.value != null && n.value.equals( value ) ) ) + { + return true; + } + + n = n.next; + } + } + } + + return false; + } + + /** + * Obtain a Set for the values. This operation crosses bucket boundaries, + * so it is less efficient, and greatly increases the chance for thread + * contention. + */ + public Collection values() + { + ArrayList values = new ArrayList(); + + for( int i = 0; i < m_buckets.length; i++ ) + { + synchronized( m_locks[ i ] ) + { + Node n = m_buckets[ i ]; + + while( n != null ) + { + values.add( n.value ); + n = n.next; + } + } + } + + return values; + } + + /** + * Obtain a Set for the entries. This operation crosses bucket boundaries, + * so it is less efficient, and greatly increases the chance for thread + * contention. + */ + public Set entrySet() + { + Set entrySet = new HashSet(); + + for( int i = 0; i < m_buckets.length; i++ ) + { + synchronized( m_locks[ i ] ) + { + Node n = m_buckets[ i ]; + + while( n != null ) + { + entrySet.add( n ); + n = n.next; + } + } + } + + return entrySet; + } + + /** + * Add all the contents of one Map into this one. + */ + public void putAll( Map other ) + { + Iterator i = other.keySet().iterator(); + + while( i.hasNext() ) + { + Object key = i.next(); + put( key, other.get( key ) ); + } + } + + /** + * Removes the object from the Map based on the key. + */ + public Object remove( Object key ) + { + int hash = getHash( key ); + + synchronized( m_locks[ hash ] ) + { + Node n = m_buckets[ hash ]; + Node prev = null; + + while( n != null ) + { + if( n.key == null || ( n.key != null && n.key.equals( key ) ) ) + { + // Remove this node from the linked list of nodes. + if( null == prev ) + { + // This node was the head, set the next node to be the new head. + m_buckets[ hash ] = n.next; + } + else + { + // Set the next node of the previous node to be the node after this one. + prev.next = n.next; + } + + return n.value; + } + + prev = n; + n = n.next; + } + } + + return null; + } + + /** + * Tests if the Map is empty. + */ + public final boolean isEmpty() + { + for( int i = 0; i < m_buckets.length; i++ ) + { + if( m_buckets[ i ] != null ) + { + return false; + } + } + + return true; + } + + /** + * Removes all the entries from the Map. + */ + public final void clear() + { + for( int i = 0; i < m_buckets.length; i++ ) + { + m_buckets[ i ] = null; + } + } + + public final boolean equals( Object obj ) + { + if( obj == null ) return false; + if( obj == this ) return true; + + if( !( obj instanceof Map ) ) return false; + + Map other = (Map)obj; + + return entrySet().equals(other.entrySet()); + } + + public final int hashCode() + { + int hashCode = 0; + + for( int i = 0; i < m_buckets.length; i++ ) + { + synchronized( m_locks[ i ] ) + { + Node n = m_buckets[ i ]; + + while( n != null ) + { + hashCode += n.hashCode(); + n = n.next; + } + } + } + return hashCode; + } + + /** + * The Map.Entry for the StaticBucketMap. + */ + private final class Node implements Map.Entry + { + protected Object key; + protected Object value; + protected Node next; + + public Object getKey() + { + return key; + } + + public Object getValue() + { + return value; + } + + public int hashCode() + { + return ( ( key == null ? 0 : key.hashCode() ) ^ + ( value == null ? 0 : value.hashCode() ) ); + } + + public boolean equals(Object o) { + if( o == null ) return false; + if( o == this ) return true; + + if ( ! (o instanceof Map.Entry ) ) + return false; + + Map.Entry e2 = (Map.Entry)o; + + return ((key == null ? + e2.getKey() == null : key.equals(e2.getKey())) && + (value == null ? + e2.getValue() == null : value.equals(e2.getValue()))); + } + + public Object setValue( Object val ) + { + Object retVal = value; + value = val; + return retVal; + } + } +} diff --git a/src/test/org/apache/commons/collections/TestAll.java b/src/test/org/apache/commons/collections/TestAll.java index bce6b9b63..3708a84b4 100644 --- a/src/test/org/apache/commons/collections/TestAll.java +++ b/src/test/org/apache/commons/collections/TestAll.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestAll.java,v 1.27 2002/06/09 19:23:53 mas Exp $ - * $Revision: 1.27 $ - * $Date: 2002/06/09 19:23:53 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestAll.java,v 1.28 2002/06/21 06:17:45 mas Exp $ + * $Revision: 1.28 $ + * $Date: 2002/06/21 06:17:45 $ * * ==================================================================== * @@ -67,7 +67,7 @@ import junit.framework.*; /** * Entry point for all Collections tests. * @author Rodney Waldhoff - * @version $Id: TestAll.java,v 1.27 2002/06/09 19:23:53 mas Exp $ + * @version $Id: TestAll.java,v 1.28 2002/06/21 06:17:45 mas Exp $ */ public class TestAll extends TestCase { public TestAll(String testName) { @@ -104,6 +104,7 @@ public class TestAll extends TestCase { suite.addTest(TestNullComparator.suite()); suite.addTest(TestSequencedHashMap.suite()); suite.addTest(TestSingletonIterator.suite()); + suite.addTest(TestStaticBucketMap.suite()); suite.addTest(TestTreeBag.suite()); suite.addTest(TestUniqueFilterIterator.suite()); suite.addTest(org.apache.commons.collections.primitives.TestAll.suite()); diff --git a/src/test/org/apache/commons/collections/TestStaticBucketMap.java b/src/test/org/apache/commons/collections/TestStaticBucketMap.java new file mode 100644 index 000000000..27b740d12 --- /dev/null +++ b/src/test/org/apache/commons/collections/TestStaticBucketMap.java @@ -0,0 +1,116 @@ +package org.apache.commons.collections; + +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2001 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache Turbine" must not be used to endorse or promote products + * derived from this software without prior written permission. For + * written permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache", + * "Apache Turbine", nor may "Apache" appear in their name, without + * prior written permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + */ + +import java.io.IOException; +import java.io.Serializable; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit tests + * {@link org.apache.commons.collections.StaticBucketMap}. + * + * @author Michael A. Smith + */ +public class TestStaticBucketMap extends TestMap { + + public TestStaticBucketMap(String name) { + super(name); + } + + public static Test suite() { + return new TestSuite(TestStaticBucketMap.class); + } + + public static void main(String[] args[]) { + String[] testCaseName = { TestStaticBucketMap.class.getName() }; + junit.textui.TestRunner.main(testCaseName); + } + + public Map makeEmptyMap() { + return new StaticBucketMap(30); + } + + // The verification method must be overridden because the collection views + // are not backed by the map. + + public void verifyEntrySet() { + // update the entrySet view to the latest version, then proceed to + // verify as usual. + entrySet = map.entrySet(); + super.verifyEntrySet(); + } + + public void verifyKeySet() { + // update the keySet view to the latest version, then proceed to verify + // as usual. + keySet = map.keySet(); + super.verifyKeySet(); + } + + public void verifyValues() { + // update the values view to the latest version, then proceed to verify + // as usual. + values = map.values(); + super.verifyValues(); + } + +}