Permalink
Browse files

Update to Cassandra 1.0.7

  • Loading branch information...
1 parent 046c6ef commit 487d5eb95a0b3a7f348341ae8419f13622bdc90a @titanous committed Feb 10, 2012
View
@@ -1,7 +1,10 @@
lib/*.jar
build/*.jar
resources
+out
+*.iml
*~
.project
.classpath
+.idea
build
View
@@ -14,6 +14,6 @@ hadoop-core.build.version: 0.20.203.1-brisk1-beta2
hadoop.build.version: 0.20.203.1-brisk1-beta2
hive.build.version: 0.7.0-brisk1-SNAPSHOT
pig.build.version: 0.8.3
-cassandra.build.version: 1.0.0
+cassandra.build.version: 1.0.7
# change this to always for frequent checks
snapshot.datastax.updatePolicy: daily
View
@@ -821,7 +821,8 @@
<javac
debug="true"
debuglevel="${debuglevel}"
- destdir="${test.classes}">
+ destdir="${test.classes}"
+ includeantruntime="false">
<classpath refid="cassandra.classpath"/>
<src path="${test.unit.src}"/>
</javac>
@@ -136,7 +136,7 @@ public ThriftServer(InetAddress listenAddr, int listenPort)
Brisk.Processor processor = new Brisk.Processor(briskServer);
// Transport
- TServerSocket tServerSocket = null;
+ TCustomServerSocket tServerSocket = null;
try
{
@@ -37,6 +37,7 @@
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.Hex;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.BlockLocation;
import org.apache.hadoop.fs.Path;
@@ -646,7 +647,7 @@ ByteBuffer getPathKey(Path path)
ByteBuffer uuidToByteBuffer(UUID id)
{
- return ByteBufferUtil.bytes(FBUtilities.bytesToHex(UUIDGen.decompose(id)));
+ return ByteBufferUtil.bytes(Hex.bytesToHex(UUIDGen.decompose(id)));
}
/**
@@ -27,6 +27,7 @@
import org.apache.cassandra.db.marshal.TypeParser;
import org.apache.cassandra.thrift.*;
import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.Hex;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -625,7 +626,7 @@ private static String cfdefToString(CfDef cfDef)
TSerializer serializer = new TSerializer(new TBinaryProtocol.Factory());
try
{
- return FBUtilities.bytesToHex(serializer.serialize(cfDef));
+ return Hex.bytesToHex(serializer.serialize(cfDef));
}
catch (TException e)
{
@@ -640,7 +641,7 @@ private static CfDef cfdefFromString(String st)
CfDef cfDef = new CfDef();
try
{
- deserializer.deserialize(cfDef, FBUtilities.hexToBytes(st));
+ deserializer.deserialize(cfDef, Hex.hexToBytes(st));
}
catch (TException e)
{
View
@@ -10,12 +10,10 @@ partitioner: org.apache.cassandra.dht.RandomPartitioner
rpc_timeout_in_ms: 5000
listen_address: 127.0.0.1
storage_port: 7010
-rpc_address: 0.0.0.0
rpc_port: 9170
column_index_size_in_kb: 4
commitlog_directory: build/test/cassandra/commitlog
saved_caches_directory: build/test/cassandra/saved_caches
-commitlog_rotation_threshold_in_mb: 128
data_file_directories:
- build/test/cassandra/data
disk_access_mode: mmap
@@ -89,7 +89,7 @@ public ThriftServer(InetAddress listenAddr, int listenPort)
Brisk.Processor processor = new Brisk.Processor(briskServer);
// Transport
- TServerSocket tServerSocket = null;
+ TCustomServerSocket tServerSocket = null;
try
{
@@ -22,8 +22,8 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.KSMetaData;
+import org.apache.cassandra.config.Schema;
import org.apache.cassandra.service.ClientState;
import org.apache.cassandra.thrift.*;
import org.apache.thrift.TException;
@@ -68,21 +68,21 @@ public String describe_cluster_name() throws TException
public KsDef describe_keyspace(String table) throws NotFoundException, InvalidRequestException, TException
{
- KSMetaData ksm = DatabaseDescriptor.getTableDefinition(table);
+ KSMetaData ksm = Schema.instance.getTableDefinition(table);
if (ksm == null)
throw new NotFoundException();
List<CfDef> cfDefs = new ArrayList<CfDef>();
for (CFMetaData cfm : ksm.cfMetaData().values())
- cfDefs.add(CFMetaData.convertToThrift(cfm));
+ cfDefs.add(cfm.toThrift());
KsDef ksdef = new KsDef(ksm.name, ksm.strategyClass.getName(), cfDefs);
ksdef.setStrategy_options(ksm.strategyOptions);
return ksdef;
}
public List<KsDef> describe_keyspaces() throws InvalidRequestException, TException
{
- Set<String> keyspaces = DatabaseDescriptor.getTables();
+ Set<String> keyspaces = Schema.instance.getTables();
List<KsDef> ksset = new ArrayList<KsDef>();
for (String ks : keyspaces)
{
Oops, something went wrong.

0 comments on commit 487d5eb

Please sign in to comment.