Merge pull request #652 from chaordic/local_one

Add support to LOCAL_ONE consistency level
hector-client · Jan 31, 2014 · 1317826 · 1317826
2 parents b7a7041 + 504b60f
commit 1317826
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -16,6 +16,8 @@ Fix for issue 600: critical bug in CQL version selection (@malexejev)
 Modify retryDownedHosts() to only delete hosts not in the ring if autoDiscoverHosts is true (@jancona)
 Fix all hosts down check (@jancona)
 don't use an iterator just to get item 0 of a List (@mebigfatguy)
+Upgrade Cassandra dependencies to 1.2.11 (@pauloricardomg)
+Add support to LOCAL_ONE consistency level (@pauloricardomg)
 
 1.1-4
 =====

diff --git a/core/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftConverter.java b/core/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftConverter.java
@@ -33,11 +33,13 @@ public static ConsistencyLevel consistencyLevel(HConsistencyLevel c) {
       return ConsistencyLevel.EACH_QUORUM;
     case LOCAL_QUORUM:
       return ConsistencyLevel.LOCAL_QUORUM;
+    case LOCAL_ONE:
+        return ConsistencyLevel.LOCAL_ONE;
     default:
       throw new RuntimeException("Unregornized consistency level " + c);
     }
   }
-  
+
   /**
    * Converts a list of ColumnOrSuperColumn to Column
    * @param columns
@@ -50,5 +52,5 @@ public static List<Column> getColumnList(List<ColumnOrSuperColumn> columns) {
     }
     return list;
   }
-  
+
 }
diff --git a/core/src/main/java/me/prettyprint/hector/api/HConsistencyLevel.java b/core/src/main/java/me/prettyprint/hector/api/HConsistencyLevel.java
@@ -7,5 +7,5 @@
  * @author zznate
  */
 public enum HConsistencyLevel {
-    ONE, TWO, THREE, QUORUM, ALL, ANY, EACH_QUORUM, LOCAL_QUORUM;
+    ONE, TWO, THREE, QUORUM, ALL, ANY, EACH_QUORUM, LOCAL_QUORUM, LOCAL_ONE;
 }
diff --git a/pom.xml b/pom.xml
@@ -389,7 +389,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- Dependency versioning-->
-    <cassandra.version>1.2.5</cassandra.version>
+    <cassandra.version>1.2.11</cassandra.version>
     <org.springframework.version>3.0.6.RELEASE</org.springframework.version>
     <slf4j.version>1.6.1</slf4j.version>
     <!-- Maven plugin versioning -->