Author: [email protected]
Date: Tue Mar 13 08:39:31 2012
New Revision: 2138
Log:
[AMDATUCASSANDRA-177] Fixed use of SubColumnQuery instead of SuperColumnQuery
Modified:
branches/amdatu-cassandra-0.2.3/cassandra-persistencemanager-hector/src/main/java/org/amdatu/cassandra/persistencemanager/hector/service/HectorCassandraPersistenceManagerImpl.java
branches/amdatu-cassandra-0.2.3/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/PersistenceManagerTest.java
Modified:
branches/amdatu-cassandra-0.2.3/cassandra-persistencemanager-hector/src/main/java/org/amdatu/cassandra/persistencemanager/hector/service/HectorCassandraPersistenceManagerImpl.java
==============================================================================
---
branches/amdatu-cassandra-0.2.3/cassandra-persistencemanager-hector/src/main/java/org/amdatu/cassandra/persistencemanager/hector/service/HectorCassandraPersistenceManagerImpl.java
(original)
+++
branches/amdatu-cassandra-0.2.3/cassandra-persistencemanager-hector/src/main/java/org/amdatu/cassandra/persistencemanager/hector/service/HectorCassandraPersistenceManagerImpl.java
Tue Mar 13 08:39:31 2012
@@ -308,18 +308,16 @@
// Validate input arguments
validateSuperColumn(superColumnName);
- QueryResult<HSuperColumn<String, String, String>> result =
- HFactory.createSuperColumnQuery(getHectorKeyspace(),
serializer, serializer, serializer, serializer)
+ QueryResult<HColumn<String, String>> result =
+ HFactory.createSubColumnQuery(getHectorKeyspace(), serializer,
serializer, serializer, serializer)
.setColumnFamily(columnFamilyName)
.setKey(rowKey)
- .setSuperName(superColumnName)
+ .setSuperColumn(superColumnName)
+ .setColumn(columnName)
.execute();
- if (result.get() != null) {
- for (HColumn<String, String> column :
result.get().getColumns()) {
- if (column.getName().equals(columnName)) {
- return true;
- }
- }
+ HColumn<String, String> hColumn = result.get();
+ if (hColumn != null) {
+ return hColumn.getValue() != null;
}
return false;
}
@@ -607,20 +605,17 @@
// Validate input arguments
validateSuperColumn(superColumnName);
- QueryResult<HSuperColumn<String, String, T>> result =
+ QueryResult<HColumn<String, T>> result =
HFactory
- .createSuperColumnQuery(getHectorKeyspace(), serializer,
serializer, serializer, valueSerializer)
+ .createSubColumnQuery(getHectorKeyspace(), serializer,
serializer, serializer, valueSerializer)
.setColumnFamily(columnFamilyName)
.setKey(rowKey)
- .setSuperName(superColumnName)
+ .setSuperColumn(superColumnName)
+ .setColumn(columnName)
.execute();
- if (result.get() != null) {
- List<HColumn<String, T>> columns = result.get().getColumns();
- for (HColumn<String, T> column : columns) {
- if (column.getName().equals(columnName)) {
- return column.getValue();
- }
- }
+ HColumn<String, T> hColumn = result.get();
+ if (hColumn != null) {
+ return hColumn.getValue();
}
return null;
}
Modified:
branches/amdatu-cassandra-0.2.3/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/PersistenceManagerTest.java
==============================================================================
---
branches/amdatu-cassandra-0.2.3/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/PersistenceManagerTest.java
(original)
+++
branches/amdatu-cassandra-0.2.3/cassandra-persistencemanager-hector/src/test/java/org/amdatu/cassandra/persistencemanager/hector/PersistenceManagerTest.java
Tue Mar 13 08:39:31 2012
@@ -231,7 +231,7 @@
String rowKey = "row_" + i;
if (isSuper) {
m_hectorPM.deleteSuperColumn(cf, rowKey, TEST_SUPERCOLUMN);
- Assert.assertFalse(m_hectorPM.exists(cf, rowKey,
TEST_SUPERCOLUMN, null));
+ Assert.assertFalse(m_hectorPM.exists(cf, rowKey,
TEST_SUPERCOLUMN, TEST_COLUMN));
}
else {
m_hectorPM.deleteColumn(cf, "row_" + i, null, TEST_COLUMN);
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
