Adding @deprecated for proxy put param + cosmetic debug msg fixes

sathya33 · Apr 22, 2013 · 736ccc8 · 736ccc8
1 parent 881d7b3
commit 736ccc8
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/src/java/voldemort/server/VoldemortConfig.java b/src/java/voldemort/server/VoldemortConfig.java
@@ -223,6 +223,8 @@ public class VoldemortConfig implements Serializable {
     private int maxParallelStoresRebalancing;
     private boolean rebalancingOptimization;
     private boolean usePartitionScanForRebalance;
+    @Deprecated
+    // Should be removed once the proxy put implementation is stable.
     private boolean proxyPutsDuringRebalance;
 
     public VoldemortConfig(Properties props) {

diff --git a/src/java/voldemort/store/bdb/dataconversion/BdbConvertBaseToNewDup.java b/src/java/voldemort/store/bdb/dataconversion/BdbConvertBaseToNewDup.java
@@ -38,7 +38,7 @@ public void transfer() throws Exception {
         while(cursor.getNext(keyEntry, valueEntry, LockMode.READ_UNCOMMITTED) == OperationStatus.SUCCESS) {
             scanCount++;
             if(scanCount % 1000000 == 0)
-                logger.info("Converted " + scanCount + "entries in "
+                logger.info("Converted " + scanCount + " entries in "
                             + (System.currentTimeMillis() - startTime) / 1000 + " secs");
 
             // read the value as a versioned Object
@@ -80,7 +80,7 @@ public void transfer() throws Exception {
             }
             keyCount++;
         }
-        logger.info("Completed " + scanCount + "entries and " + keyCount + " keys in "
+        logger.info("Completed " + scanCount + " entries and " + keyCount + " keys in "
                     + (System.currentTimeMillis() - startTime) / 1000 + " secs");
     }
 

diff --git a/src/java/voldemort/store/bdb/dataconversion/BdbConvertBaseToPidScan.java b/src/java/voldemort/store/bdb/dataconversion/BdbConvertBaseToPidScan.java
@@ -42,7 +42,7 @@ public void transfer() throws Exception {
         while(cursor.getNext(keyEntry, valueEntry, LockMode.READ_UNCOMMITTED) == OperationStatus.SUCCESS) {
             scanCount++;
             if(scanCount % 1000000 == 0)
-                logger.info("Converted " + scanCount + "entries in "
+                logger.info("Converted " + scanCount + " entries in "
                             + (System.currentTimeMillis() - startTime) / 1000 + " secs");
 
             // read the value as a versioned Object
@@ -90,7 +90,7 @@ public void transfer() throws Exception {
             }
             keyCount++;
         }
-        logger.info("Completed " + scanCount + "entries and " + keyCount + " keys in "
+        logger.info("Completed " + scanCount + " entries and " + keyCount + " keys in "
                     + (System.currentTimeMillis() - startTime) / 1000 + " secs");
     }
 

diff --git a/src/java/voldemort/store/bdb/dataconversion/BdbConvertNewDupToPidScan.java b/src/java/voldemort/store/bdb/dataconversion/BdbConvertNewDupToPidScan.java
@@ -55,10 +55,10 @@ public void transfer() throws Exception {
             }
 
             if(scanCount % 1000000 == 0)
-                logger.info("Reverted " + scanCount + "entries in "
+                logger.info("Reverted " + scanCount + " entries in "
                             + (System.currentTimeMillis() - startTime) / 1000 + " secs");
         }
-        logger.info("Converted " + scanCount + "entries and " + keyCount + " keys in "
+        logger.info("Converted " + scanCount + " entries and " + keyCount + " keys in "
                     + (System.currentTimeMillis() - startTime) / 1000 + " secs");
     }
 

diff --git a/src/java/voldemort/store/bdb/dataconversion/BdbRevertNewDupToBase.java b/src/java/voldemort/store/bdb/dataconversion/BdbRevertNewDupToBase.java
@@ -52,10 +52,10 @@ public void transfer() throws Exception {
                 scanCount++;
             }
             if(scanCount % 1000000 == 0)
-                logger.info("Reverted " + scanCount + "entries in "
+                logger.info("Reverted " + scanCount + " entries in "
                             + (System.currentTimeMillis() - startTime) / 1000 + " secs");
         }
-        logger.info("Reverted " + scanCount + "entries and " + keyCount + " keys in "
+        logger.info("Reverted " + scanCount + " entries and " + keyCount + " keys in "
                     + (System.currentTimeMillis() - startTime) / 1000 + " secs");
     }
 

diff --git a/src/java/voldemort/store/bdb/dataconversion/BdbRevertPidScanToBase.java b/src/java/voldemort/store/bdb/dataconversion/BdbRevertPidScanToBase.java
@@ -54,10 +54,10 @@ public void transfer() throws Exception {
                 scanCount++;
             }
             if(scanCount % 1000000 == 0)
-                logger.info("Reverted " + scanCount + "entries in "
+                logger.info("Reverted " + scanCount + " entries in "
                             + (System.currentTimeMillis() - startTime) / 1000 + " secs");
         }
-        logger.info("Reverted " + scanCount + "entries and " + keyCount + " keys in "
+        logger.info("Reverted " + scanCount + " entries and " + keyCount + " keys in "
                     + (System.currentTimeMillis() - startTime) / 1000 + " secs");
     }
 

diff --git a/src/java/voldemort/store/bdb/dataconversion/BdbRevertPidScanToNewDup.java b/src/java/voldemort/store/bdb/dataconversion/BdbRevertPidScanToNewDup.java
@@ -47,10 +47,10 @@ public void transfer() throws Exception {
             }
 
             if(scanCount % 1000000 == 0)
-                logger.info("Reverted " + scanCount + "entries in "
+                logger.info("Reverted " + scanCount + " entries in "
                             + (System.currentTimeMillis() - startTime) / 1000 + " secs");
         }
-        logger.info("Reverted " + scanCount + "entries and " + keyCount + " keys in "
+        logger.info("Reverted " + scanCount + " entries and " + keyCount + " keys in "
                     + (System.currentTimeMillis() - startTime) / 1000 + " secs");
     }