From e8ba249d5ce2ec293a4d19b54fc8298d4eac0271 Mon Sep 17 00:00:00 2001
From: Chandan Rajah <chandan.rajah@gmail.com>
Date: Wed, 26 Jun 2013 17:13:42 +0100
Subject: Fixed minor bugs with HBase prefix salter

---
 .gitignore                                               |  5 ++++-
 pom.xml                                                  |  2 +-
 src/main/java/parallelai/spyglass/hbase/HBaseSalter.java | 13 +++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 575cea1..f24f691 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,7 @@ project/boot/
 project/plugins/project/
 
 # Scala-IDE specific
-.scala_dependencies
\ No newline at end of file
+.scala_dependencies
+
+*.idea
+
diff --git a/pom.xml b/pom.xml
index 236b9ed..5018734 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<name>Cascading and Scalding wrapper for HBase with advanced features</name>
 	<groupId>parallelai</groupId>
 	<artifactId>parallelai.spyglass</artifactId>
-	<version>2.0.4</version>
+	<version>2.1.1</version>
 	<packaging>jar</packaging>
 
 	<properties>
diff --git a/src/main/java/parallelai/spyglass/hbase/HBaseSalter.java b/src/main/java/parallelai/spyglass/hbase/HBaseSalter.java
index fc656a4..e3f5dc9 100644
--- a/src/main/java/parallelai/spyglass/hbase/HBaseSalter.java
+++ b/src/main/java/parallelai/spyglass/hbase/HBaseSalter.java
@@ -149,16 +149,21 @@ public class HBaseSalter {
 
   public static byte[][] getAllKeysWithStop(byte[] originalKey, String prefixList, byte stopKey) throws IOException {
 	  char[] prefixArray = prefixList.toCharArray();
-	  
-	  return getAllKeysWithStartStop(originalKey, prefixList, (byte)prefixArray[0], (byte)(stopKey - 1));
+
+      return getAllKeysWithStartStop(originalKey, prefixList, (byte)prefixArray[0], stopKey);
+//	  return getAllKeysWithStartStop(originalKey, prefixList, (byte)prefixArray[0], (byte)(stopKey - 1));
   }
 
   public static byte[][] getAllKeysInRange(byte[] originalKey, String prefixList, byte startPrefix, byte stopPrefix) {
-	  return getAllKeysWithStartStop(originalKey, prefixList, startPrefix, (byte)(stopPrefix - 1));
+      return getAllKeysWithStartStop(originalKey, prefixList, startPrefix, stopPrefix);
+//	  return getAllKeysWithStartStop(originalKey, prefixList, startPrefix, (byte)(stopPrefix - 1));
   }
   
   private static byte[][] getAllKeysWithStartStop(byte[] originalKey, String prefixList, byte startPrefix, byte stopPrefix) {
-	  char[] prefixArray = prefixList.toCharArray();
+      LOG.info("".format("getAllKeysWithStartStop: OKEY (%s) PLIST (%s) PSRT (%s) PSTP (%s)",
+              Bytes.toString(originalKey), prefixList, startPrefix, stopPrefix));
+
+      char[] prefixArray = prefixList.toCharArray();
 	  TreeSet<Byte> prefixSet = new TreeSet<Byte>();
 	  
 	  for( char c : prefixArray ) {
-- 
cgit v1.2.3