[Gzz-commits] storm ./Makefile ./test.py org/nongnu/storm/Sto...

[Benja Fallenstein]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Benja Fallenstein <address@hidden>      03/04/17 04:36:34

Modified files:
        .              : Makefile test.py 
        org/nongnu/storm: StormPool.meta 
        org/nongnu/storm/impl/p2p: MockP2PMap.java P2PMap.meta 
                                   P2PPool.java 
Added files:
        org/nongnu/storm/impl: AsyncSetCollector.java 
        org/nongnu/storm/modules/gispmap: GispP2PMap.java 
                                          GispP2PMap.test 
                                          GispP2PMapSimple.test 

Log message:
        port GISP impl of p2pmap

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/Makefile.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/test.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/StormPool.meta.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/impl/AsyncSetCollector.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/impl/p2p/MockP2PMap.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/impl/p2p/P2PMap.meta.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/impl/p2p/P2PPool.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/modules/gispmap/GispP2PMap.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/modules/gispmap/GispP2PMap.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/modules/gispmap/GispP2PMapSimple.test?rev=1.1

Patches:
Index: storm/Makefile
diff -u storm/Makefile:1.8 storm/Makefile:1.9
--- storm/Makefile:1.8  Tue Apr 15 04:24:50 2003
+++ storm/Makefile      Thu Apr 17 04:36:34 2003
@@ -3,7 +3,7 @@
 RAWSRC = `find org/ -name "*.java"` `find com/ -name "*.java"`
 CLASSDIR=CLASSES/
 STORM_DEPENDS=../storm-depends
-CLASSPATH=$(CLASSDIR):$(STORM_DEPENDS)/cryptix-jce-provider.jar:$(STORM_DEPENDS)/jython.jar:$(shell
 echo $$CLASSPATH)
+CLASSPATH=$(CLASSDIR):$(STORM_DEPENDS)/cryptix-jce-provider.jar:$(STORM_DEPENDS)/jython.jar:$(STORM_DEPENDS)/gisp.jar:$(STORM_DEPENDS)/dom4j.jar:$(STORM_DEPENDS)/log4j.jar:$(shell
 echo $$CLASSPATH)
 
PYTHONPATH=-Dpython.path=.:$(STORM_DEPENDS)/jythonlib.jar:$(STORM_DEPENDS)/pythonlib.jar
 export CLASSPATH
 JAVAC=javac
Index: storm/org/nongnu/storm/StormPool.meta
diff -u storm/org/nongnu/storm/StormPool.meta:1.5 
storm/org/nongnu/storm/StormPool.meta:1.6
--- storm/org/nongnu/storm/StormPool.meta:1.5   Tue Apr  8 04:03:32 2003
+++ storm/org/nongnu/storm/StormPool.meta       Thu Apr 17 04:36:34 2003
@@ -35,6 +35,7 @@
 
 def testNewBlock():
     """
+    Test creating and retrieving a new block.
     Create a new block in the pool, request it from the pool by ID,
     check its body (contents) and its Content-Type.
     """
Index: storm/org/nongnu/storm/impl/p2p/MockP2PMap.java
diff -u storm/org/nongnu/storm/impl/p2p/MockP2PMap.java:1.1 
storm/org/nongnu/storm/impl/p2p/MockP2PMap.java:1.2
--- storm/org/nongnu/storm/impl/p2p/MockP2PMap.java:1.1 Tue Apr  8 05:43:06 2003
+++ storm/org/nongnu/storm/impl/p2p/MockP2PMap.java     Thu Apr 17 04:36:34 2003
@@ -35,21 +35,20 @@
 public class MockP2PMap implements P2PPool.P2PMap {
     protected Map map = new HashMap();
 
-    protected Collection getSet(byte[] key) {
-       ByteArrayKey k = new ByteArrayKey(key);
-       Collection s = (Collection)map.get(k);
+    protected Collection getSet(String key) {
+       Collection s = (Collection)map.get(key);
        if(s == null) {
            s = new ArrayList();
-           map.put(k, s);
+           map.put(key, s);
        }
        return s;
     }
 
-    public Collector get(byte[] key) {
+    public Collector get(String key) {
        return new SimpleSetCollector(new HashSet(getSet(key)));
     }
 
-    public void put(byte[] key, byte[] value) {
+    public void put(String key, String value) {
        getSet(key).add(value);
     }
 }
Index: storm/org/nongnu/storm/impl/p2p/P2PMap.meta
diff -u storm/org/nongnu/storm/impl/p2p/P2PMap.meta:1.1 
storm/org/nongnu/storm/impl/p2p/P2PMap.meta:1.2
--- storm/org/nongnu/storm/impl/p2p/P2PMap.meta:1.1     Tue Apr  8 05:43:06 2003
+++ storm/org/nongnu/storm/impl/p2p/P2PMap.meta Thu Apr 17 04:36:34 2003
@@ -53,11 +53,11 @@
     return set
 
 def testSimple():
-    k1 = array([4,5,6], 'b')
-    k2 = array([4,5,6], 'b')
-    k3 = array([8,6,2,5,4], 'b')
-    k4 = array([8,6,2,5,4], 'b')
-    k5 = array([5,6,4], 'b')
+    k1 = 'bla'
+    k2 = 'bla'
+    k3 = 'blubb'
+    k4 = 'blubb'
+    k5 = 'foo'
 
     beforePut()
 
Index: storm/org/nongnu/storm/impl/p2p/P2PPool.java
diff -u storm/org/nongnu/storm/impl/p2p/P2PPool.java:1.1 
storm/org/nongnu/storm/impl/p2p/P2PPool.java:1.2
--- storm/org/nongnu/storm/impl/p2p/P2PPool.java:1.1    Tue Apr  8 05:43:06 2003
+++ storm/org/nongnu/storm/impl/p2p/P2PPool.java        Thu Apr 17 04:36:34 2003
@@ -58,8 +58,8 @@
      *  actually downloading blocks.
      */
     public interface P2PMap {
-       Collector get(byte[] key) throws IOException;
-       void put(byte[] key, byte[] value) throws IOException;
+       Collector get(String key) throws IOException;
+       void put(String key, String value) throws IOException;
     }
 
     /** A method for sharing/downloading blocks on the network.
Index: storm/test.py
diff -u storm/test.py:1.1 storm/test.py:1.2
--- storm/test.py:1.1   Mon Apr  7 15:05:23 2003
+++ storm/test.py       Thu Apr 17 04:36:34 2003
@@ -180,3 +180,4 @@
 
 if __name__ == '__main__':
     main(sys.argv[1:])
+    sys.exit()