svn commit: r1238811 - /incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java

[ec...@apache.org]

Author: ecn
Date: Tue Jan 31 20:57:23 2012
New Revision: 1238811

URL: http://svn.apache.org/viewvc?rev=1238811&view=rev
Log:
ACCUMULO-357, ACCUMULO-354, ACCUMULO-356, fix merge errors

Modified:
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java?rev=1238811&r1=1238810&r2=1238811&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java Tue Jan 31 20:57:23 2012
@@ -23,11 +23,10 @@ import java.util.Map;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.accumulo.server.test.CreateMapFiles;
+import org.apache.accumulo.server.test.CreateRFiles;
 import org.apache.accumulo.server.test.VerifyIngest;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.log4j.Logger;
 
 /**
  * This test verifies that when a lot of files are bulk imported into a table with one tablet and then splits that not all map files go to the children tablets.
@@ -64,12 +63,12 @@ public class BulkSplitOptimizationTest e
     FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
     fs.delete(new Path("/tmp/testmf"), true);
     
-    CreateMapFiles.main(new String[] {"tmp/testmf", "8", "0", "100000", "99"});
+    CreateRFiles.main(new String[] {"tmp/testmf", "8", "0", "100000", "99"});
     
     bulkImport(fs, TABLE_NAME, "/tmp/testmf");
     
     checkSplits(TABLE_NAME, 0, 0);
-    checkMapFiles(TABLE_NAME, 1, 1, 100, 100);
+    checkRFiles(TABLE_NAME, 1, 1, 100, 100);
     
     // initiate splits
     getConnector().tableOperations().setProperty(TABLE_NAME, Property.TABLE_SPLIT_THRESHOLD.getKey(), "100K");
@@ -86,6 +85,6 @@ public class BulkSplitOptimizationTest e
     VerifyIngest.main(new String[] {"-timestamp", "1", "-size", "50", "-random", "56", "100000", "0", "1"});
     
     // ensure each tablet does not have all map files
-    checkMapFiles(TABLE_NAME, 50, 100, 1, 4);
+    checkRFiles(TABLE_NAME, 50, 100, 1, 4);
   }
 }