Author: [email protected]
Date: Wed Jun 13 14:24:15 2012
New Revision: 2489
Log:
[AMDATUCASSANDRA-207] Removed server dependency
Modified:
branches/amdatu-cassandra-0.2.5/cassandra-client/src/main/java/org/amdatu/cassandra/client/service/CassandraClientServiceImpl.java
Modified:
branches/amdatu-cassandra-0.2.5/cassandra-client/src/main/java/org/amdatu/cassandra/client/service/CassandraClientServiceImpl.java
==============================================================================
---
branches/amdatu-cassandra-0.2.5/cassandra-client/src/main/java/org/amdatu/cassandra/client/service/CassandraClientServiceImpl.java
(original)
+++
branches/amdatu-cassandra-0.2.5/cassandra-client/src/main/java/org/amdatu/cassandra/client/service/CassandraClientServiceImpl.java
Wed Jun 13 14:24:15 2012
@@ -45,7 +45,6 @@
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
-import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.thrift.CfDef;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
@@ -60,7 +59,12 @@
// Defaults
private static final String SYSTEM_TABLE = "system";
private static final String UNREACHABLE = "UNREACHABLE";
-
+
+ // Copied from org.apache.cassandra.config.CFMetaData. We cannot use these
classes because these
+ // are part of the cassandra server, they are not included in the
cassandra thrift client.
+ private final static int DEFAULT_ROW_CACHE_KEYS_TO_SAVE =
Integer.MAX_VALUE;
+ private final static double DEFAULT_MERGE_SHARDS_CHANCE = 0.1;
+
// Map of clusters for this client service
private static Cluster CLUSTER = null;
@@ -649,10 +653,10 @@
// 2 special cases for which Hector does not provide isSet flags. We
check if these
// values have been set and if not, we explicitly set them.
if (!from.isSetRow_cache_keys_to_save()) {
-
to.setRowCacheKeysToSave(CFMetaData.DEFAULT_ROW_CACHE_KEYS_TO_SAVE);
+ to.setRowCacheKeysToSave(DEFAULT_ROW_CACHE_KEYS_TO_SAVE);
}
if (!from.isSetMerge_shards_chance()) {
- to.setMergeShardsChance(CFMetaData.DEFAULT_MERGE_SHARDS_CHANCE);
+ to.setMergeShardsChance(DEFAULT_MERGE_SHARDS_CHANCE);
}
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
