Add CL.LOCAL_ONE and update depency to C* 1.2.12

Sylvain Lebresne · Sylvain Lebresne · commit 0483bb842532 · 2013-12-10T17:12:07.000+01:00
JAVA-207 #fixes
diff --git a/driver-core/CHANGELOG.rst b/driver-core/CHANGELOG.rst
@@ -5,6 +5,8 @@ CHANGELOG
 ------
 
 - [new] OSGi bundle (JAVA-142)
+- [new] Add support for ConsistencyLevel.LOCAL_ONE; note that this
+  require Cassandra 1.2.12+ (JAVA-207)
 - [improvement] Make collections returned by Row immutable (JAVA-205)
 - [improvement] Limit internal thread pool size (JAVA-203)
 - [improvement] New getter to obtain a snapshot of the scores maintained by
diff --git a/driver-core/src/main/java/com/datastax/driver/core/ConsistencyLevel.java b/driver-core/src/main/java/com/datastax/driver/core/ConsistencyLevel.java
@@ -24,7 +24,8 @@ public enum ConsistencyLevel
     QUORUM,
     ALL,
     LOCAL_QUORUM,
-    EACH_QUORUM;
+    EACH_QUORUM,
+    LOCAL_ONE;
 
     static org.apache.cassandra.db.ConsistencyLevel DEFAULT_CASSANDRA_CL = org.apache.cassandra.db.ConsistencyLevel.ONE;
 
@@ -38,6 +39,7 @@ static ConsistencyLevel from(org.apache.cassandra.db.ConsistencyLevel cl) {
             case ALL: return ALL;
             case LOCAL_QUORUM: return LOCAL_QUORUM;
             case EACH_QUORUM: return EACH_QUORUM;
+            case LOCAL_ONE: return LOCAL_ONE;
         }
         throw new AssertionError();
     }
@@ -55,6 +57,7 @@ static org.apache.cassandra.db.ConsistencyLevel toCassandraCL(ConsistencyLevel c
             case ALL: return org.apache.cassandra.db.ConsistencyLevel.ALL;
             case LOCAL_QUORUM: return org.apache.cassandra.db.ConsistencyLevel.LOCAL_QUORUM;
             case EACH_QUORUM: return org.apache.cassandra.db.ConsistencyLevel.EACH_QUORUM;
+            case LOCAL_ONE: return org.apache.cassandra.db.ConsistencyLevel.LOCAL_ONE;
         }
         throw new AssertionError();
     }
diff --git a/pom.xml b/pom.xml
@@ -34,8 +34,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cassandra.version>1.2.11</cassandra.version>
-    <cassandra-dependency.version>1.2.11</cassandra-dependency.version>
+    <cassandra.version>1.2.12</cassandra.version>
+    <cassandra-dependency.version>1.2.12</cassandra-dependency.version>
   </properties>
 
   <dependencies>

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ public enum ConsistencyLevel`
`24`	`24`	`QUORUM,`
`25`	`25`	`ALL,`
`26`	`26`	`LOCAL_QUORUM,`
`27`		`- EACH_QUORUM;`
	`27`	`+ EACH_QUORUM,`
	`28`	`+ LOCAL_ONE;`
`28`	`29`
`29`	`30`	`static org.apache.cassandra.db.ConsistencyLevel DEFAULT_CASSANDRA_CL = org.apache.cassandra.db.ConsistencyLevel.ONE;`
`30`	`31`
`@@ -38,6 +39,7 @@ static ConsistencyLevel from(org.apache.cassandra.db.ConsistencyLevel cl) {`
`38`	`39`	`case ALL: return ALL;`
`39`	`40`	`case LOCAL_QUORUM: return LOCAL_QUORUM;`
`40`	`41`	`case EACH_QUORUM: return EACH_QUORUM;`
	`42`	`+ case LOCAL_ONE: return LOCAL_ONE;`
`41`	`43`	`}`
`42`	`44`	`throw new AssertionError();`
`43`	`45`	`}`
`@@ -55,6 +57,7 @@ static org.apache.cassandra.db.ConsistencyLevel toCassandraCL(ConsistencyLevel c`
`55`	`57`	`case ALL: return org.apache.cassandra.db.ConsistencyLevel.ALL;`
`56`	`58`	`case LOCAL_QUORUM: return org.apache.cassandra.db.ConsistencyLevel.LOCAL_QUORUM;`
`57`	`59`	`case EACH_QUORUM: return org.apache.cassandra.db.ConsistencyLevel.EACH_QUORUM;`
	`60`	`+ case LOCAL_ONE: return org.apache.cassandra.db.ConsistencyLevel.LOCAL_ONE;`
`58`	`61`	`}`
`59`	`62`	`throw new AssertionError();`
`60`	`63`	`}`