Merge pull request apache#9 from josh-mckenzie/8099/fix_broken_validate

pcmanus · pcmanus · commit c33a85fe879d · 2015-04-09T14:15:20.000+02:00
fix indexCFMD creation w/out idxType specified
diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java
@@ -457,7 +457,8 @@ public static CFMetaData indexCFMD(String ksName, String cfName, boolean withIdx
                 .build();
 
         ByteBuffer cName = ByteBufferUtil.bytes("birthdate");
-        cfm.getColumnDefinition(cName).setIndex(withIdxType ? ByteBufferUtil.bytesToHex(cName) : null, IndexType.COMPOSITES, Collections.EMPTY_MAP);
+        IndexType keys = withIdxType ? IndexType.COMPOSITES : null;
+        cfm.getColumnDefinition(cName).setIndex(withIdxType ? ByteBufferUtil.bytesToHex(cName) : null, keys, Collections.EMPTY_MAP);
 
         return cfm;
     }

Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,8 @@ public static CFMetaData indexCFMD(String ksName, String cfName, boolean withIdx`
`457`	`457`	`.build();`
`458`	`458`
`459`	`459`	`ByteBuffer cName = ByteBufferUtil.bytes("birthdate");`
`460`		`- cfm.getColumnDefinition(cName).setIndex(withIdxType ? ByteBufferUtil.bytesToHex(cName) : null, IndexType.COMPOSITES, Collections.EMPTY_MAP);`
	`460`	`+ IndexType keys = withIdxType ? IndexType.COMPOSITES : null;`
	`461`	`+ cfm.getColumnDefinition(cName).setIndex(withIdxType ? ByteBufferUtil.bytesToHex(cName) : null, keys, Collections.EMPTY_MAP);`
`461`	`462`
`462`	`463`	`return cfm;`
`463`	`464`	`}`