Fix too agressive refactor

Sylvain Lebresne · Sylvain Lebresne · commit 26dd9c64f0a2 · 2013-10-28T12:22:40.000+01:00
diff --git a/driver-core/src/main/java/com/datastax/driver/core/ColumnMetadata.java b/driver-core/src/main/java/com/datastax/driver/core/ColumnMetadata.java
@@ -183,7 +183,7 @@ public String toString() {
     // Temporary class that is used to make building the schema easier. Not meant to be
     // exposed publicly at all.
     static class Raw {
-        public enum Kind { PARTITION_KEY, CLUSTERING_COLUMN, REGULAR, COMPACT_VALUE }
+        public enum Kind { PARTITION_KEY, CLUSTERING_KEY, REGULAR, COMPACT_VALUE }
 
         public final String name;
         public final Kind kind;
diff --git a/driver-core/src/main/java/com/datastax/driver/core/TableMetadata.java b/driver-core/src/main/java/com/datastax/driver/core/TableMetadata.java
@@ -116,7 +116,7 @@ static TableMetadata build(KeyspaceMetadata ksm, Row row, Map<String, ColumnMeta
                 case PARTITION_KEY:
                     partitionKey.set(rawCol.componentIndex, col);
                     break;
-                case CLUSTERING_COLUMN:
+                case CLUSTERING_KEY:
                     clusteringColumns.set(rawCol.componentIndex, col);
                     clusteringOrder.set(rawCol.componentIndex, rawCol.isReversed ? Order.DESC : Order.ASC);
                     break;
@@ -137,7 +137,7 @@ static TableMetadata build(KeyspaceMetadata ksm, Row row, Map<String, ColumnMeta
     private static int findClusteringSize(Collection<ColumnMetadata.Raw> cols) {
         int maxId = -1;
         for (ColumnMetadata.Raw col : cols)
-            if (col.kind == ColumnMetadata.Raw.Kind.CLUSTERING_COLUMN)
+            if (col.kind == ColumnMetadata.Raw.Kind.CLUSTERING_KEY)
                 maxId = Math.max(maxId, col.componentIndex);
         return maxId + 1;
     }
diff --git a/driver-core/src/test/java/com/datastax/driver/core/LoadBalancingPolicyTest.java b/driver-core/src/test/java/com/datastax/driver/core/LoadBalancingPolicyTest.java
@@ -337,7 +337,7 @@ public void tokenAwareWithRF2Test() throws Throwable {
             init(c, 12);
             query(c, 12);
 
-            // Not the best test ever, we should use OPP and check we do it the
+            // Not the best test ever, we should use OPP and check we do hit the
             // right nodes. But since M3P is hard-coded for now, let just check
             // we just hit only one node.
             assertQueried(CCMBridge.IP_PREFIX + "1", 0);
@@ -362,11 +362,9 @@ public void tokenAwareWithRF2Test() throws Throwable {
             query(c, 12);
 
             // Still only one node since RF=2
-            // TODO: this is broken because token awareness does not yet take the replication factor into
-            // account (JAVA-88). Once fixed, we should re-enable this
-            //assertQueried(CCMBridge.IP_PREFIX + "1", 12);
-            //assertQueried(CCMBridge.IP_PREFIX + "2", 0);
-            //assertQueried(CCMBridge.IP_PREFIX + "3", 0);
+            assertQueried(CCMBridge.IP_PREFIX + "1", 12);
+            assertQueried(CCMBridge.IP_PREFIX + "2", 0);
+            assertQueried(CCMBridge.IP_PREFIX + "3", 0);
 
         } catch (Throwable e) {
             c.errorOut();
