Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jetty-9 minor StringMap cleanup

This commit is contained in:
Greg Wilkins 2012-02-09 10:56:00 +11:00
parent 1137eea51d
commit 4eeaeff7b9
2 changed files with 34 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
jetty-util/src/main/java/org/eclipse/jetty/util/StringMap.java
View File

@ -13,11 +13,9 @@
package org.eclipse.jetty.util; package org.eclipse.jetty.util;
import java.io.Externalizable;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.AbstractMap; import java.util.AbstractMap;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -34,25 +32,25 @@ import java.util.Set;
* *
* This map is NOT synchronized. * This map is NOT synchronized.
*/ */
public class StringMap<O> extends AbstractMap<String,O> implements Externalizable public class StringMap<O> extends AbstractMap<String,O>
{ {
public static final boolean CASE_INSENSTIVE=true; public static final boolean CASE_INSENSTIVE=true;
protected static final int __HASH_WIDTH=17; protected static final int __HASH_WIDTH=17;
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
protected int _width=__HASH_WIDTH;
private final boolean _ignoreCase;
protected Node<O> _root=new Node<>(); protected Node<O> _root=new Node<>();
protected boolean _ignoreCase=false;
protected NullEntry _nullEntry=null;
protected O _nullValue=null;
protected HashSet<Map.Entry<String,O>> _entrySet=new HashSet<>(3); protected HashSet<Map.Entry<String,O>> _entrySet=new HashSet<>(3);
protected Set<Map.Entry<String,O>> _umEntrySet=Collections.unmodifiableSet(_entrySet);
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
/** Constructor. /** Constructor.
*/ */
public StringMap() public StringMap()
{} {
_ignoreCase=false;
}
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
/** Constructor. /** Constructor.
@ -60,71 +58,21 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
*/ */
public StringMap(boolean ignoreCase) public StringMap(boolean ignoreCase)
{ {
this();
_ignoreCase=ignoreCase; _ignoreCase=ignoreCase;
} }
/* ------------------------------------------------------------ */
/** Constructor.
* @param ignoreCase
* @param width Width of hash tables, larger values are faster but
* use more memory.
*/
public StringMap(boolean ignoreCase,int width)
{
this();
_ignoreCase=ignoreCase;
_width=width;
}
/* ------------------------------------------------------------ */
/** Set the ignoreCase attribute.
* @param ic If true, the map is case insensitive for keys.
*/
public void setIgnoreCase(boolean ic)
{
if (_root._children!=null)
throw new IllegalStateException("Must be set before first put");
_ignoreCase=ic;
}
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public boolean isIgnoreCase() public boolean isIgnoreCase()
{ {
return _ignoreCase; return _ignoreCase;
} }
/* ------------------------------------------------------------ */
/** Set the hash width.
* @param width Width of hash tables, larger values are faster but
* use more memory.
*/
public void setWidth(int width)
{
_width=width;
}
/* ------------------------------------------------------------ */
public int getWidth()
{
return _width;
}
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@Override @Override
public O put(String key, O value) public O put(String key, O value)
{ {
if (key==null) if (key==null)
{ throw new IllegalArgumentException();
O oldValue=_nullValue;
_nullValue=value;
if (_nullEntry==null)
{
_nullEntry=new NullEntry();
_entrySet.add(_nullEntry);
}
return oldValue;
}
Node<O> node = _root; Node<O> node = _root;
int ni=-1; int ni=-1;
@ -143,7 +91,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
parent=node; parent=node;
prev=null; prev=null;
ni=0; ni=0;
node=(node._children==null)?null:node._children[c%_width]; node=(node._children==null)?null:node._children[c%__HASH_WIDTH];
} }
// Loop through a node chain at the same level // Loop through a node chain at the same level
@ -185,10 +133,10 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
else if (parent!=null) // add new child else if (parent!=null) // add new child
{ {
if (parent._children==null) if (parent._children==null)
parent._children=new Node[_width]; parent._children=new Node[__HASH_WIDTH];
parent._children[c%_width]=node; parent._children[c%__HASH_WIDTH]=node;
int oi=node._ochar[0]%_width; int oi=node._ochar[0]%__HASH_WIDTH;
if (node._ochar!=null && node._char[0]%_width!=oi) if (node._ochar!=null && node._char[0]%__HASH_WIDTH!=oi)
{ {
if (parent._children[oi]==null) if (parent._children[oi]==null)
parent._children[oi]=node; parent._children[oi]=node;
@ -227,7 +175,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
public O get(Object key) public O get(Object key)
{ {
if (key==null) if (key==null)
return _nullValue; throw new IllegalArgumentException();
return get(key.toString()); return get(key.toString());
} }
@ -235,7 +183,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
public O get(String key) public O get(String key)
{ {
if (key==null) if (key==null)
return _nullValue; throw new IllegalArgumentException();
Map.Entry<String,O> entry = getEntry(key,0,key.length()); Map.Entry<String,O> entry = getEntry(key,0,key.length());
if (entry==null) if (entry==null)
@ -263,7 +211,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
public Map.Entry<String,O> getEntry(String key,int offset, int length) public Map.Entry<String,O> getEntry(String key,int offset, int length)
{ {
if (key==null) if (key==null)
return _nullEntry; throw new IllegalArgumentException();
Node<O> node = _root; Node<O> node = _root;
int ni=-1; int ni=-1;
@ -278,7 +226,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
if (ni==-1) if (ni==-1)
{ {
ni=0; ni=0;
node=(node._children==null)?null:node._children[c%_width]; node=(node._children==null)?null:node._children[c%__HASH_WIDTH];
} }
// Look through the node chain // Look through the node chain
@ -319,7 +267,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
public Map.Entry<String, O> getEntry(char[] key,int offset, int length) public Map.Entry<String, O> getEntry(char[] key,int offset, int length)
{ {
if (key==null) if (key==null)
return _nullEntry; throw new IllegalArgumentException();
Node<O> node = _root; Node<O> node = _root;
int ni=-1; int ni=-1;
@ -334,7 +282,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
if (ni==-1) if (ni==-1)
{ {
ni=0; ni=0;
node=(node._children==null)?null:node._children[c%_width]; node=(node._children==null)?null:node._children[c%__HASH_WIDTH];
} }
// While we have a node to try // While we have a node to try
@ -376,7 +324,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
public Map.Entry<String,O> getEntry(byte[] key,int offset, int length) public Map.Entry<String,O> getEntry(byte[] key,int offset, int length)
{ {
if (key==null) if (key==null)
return _nullEntry; throw new IllegalArgumentException();
Node<O> node = _root; Node<O> node = _root;
int ni=-1; int ni=-1;
@ -391,7 +339,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
if (ni==-1) if (ni==-1)
{ {
ni=0; ni=0;
node=(node._children==null)?null:node._children[c%_width]; node=(node._children==null)?null:node._children[c%__HASH_WIDTH];
} }
// While we have a node to try // While we have a node to try
@ -443,7 +391,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
public Map.Entry<String,O> getEntry(ByteBuffer key,int position,int length) public Map.Entry<String,O> getEntry(ByteBuffer key,int position,int length)
{ {
if (key==null) if (key==null)
return _nullEntry; throw new IllegalArgumentException();
if (!key.isReadOnly() && !key.isDirect()) if (!key.isReadOnly() && !key.isDirect())
return getEntry(key.array(),key.position(),key.remaining()); return getEntry(key.array(),key.position(),key.remaining());
@ -460,7 +408,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
if (ni==-1) if (ni==-1)
{ {
ni=0; ni=0;
node=(node._children==null)?null:node._children[c%_width]; node=(node._children==null)?null:node._children[c%__HASH_WIDTH];
} }
// While we have a node to try // While we have a node to try
@ -504,16 +452,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
public O remove(String key) public O remove(String key)
{ {
if (key==null) if (key==null)
{ throw new IllegalArgumentException();
O oldValue=_nullValue;
if (_nullEntry!=null)
{
_entrySet.remove(_nullEntry);
_nullEntry=null;
_nullValue=null;
}
return oldValue;
}
Node<O> node = _root; Node<O> node = _root;
int ni=-1; int ni=-1;
@ -528,7 +467,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
if (ni==-1) if (ni==-1)
{ {
ni=0; ni=0;
node=(node._children==null)?null:node._children[c%_width]; node=(node._children==null)?null:node._children[c%__HASH_WIDTH];
} }
// While we have a node to try // While we have a node to try
@ -568,7 +507,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
@Override @Override
public Set<Map.Entry<String,O>> entrySet() public Set<Map.Entry<String,O>> entrySet()
{ {
return _umEntrySet; return Collections.unmodifiableSet(_entrySet);
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@ -590,7 +529,7 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
public boolean containsKey(Object key) public boolean containsKey(Object key)
{ {
if (key==null) if (key==null)
return _nullEntry!=null; return false;
return return
getEntry(key.toString(),0,key==null?0:key.toString().length())!=null; getEntry(key.toString(),0,key==null?0:key.toString().length())!=null;
} }
@ -600,8 +539,6 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
public void clear() public void clear()
{ {
_root=new Node<O>(); _root=new Node<O>();
_nullEntry=null;
_nullValue=null;
_entrySet.clear(); _entrySet.clear();
} }
@ -669,10 +606,10 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
map._entrySet.add(split); map._entrySet.add(split);
split._children=this._children; split._children=this._children;
this._children=new Node[map._width]; this._children=new Node[map.__HASH_WIDTH];
this._children[split._char[0]%map._width]=split; this._children[split._char[0]%map.__HASH_WIDTH]=split;
if (split._ochar!=null && this._children[split._ochar[0]%map._width]!=split) if (split._ochar!=null && this._children[split._ochar[0]%map.__HASH_WIDTH]!=split)
this._children[split._ochar[0]%map._width]=split; this._children[split._ochar[0]%map.__HASH_WIDTH]=split;
return split; return split;
} }
@ -721,34 +658,4 @@ public class StringMap<O> extends AbstractMap<String,O> implements Externalizabl
} }
} }
/* ------------------------------------------------------------ */
/* ------------------------------------------------------------ */
private class NullEntry implements Map.Entry<String,O>
{
public String getKey(){return null;}
public O getValue(){return _nullValue;}
public O setValue(O o)
{O old=_nullValue;_nullValue=o;return old;}
@Override
public String toString(){return "[:null="+_nullValue+"]";}
}
/* ------------------------------------------------------------ */
public void writeExternal(java.io.ObjectOutput out)
throws java.io.IOException
{
HashMap<String,O> map = new HashMap<String,O>(this);
out.writeBoolean(_ignoreCase);
out.writeObject(map);
}
/* ------------------------------------------------------------ */
public void readExternal(java.io.ObjectInput in)
throws java.io.IOException, ClassNotFoundException
{
boolean ic=in.readBoolean();
HashMap<String,O> map = (HashMap<String,O>)in.readObject();
setIgnoreCase(ic);
this.putAll(map);
}
} }

49
jetty-util/src/test/java/org/eclipse/jetty/util/StringMapTest.java
View File

@ -58,11 +58,9 @@ public class StringMapTest
m5.put("bbb", "4"); m5.put("bbb", "4");
m5i=new StringMap<String>(true); m5i=new StringMap<String>(true);
m5i.put(null, "0");
m5i.put("ab", "1"); m5i.put("ab", "1");
m5i.put("abc", "2"); m5i.put("abc", "2");
m5i.put("abb", "3"); m5i.put("abb", "3");
m5i.put("bbb", null);
} }
@Test @Test
@ -71,7 +69,7 @@ public class StringMapTest
assertEquals(0, m0.size()); assertEquals(0, m0.size());
assertEquals(1, m1.size()); assertEquals(1, m1.size());
assertEquals(5, m5.size()); assertEquals(5, m5.size());
assertEquals(5, m5i.size()); assertEquals(3, m5i.size());
m1.remove("abc"); m1.remove("abc");
m5.remove("abc"); m5.remove("abc");
@ -80,7 +78,7 @@ public class StringMapTest
assertEquals(0, m0.size()); assertEquals(0, m0.size());
assertEquals(0, m1.size()); assertEquals(0, m1.size());
assertEquals(4, m5.size()); assertEquals(4, m5.size());
assertEquals(5, m5i.size()); assertEquals(3, m5i.size());
} }
@Test @Test
@ -120,7 +118,6 @@ public class StringMapTest
assertEquals("2",m5i.get("abc")); assertEquals("2",m5i.get("abc"));
assertEquals("2",m5i.get("aBc")); assertEquals("2",m5i.get("aBc"));
m5.put(null,"x");
m5.put("aBc", "x"); m5.put("aBc", "x");
m5i.put("AbC", "x"); m5i.put("AbC", "x");
@ -131,8 +128,6 @@ public class StringMapTest
assertEquals("x",m5i.get((Object)"abc")); assertEquals("x",m5i.get((Object)"abc"));
assertEquals("x",m5i.get("aBc")); assertEquals("x",m5i.get("aBc"));
assertEquals("x",m5.get(null));
assertEquals("0",m5i.get(null));
} }
@ -159,12 +154,6 @@ public class StringMapTest
entry.setValue("x"); entry.setValue("x");
assertEquals("{[c:abc=x]}",entry.toString()); assertEquals("{[c:abc=x]}",entry.toString());
entry=m5i.getEntry((String)null,0,0);
assertTrue(entry!=null);
assertEquals(null,entry.getKey());
assertEquals("0",entry.getValue());
entry.setValue("x");
assertEquals("[:null=x]",entry.toString());
} }
@ -203,17 +192,15 @@ public class StringMapTest
m5.remove("aBc"); m5.remove("aBc");
m5.remove("bbb"); m5.remove("bbb");
m5i.remove("aBc"); m5i.remove("aBc");
m5i.remove(null);
assertEquals(0, m0.size()); assertEquals(0, m0.size());
assertEquals(0, m1.size()); assertEquals(0, m1.size());
assertEquals(4, m5.size()); assertEquals(4, m5.size());
assertEquals(3, m5i.size()); assertEquals(2, m5i.size());
assertEquals("2",m5.get("abc")); assertEquals("2",m5.get("abc"));
assertEquals(null,m5.get("bbb")); assertEquals(null,m5.get("bbb"));
assertEquals(null,m5i.get("AbC")); assertEquals(null,m5i.get("AbC"));
assertEquals(null,m5i.get(null));
} }
/* /*
@ -241,41 +228,11 @@ public class StringMapTest
assertTrue(m5.containsKey("bbb")); assertTrue(m5.containsKey("bbb"));
assertTrue(!m5.containsKey("xyz")); assertTrue(!m5.containsKey("xyz"));
assertTrue(m5i.containsKey(null));
assertTrue(m5i.containsKey("abc")); assertTrue(m5i.containsKey("abc"));
assertTrue(m5i.containsKey("aBc")); assertTrue(m5i.containsKey("aBc"));
assertTrue(m5i.containsKey("ABC")); assertTrue(m5i.containsKey("ABC"));
} }
@Test
public void testWriteExternal()
throws Exception
{
ByteArrayOutputStream bout= new ByteArrayOutputStream();
ObjectOutputStream oo=new ObjectOutputStream(bout);
ObjectInputStream oi;
oo.writeObject(m0);
oo.writeObject(m1);
oo.writeObject(m5);
oo.writeObject(m5i);
oi=new ObjectInputStream(new ByteArrayInputStream(bout.toByteArray()));
m0=(StringMap<String>)oi.readObject();
m1=(StringMap<String>)oi.readObject();
m5=(StringMap<String>)oi.readObject();
m5i=(StringMap<String>)oi.readObject();
testSize();
oi=new ObjectInputStream(new ByteArrayInputStream(bout.toByteArray()));
m0=(StringMap<String>)oi.readObject();
m1=(StringMap<String>)oi.readObject();
m5=(StringMap<String>)oi.readObject();
m5i=(StringMap<String>)oi.readObject();
testPutGet();
}
@Test @Test
public void testToString() public void testToString()
{ {