use composite key format for solr core resources; This is a breaking …

…change, must reindex or at least re insert solr core info if you are upgrading
navjeetc · Nov 14, 2011 · 7b18f06 · 7b18f06
1 parent d140f78
commit 7b18f06
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/org/apache/solr/core/SolandraCoreContainer.java b/src/org/apache/solr/core/SolandraCoreContainer.java
@@ -241,6 +241,10 @@ public static ByteBuffer readCoreResource(String coreName, String resourceName)
 		}
 
 		ByteBuffer resourceValue = null;
+
+		ByteBuffer coreKey = CassandraUtils.hashKeyBytes(coreName.getBytes("UTF-8"),
+                CassandraUtils.delimeterBytes, "resources".getBytes("UTF-8"));
+
 
 		ByteBuffer coreNameBytes = ByteBufferUtil.bytes(coreName);
 		ByteBuffer resourceNameBytes = ByteBufferUtil.bytes(resourceName);
@@ -250,7 +254,7 @@ public static ByteBuffer readCoreResource(String coreName, String resourceName)
 				coreNameBytes);
 
 		List<Row> rows = CassandraUtils.robustRead(
-				coreNameBytes,
+				coreKey,
 				queryPath,
 				Arrays.asList(resourceNameBytes),
 				ConsistencyLevel.QUORUM);
@@ -294,11 +298,15 @@ public static void writeCoreResource(String coreName, String resourceName, Strin
 			logger.debug(resourceValue);
 		}
 
-		ByteBuffer coreNameBytes = ByteBufferUtil.bytes(coreName);
-		ByteBuffer resourceNameBytes = ByteBufferUtil.bytes(resourceName);
 
-		RowMutation rm = new RowMutation(CassandraUtils.keySpace, coreNameBytes);
+		ByteBuffer coreKey = CassandraUtils.hashKeyBytes(coreName.getBytes("UTF-8"),
+                 CassandraUtils.delimeterBytes, "resources".getBytes("UTF-8"));
+
+		RowMutation rm = new RowMutation(CassandraUtils.keySpace, coreKey);
 
+		ByteBuffer coreNameBytes = ByteBufferUtil.bytes(coreName);
+        ByteBuffer resourceNameBytes = ByteBufferUtil.bytes(resourceName);
+
 		QueryPath queryPath = new QueryPath(
 				CassandraUtils.schemaInfoColumnFamily,
 				coreNameBytes,