Author: [email protected]
Date: Tue Sep 20 10:09:09 2011
New Revision: 1399
Log:
[AMDATUCASSANDRA-89] Fixed the error by providing subcomparator null. Also
fixed some typos and improved exception logging.
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/ConsumerColumnFamilyProvider.java
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
Tue Sep 20 10:09:09 2011
@@ -157,7 +157,7 @@
throw new ThriftException(e);
}
catch (TException e) {
- throw new ThriftException(e);
+ throw new ThriftException(e).setKeyspace(name);
}
}
@@ -209,16 +209,16 @@
}
}
catch (TException e) {
- throw new ThriftException(e);
+ throw new ThriftException(e).setKeyspace(keyspace);
}
catch (InvalidRequestException e) {
- throw new ThriftException(e);
+ throw new ThriftException(e).setKeyspace(keyspace);
}
catch (NotFoundException e) {
- throw new ThriftException(e);
+ throw new ThriftException(e).setKeyspace(keyspace);
}
catch (SchemaDisagreementException e) {
- throw new ThriftException(e);
+ throw new ThriftException(e).setKeyspace(keyspace);
}
}
@@ -238,13 +238,13 @@
}
}
catch (TException e) {
- throw new ThriftException(e);
+ throw new ThriftException(e).setKeyspace(keyspace);
}
catch (InvalidRequestException e) {
- throw new ThriftException(e);
+ throw new ThriftException(e).setKeyspace(keyspace);
}
catch (SchemaDisagreementException e) {
- throw new ThriftException(e);
+ throw new ThriftException(e).setKeyspace(keyspace);
}
}
@@ -261,11 +261,11 @@
}
catch (InvalidRequestException e) {
// Rethrow the checked exception as a new unchecked Thrift
exception
- throw new ThriftException(e);
+ throw new
ThriftException(e).setKeyspace(keyspaceName).setColumnFamily(columnFamilyName);
}
catch (NotFoundException e) {
// Rethrow the checked exception as a new unchecked Thrift
exception
- throw new ThriftException(e);
+ throw new
ThriftException(e).setKeyspace(keyspaceName).setColumnFamily(columnFamilyName);
}
}
@@ -295,11 +295,11 @@
}
catch (InvalidRequestException e) {
// Rethrow the checked exception as a new unchecked Thrift
exception
- throw new ThriftException(e);
+ throw new
ThriftException(e).setKeyspace(keyspaceName).setColumnFamily(columnFamilyName);
}
catch (NotFoundException e) {
// Rethrow the checked exception as a new unchecked Thrift
exception
- throw new ThriftException(e);
+ throw new
ThriftException(e).setKeyspace(keyspaceName).setColumnFamily(columnFamilyName);
}
}
}
@@ -316,11 +316,11 @@
}
catch (InvalidRequestException e) {
// Rethrow the checked exception as a new unchecked Thrift
exception
- throw new ThriftException(e);
+ throw new ThriftException(e).setKeyspace(keyspaceName);
}
catch (NotFoundException e) {
// Rethrow the checked exception as a new unchecked Thrift
exception
- throw new ThriftException(e);
+ throw new ThriftException(e).setKeyspace(keyspaceName);
}
}
@@ -349,13 +349,13 @@
}
}
catch (InvalidRequestException e) {
- throw new ThriftException(e);
+ throw new
ThriftException(e).setKeyspace(keyspace).setColumnFamily(cfName);
}
catch (TException e) {
- throw new ThriftException(e);
+ throw new
ThriftException(e).setKeyspace(keyspace).setColumnFamily(cfName);
}
catch (SchemaDisagreementException e) {
- throw new ThriftException(e);
+ throw new
ThriftException(e).setKeyspace(keyspace).setColumnFamily(cfName);
}
}
@@ -395,15 +395,15 @@
}
catch (InvalidRequestException e) {
// Rethrow the checked exception as a new unchecked Thrift
exception
- throw new ThriftException(e);
+ throw new
ThriftException(e).setKeyspace(keyspace).setColumnFamily(cfName);
}
catch (TException e) {
// / Rethrow the checked exception as a new unchecked Thrift
exception
- throw new ThriftException(e);
+ throw new
ThriftException(e).setKeyspace(keyspace).setColumnFamily(cfName);
}
catch (NotFoundException e) {
// Rethrow the checked exception as a new unchecked Thrift
exception
- throw new ThriftException(e);
+ throw new
ThriftException(e).setKeyspace(keyspace).setColumnFamily(cfName);
}
}
}
Modified: trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml Tue Sep 20
10:09:09 2011
@@ -24,8 +24,8 @@
</parent>
<artifactId>org.amdatu.cassandra.store.consumer</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Cassandra - oAuth Service Consumer Store</name>
- <description>Provides an implementation of the oAuth Service Consumer
store</description>
+ <name>Amdatu Cassandra - OAuth Service Consumer Store</name>
+ <description>Provides an implementation of the OAuth Service Consumer
store</description>
<properties>
<amdatu.auth.version>0.2.0-RC1</amdatu.auth.version>
@@ -39,11 +39,6 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.application</artifactId>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
<type>bundle</type>
</dependency>
Modified:
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/ConsumerColumnFamilyProvider.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/ConsumerColumnFamilyProvider.java
(original)
+++
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/ConsumerColumnFamilyProvider.java
Tue Sep 20 10:09:09 2011
@@ -35,7 +35,7 @@
new String[]
{CassandraPersistenceManager.DEFAULT_KEYSPACE},
ColumnType.STANDARD,
CompareType.BYTESTYPE,
- CompareType.BYTESTYPE)};
+ null)};
}
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
