[Gzz-commits] gzz/lava gzz/storm/impl/AbstractPool.java gzz/s...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      03/01/18 22:41:55

Modified files:
        lava/gzz/storm/impl: AbstractPool.java TransientPool.java 
Added files:
        lava/gzz/storm/impl: P2PPool.java 
        lava/gzz/util  : ByteArrayKey.java 
        lava/test/gzz/storm/impl: MockP2PMap.java MockP2PMap.test 
                                  MockP2PServer.java MockP2PServer.test 
                                  P2PMap.meta P2PServer.meta 
        lava/test/gzz/util: ByteArrayKey.test 

Log message:
        Sketch for a p2p implementation of StormPool

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/P2PPool.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/AbstractPool.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/TransientPool.java.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/util/ByteArrayKey.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/impl/MockP2PMap.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/impl/MockP2PMap.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/impl/MockP2PServer.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/impl/MockP2PServer.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/impl/P2PMap.meta?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/impl/P2PServer.meta?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/util/ByteArrayKey.test?rev=1.1

Patches:
Index: gzz/lava/gzz/storm/impl/AbstractPool.java
diff -u gzz/lava/gzz/storm/impl/AbstractPool.java:1.16 
gzz/lava/gzz/storm/impl/AbstractPool.java:1.17
--- gzz/lava/gzz/storm/impl/AbstractPool.java:1.16      Sat Jan 18 20:08:51 2003
+++ gzz/lava/gzz/storm/impl/AbstractPool.java   Sat Jan 18 22:41:55 2003
@@ -150,34 +150,4 @@
            return is;
        }
     }
-
-    /** A convenience class for using a byte array
-     *  as a hashtable key (in DB implementations).
-     */
-    protected static final class Key {
-       protected byte[] key;
-       protected int hashCode;
-       
-       protected Key(byte[] key) {
-           this.key = key;
-           hashCode = 0;
-
-           for(int i=0; i<key.length; i++) {
-               hashCode += 77;
-               hashCode ^= key[i];
-           }
-       }
-       
-       public boolean equals(Object o) {
-           if(!(o instanceof Key)) return false;
-           Key k = (Key)o;
-           if(hashCode != k.hashCode) return false;
-           if(key == k.key) return true;
-           return Arrays.equals(key, k.key);
-       }
-       
-       public int hashCode() {
-           return hashCode;
-       }
-    }
 }
Index: gzz/lava/gzz/storm/impl/TransientPool.java
diff -u gzz/lava/gzz/storm/impl/TransientPool.java:1.27 
gzz/lava/gzz/storm/impl/TransientPool.java:1.28
--- gzz/lava/gzz/storm/impl/TransientPool.java:1.27     Sat Jan 18 20:08:51 2003
+++ gzz/lava/gzz/storm/impl/TransientPool.java  Sat Jan 18 22:41:55 2003
@@ -24,11 +24,11 @@
 package gzz.storm.impl;
 import gzz.storm.*;
 import gzz.storm.headers.*;
+import gzz.util.ByteArrayKey;
 import java.io.*;
 import java.util.*;
 
 /** A StormPool whose contents are exclusively stored in memory.
- *  Should become an IndexedPool eventually.
  */
 public class TransientPool extends AbstractLocalPool {
     /** The blocks in this pool.
@@ -79,7 +79,7 @@
        protected Map mappings = new HashMap();
 
        protected Set getSet(byte[] key) {
-           Key k = new Key(key);
+           ByteArrayKey k = new ByteArrayKey(key);
            Set s = (Set)mappings.get(k);
            if(s == null) {
                s = new HashSet();