Made plugin check more consistent

mbutrovich · Dec 12, 2012 · c18fdf4 · c18fdf4
1 parent 6d681e7
commit c18fdf4
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/src/com/oltpbenchmark/DBWorkload.java b/src/com/oltpbenchmark/DBWorkload.java
@@ -162,8 +162,12 @@ public static void main(String[] args) throws Exception {
         	// ----------------------------------------------------------------
 
         	String pluginTest = "";
-        	if (pluginList.length > 1) {
-        		pluginTest = "[@bench='" + plugin + "']";
+
+        	if (pluginList.length == 1) {
+        	    pluginTest = "[@bench='" + plugin + "' or not(@bench)]";
+//        	    pluginTest = "[not(@bench)]"; 
+        	} else {
+        	    pluginTest = "[@bench='" + plugin + "']";
         	}
 
 	        WorkloadConfiguration wrkld = new WorkloadConfiguration();
@@ -195,17 +199,14 @@ public static void main(String[] args) throws Exception {
 	                LOG.fatal("You cannot use less than 1 TPS in a Phase of your expeirment. Use <disabled> option.");
 	                System.exit(-1);
 	            }
-	            if (pluginTest.length() > 1)
+	            // use a workaround if there multiple workloads or single
+	            // attributed workload
+	            if (pluginList.length > 1 || work.containsKey("weights[@bench]")) {
 					weight_strings = get_weights(plugin, work);
-				else {
-	            	weight_strings = work.getList("weights[not(@bench)]");
-	            }
-	            int rate;
-	            if (work.containsKey("/rate" + pluginTest)) {
-	            	rate = work.getInt("/rate" + pluginTest);
 	            } else {
-	            	rate = work.getInt("/rate");
+	            	weight_strings = work.getList("weights" + pluginTest);
 	            }
+	            int rate = work.getInt("/rate");
 	            boolean rateLimited;
 	            rateLimited = work.getBoolean("rateLimited[not(@bench)]", true);
 	            rateLimited = work.getBoolean("ratelimited" + pluginTest, rateLimited);