Author: [email protected]
Date: Mon Sep 19 12:12:00 2011
New Revision: 1396
Log:
[AMDATUCASSANDRA-88] Fixed proper working for super CFs
Modified:
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/CassandraPersistenceManagerMock.java
Modified:
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/CassandraPersistenceManagerMock.java
==============================================================================
---
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/CassandraPersistenceManagerMock.java
(original)
+++
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/CassandraPersistenceManagerMock.java
Mon Sep 19 12:12:00 2011
@@ -141,11 +141,22 @@
}
public List<String> getColumnNames(String columnFamilyName, String rowKey)
{
- ColumnFamily<SN, N, V> cf = getExpectedColumnFamily(columnFamilyName,
ColumnType.STANDARD);
- List<HColumn<N, V>> columns = cf.getColumns(rowKey);
+ if (!exists(columnFamilyName)) {
+ throw new HInvalidRequestException("ColumnFamily '" +
columnFamilyName + "' does not exist");
+ }
+ ColumnFamily<SN, N, V> cf =
m_keyspace.getColumnFamily(columnFamilyName);
List<String> columnNames = new ArrayList<String>();
- for (HColumn<N, V> column : columns) {
- columnNames.add(column.getName().toString());
+ if (cf.getType() == ColumnType.STANDARD) {
+ List<HColumn<N, V>> columns = cf.getColumns(rowKey);
+ for (HColumn<N, V> column : columns) {
+ columnNames.add(column.getName().toString());
+ }
+ }
+ else {
+ List<HSuperColumn<SN, N, V>> superColumns =
cf.getSuperColumns(rowKey);
+ for (HSuperColumn<SN, N, V> superColumn : superColumns) {
+ columnNames.add(superColumn.getName().toString());
+ }
}
return columnNames;
}
@@ -314,7 +325,8 @@
ColumnFamily<SN, N, V> cf = m_keyspace.getColumnFamily(columnFamily);
if (cf.getType() == ColumnType.STANDARD) {
if (superColumn != null) {
- throw new HInvalidRequestException("Super column should be
null for ColumnFamily '" + columnFamily + "', as it is of type standard");
+ throw new HInvalidRequestException("Super column should be
null for ColumnFamily '" + columnFamily
+ + "', as it is of type standard");
}
RowImpl<SN, N, V> row = cf.getRow(rowKey);
if (row != null) {
@@ -323,7 +335,8 @@
}
else {
if (superColumn != null) {
- throw new HInvalidRequestException("Super column should not be
null for ColumnFamily '" + columnFamily + "', as it is of type super");
+ throw new HInvalidRequestException("Super column should not be
null for ColumnFamily '" + columnFamily
+ + "', as it is of type super");
}
SuperRowImpl<SN, N, V> row = cf.getSuperRow(rowKey);
if (row != null) {
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
