bug fix: retrieve by full key returned empty set, now correct

diff --git a/Robust/src/Util/MultiViewMap.java b/Robust/src/Util/MultiViewMap.java
index c8482c9196c38f0e15172cb71eb507e1501f3a8d..4ce0f9d343992d90313574838f4c81f2c57772d1 100644 (file)
--- a/Robust/src/Util/MultiViewMap.java
+++ b/Robust/src/Util/MultiViewMap.java
@@ -221,6 +221,14 @@ public class MultiViewMap<T> {
     Set<MultiKey> getFullKeys( BitSet   view,\r
                                MultiKey partialKey ) {\r
 \r
+    if( view.equals( fullView ) ) {\r
+      Set<MultiKey> fullKeys = new HashSet<MultiKey>();\r
+      if( fullKey2value.containsKey( partialKey ) ) {\r
+        fullKeys.add( partialKey );\r
+      }\r
+      return fullKeys;\r
+    }\r
+\r
     Map<MultiKey, Set<MultiKey>> partialKey2fullKeys =\r
       getPartialKey2fullKeys( view );\r
     return getFullKeys( partialKey2fullKeys, partialKey );\r

diff --git a/Robust/src/Util/UnitTests/MultiViewMapTest.java b/Robust/src/Util/UnitTests/MultiViewMapTest.java
index fc4a004da62662801a55bac9d6aabb9d3a401e35..c2c1f97be8d9ce8df34f0663e142ec2fe4e015dc 100644 (file)
--- a/Robust/src/Util/UnitTests/MultiViewMapTest.java
+++ b/Robust/src/Util/UnitTests/MultiViewMapTest.java
@@ -17,9 +17,11 @@ public class MultiViewMapTest {
 
   private static Random random;
 
+  private static int numTests  = 0;
+  private static int numPassed = 0;
 
-  private static void p() { System.out.println( "  passed" ); }
-  private static void f() { System.out.println( "  !!!FAILED!!!" ); }
+  private static void p() { numTests++; numPassed++; System.out.print( "." ); }
+  private static void f() { numTests++; System.out.println( "!!!FAILED!!!" ); }
 
   private static void verify( Map<MultiKey, Integer> expected, 
                               Map<MultiKey, Integer> actual ) {
@@ -43,12 +45,14 @@ public class MultiViewMapTest {
 
     joinOp = new JoinOpInteger();
     
+    System.out.println("");
     testBuilder();
     System.out.println("");
     testMap();
     System.out.println("");
     stressTest();
     System.out.println("");
+    System.out.println(numPassed+"/"+numTests+" passed.");
   }
 
 
@@ -208,7 +212,7 @@ public class MultiViewMapTest {
     expected = new HashMap<MultiKey, Integer>();
     verify( expected, mapA.get( view0, partialKey4 ) );
 
-    
+
     // Try across a merge
     mapA.put( vader, 1001 );
     expected = new HashMap<MultiKey, Integer>();
@@ -239,6 +243,14 @@ public class MultiViewMapTest {
     expected.put( r2,    1004 );
     verify( expected, mapA.get( view0, partialKey4 ) );
 
+
+    // Get for full keys didn't work in production,
+    // so test it explicitly
+    expected = new HashMap<MultiKey, Integer>();
+    expected.put( luke, 1002 );
+    verify( expected, mapA.get( view012, luke ) );
+
+
     // removes vader and han
     MultiKey partialKey4true = MultiKey.factory( 4, true );
     mapA.remove( view01, partialKey4true );
@@ -301,16 +313,16 @@ public class MultiViewMapTest {
     }
 
 
-    System.out.println( "    Number of full keys in each table per op cycle:" );
+    //System.out.println( "    Number of full keys in each table per op cycle:" );
     
     for( int reps = 0; reps < 100; ++reps ) {
       int nextOp = random.nextInt( 100 );
 
-      System.out.print( "    Op: " );
+      //System.out.print( "    Op: " );
 
       if( nextOp < 15 ) {
         // put some new values in
-        System.out.print( "PT  " );
+        //System.out.print( "PT  " );
         int numNewValues = 1 + random.nextInt( 8 );
         for( int i = 0; i < numNewValues; ++i ) {
           MultiKey newKey = MultiKey.factory( getInt( ints ),
@@ -321,7 +333,7 @@ public class MultiViewMapTest {
 
       } else if( nextOp < 70 ) {
         // remove values by a random view
-        System.out.print( "RM  " );
+        //System.out.print( "RM  " );
         MultiViewMap<Integer> map = getMap( maps );
 
         switch( random.nextInt( 6 ) ) {
@@ -335,16 +347,16 @@ public class MultiViewMapTest {
 
       } else {
         // merge two tables
-        System.out.print( "MG  " );
+        //System.out.print( "MG  " );
         getMap( maps ).merge( getMap( maps ) );
       }   
 
       for( int i = 0; i < maps.length - 1; ++i ) {
         if( i < maps.length - 1 ) {
-          System.out.print( maps[i].size() + ", " );
+          //System.out.print( maps[i].size() + ", " );
         }
       }
-      System.out.println( maps[maps.length-1].size() );
+      //System.out.println( maps[maps.length-1].size() );
     }
 
     System.out.println( "DONE" );