Skip to content
This repository was archived by the owner on Nov 22, 2017. It is now read-only.

Update to work with Cassandra 1.0 #154

Open
jasonmk wants to merge 2 commits into
base: solandra
Choose a base branch
from
Open

Update to work with Cassandra 1.0 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bf59b6
Changes to compile against Cassandra 1.0
jasonmk Dec 2, 2011
46f033e
Use Cassandra 1.0.5 lib
jasonmk Dec 3, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ivy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.26" conf="* -> *,!sources,!javadoc" />
<dependency org="org.mortbay.jetty" name="jsp-2.1" rev="6.1.14" conf="* -> *,!sources,!javadoc" />

<dependency org="org.apache.cassandra" name="cassandra-all" rev="0.8.6" conf="* -> *,!sources,!javadoc" />
<dependency org="org.apache.cassandra" name="cassandra-all" rev="1.0.5" conf="* -> *,!sources,!javadoc" />
<dependency org="net.java.dev.jna" name="jna" rev="3.2.7" conf="* -> *,!sources,!javadoc" />
<dependency org="org.xerial.snappy" name="snappy-java" rev="1.0.3.1" conf="* -> *,!sources,!javadoc" />
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions src/lucandra/CassandraUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import java.util.zip.Inflater;

import org.apache.cassandra.config.ConfigurationException;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.service.AbstractCassandraDaemon;
Expand Down Expand Up @@ -307,7 +307,7 @@ public static void createCassandraSchema() throws IOException
return;
}

if (DatabaseDescriptor.getNonSystemTables().contains(keySpace))
if (Schema.instance.getNonSystemTables().contains(keySpace))
{
logger.info("Found Solandra specific schema");
return;
Expand All @@ -329,7 +329,7 @@ public static void createCassandraSchema() throws IOException
System.exit(2);
}

if (DatabaseDescriptor.getNonSystemTables().contains(keySpace))
if (Schema.instance.getNonSystemTables().contains(keySpace))
{
logger.info("Found Solandra specific schema");
return;
Expand Down
3 changes: 2 additions & 1 deletion src/solandra/SolandraComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import com.google.common.collect.MapMaker;

import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.db.Row;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.service.StorageService;
Expand Down Expand Up @@ -93,7 +94,7 @@ public static boolean prepare(ResponseBuilder rb) throws IOException
if(!hasSolandraSchema.get())
{
//Check is Solandra schema exists, if not die
if(! DatabaseDescriptor.getNonSystemTables().contains(CassandraUtils.keySpace) )
if(! Schema.instance.getNonSystemTables().contains(CassandraUtils.keySpace) )
throw new IOException("Solandra keyspace is missing, please import then retry");
else
hasSolandraSchema.set(true);
Expand Down