From 736ccc8087335c2c40abf2b02db46f248af79c6e Mon Sep 17 00:00:00 2001 From: Vinoth Chandar Date: Mon, 22 Apr 2013 15:25:46 -0700 Subject: [PATCH] Adding @deprecated for proxy put param + cosmetic debug msg fixes --- src/java/voldemort/server/VoldemortConfig.java | 2 ++ .../store/bdb/dataconversion/BdbConvertBaseToNewDup.java | 4 ++-- .../store/bdb/dataconversion/BdbConvertBaseToPidScan.java | 4 ++-- .../store/bdb/dataconversion/BdbConvertNewDupToPidScan.java | 4 ++-- .../store/bdb/dataconversion/BdbRevertNewDupToBase.java | 4 ++-- .../store/bdb/dataconversion/BdbRevertPidScanToBase.java | 4 ++-- .../store/bdb/dataconversion/BdbRevertPidScanToNewDup.java | 4 ++-- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/java/voldemort/server/VoldemortConfig.java b/src/java/voldemort/server/VoldemortConfig.java index 9e4c8ba277..8ca5134aad 100644 --- 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 index cc38f72021..2c178bbcd0 100644 --- 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 index 3ec76da48b..8a50b122ca 100644 --- 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 index cfb21077af..954b523976 100644 --- 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 index c755476ecc..5f323ec62c 100644 --- 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 index c391899112..f026a3c350 100644 --- 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 index 624abee439..ede0e168bf 100644 --- 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"); }