Minor refactoring + debug stuff. I just got tired of seeing these fil…

…es listed in my git status output...
cw75 · May 27, 2013 · 6769227 · 6769227
1 parent d7f47fc
commit 6769227
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/benchmarks/org/voltdb/benchmark/tpcc/procedures/neworder.java b/src/benchmarks/org/voltdb/benchmark/tpcc/procedures/neworder.java
@@ -108,7 +108,14 @@ public class neworder extends VoltProcedure {
         " FROM STOCK WHERE S_I_ID = ? AND S_W_ID = ?;"
     ); //ol_i_id, ol_supply_w_id
 
-    public final SQLStmt updateStock = new SQLStmt("UPDATE STOCK SET S_QUANTITY = ?, S_YTD = ?, S_ORDER_CNT = ?, S_REMOTE_CNT = ? WHERE S_I_ID = ? AND S_W_ID = ?;"); //s_quantity, s_order_cnt, s_remote_cnt, ol_i_id, ol_supply_w_id
+    public final SQLStmt updateStock = new SQLStmt(
+        "UPDATE STOCK " +
+        "   SET S_QUANTITY = ?, " +
+        "       S_YTD = ?, " +
+        "       S_ORDER_CNT = ?, " +
+        "       S_REMOTE_CNT = ? " +
+        " WHERE S_I_ID = ? AND S_W_ID = ?;"
+    ); //s_quantity, s_order_cnt, s_remote_cnt, ol_i_id, ol_supply_w_id
 
     public final SQLStmt createOrderLine = new SQLStmt("INSERT INTO ORDER_LINE (OL_O_ID, OL_D_ID, OL_W_ID, OL_NUMBER, OL_I_ID, OL_SUPPLY_W_ID, OL_DELIVERY_D, OL_QUANTITY, OL_AMOUNT, OL_DIST_INFO) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"); //o_id, d_id, w_id, ol_number, ol_i_id, ol_supply_w_id, ol_quantity, ol_amount, ol_dist_info
 

diff --git a/src/frontend/edu/brown/hstore/PartitionExecutor.java b/src/frontend/edu/brown/hstore/PartitionExecutor.java
@@ -830,11 +830,10 @@ else if (hstore_conf.site.specexec_unsafe) {
             // this.specExecScheduler.setIgnoreSpeculationTypeChange(true);
         }
 
-        if (hstore_conf.site.specexec_enable) {
-            LOG.info(String.format("Initialized %s for partition %d [checker=%s, policy=%s]",
-                     this.specExecScheduler.getClass().getSimpleName(), this.partitionId,
-                     this.specExecChecker.getClass().getSimpleName(), policy));
-        }
+        if (debug.val && hstore_conf.site.specexec_enable)
+            LOG.debug(String.format("Initialized %s for partition %d [checker=%s, policy=%s]",
+                      this.specExecScheduler.getClass().getSimpleName(), this.partitionId,
+                      this.specExecChecker.getClass().getSimpleName(), policy));
     }
 
     private ExecutionState initExecutionState() {