Updated parameters

jdebrabant · Mar 20, 2014 · fe923be · fe923be
1 parent fe657ad
commit fe923be
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/experiment.sh b/experiment.sh
@@ -83,8 +83,6 @@ echo "---------------------------------------------------------"
 for PARAM; do
     echo $PARAM
 done 
-=======
->>>>>>> 57bdfa5eccbda3311d90d6003702fa65528ec377:ycsb.sh
 
 # ---------------------------------------------------------------------
 

diff --git a/tests/frontend/org/voltdb/regressionsuites/TestTPCCLogicalRecovery.java b/tests/frontend/org/voltdb/regressionsuites/TestTPCCLogicalRecovery.java
@@ -426,24 +426,23 @@ static public Test suite() {
         setUpSnapshotDir();
 
         // CONFIG #1: 2 Local Site with 4 Partitions running on JNI backend        
+        /*
         NUM_SITES = 2;
         NUM_PARTITIONS = 2;
         m_config = new LocalCluster(projectJAR, NUM_SITES, NUM_PARTITIONS, 1, BackendTarget.NATIVE_EE_JNI);
         success = m_config.compile(project);
         assert (success);
         builder.addServerConfig(m_config);
-
+        */
 
 
         // CONFIG #2: 1 Local Site with 1 Partitions running on JNI backend    
-        /*
         NUM_SITES = 1;
         NUM_PARTITIONS = 1;
         m_config = new LocalSingleProcessServer(projectJAR, NUM_PARTITIONS, BackendTarget.NATIVE_EE_JNI);
         success = m_config.compile(project);
         assert (success);
         builder.addServerConfig(m_config);     
-        */
 
         return builder;
     }

diff --git a/tests/frontend/org/voltdb/regressionsuites/TestTPCCPhysicalRecovery.java b/tests/frontend/org/voltdb/regressionsuites/TestTPCCPhysicalRecovery.java
@@ -53,7 +53,7 @@ public class TestTPCCPhysicalRecovery extends RegressionSuite {
 
     // TPCC
     private static final String PREFIX = "tpcc";
-    private static int NUM_TRANSACTIONS = 20000;
+    private static int NUM_TRANSACTIONS = 1000;
     private static final String projectJAR = "physical_" + PREFIX + ".jar";    
 
     public TestTPCCPhysicalRecovery(String name) {
@@ -149,15 +149,15 @@ public void testTPCC() throws IOException, InterruptedException, ProcCallExcepti
 
         MOCK_ARGS[MOCK_ARGS.length - 1] = HStoreConstants.BENCHMARK_PARAM_PREFIX;
 
-        TPCCClient yscbClient = new TPCCClient(MOCK_ARGS);
+        TPCCClient tpccClient = new TPCCClient(MOCK_ARGS);
 
         // Run transactions
         long k_itr = 0;
         long numTransactions = NUM_TRANSACTIONS;
         long period = numTransactions / 10;
 
         for (k_itr = 0; k_itr < numTransactions; k_itr++) {
-            boolean response = yscbClient.runOnce();
+            boolean response = tpccClient.runOnce();
             assertEquals(response, true);
 
             if (k_itr % period == 0)
@@ -222,7 +222,7 @@ static public Test suite() {
 
         // CONFIG #2: 1 Local Site with 2 Partitions running on JNI backend          
         NUM_SITES = 1;
-        NUM_PARTITIONS = 2;
+        NUM_PARTITIONS = 1;
         m_config = new LocalSingleProcessServer(projectJAR, NUM_PARTITIONS, BackendTarget.NATIVE_EE_JNI);
         success = m_config.compile(project);
         assert (success);