Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: hector-client/hector
...
head fork: hector-client/hector
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 2 contributors
Commits on Feb 27, 2014
@woolfel woolfel Update to C* 2.0.4 libs
Updated dependency to 2.0.4 and fixed the EmbeddedSchemaLoader to use
the updated ColumnDefinition
220626e
@zznate zznate Merge pull request #655 from woolfel/master
Update to C* 2.0.4 libs
b21b0e3
View
2  pom.xml
@@ -389,7 +389,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Dependency versioning-->
- <cassandra.version>1.2.11</cassandra.version>
+ <cassandra.version>2.0.4</cassandra.version>
<org.springframework.version>3.0.6.RELEASE</org.springframework.version>
<slf4j.version>1.6.1</slf4j.version>
<!-- Maven plugin versioning -->
View
5 test/src/main/java/me/prettyprint/hector/testutils/EmbeddedSchemaLoader.java
@@ -13,6 +13,7 @@
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.config.Schema;
+import org.apache.cassandra.cql3.ColumnIdentifier;
import org.apache.cassandra.db.ColumnFamilyType;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.AsciiType;
@@ -135,7 +136,7 @@ private static CFMetaData indexCFMD(String ksName, String cfName, final Boolean
ByteBuffer cName = ByteBuffer.wrap("birthyear".getBytes(Charsets.UTF_8));
IndexType keys = withIdxType ? IndexType.KEYS : null;
//TODO: that last null is for composites. Need to understand that better, but null is reasonable
- ColumnDefinition def = new org.apache.cassandra.config.ColumnDefinition(cName,LongType.instance,IndexType.KEYS,null,"birthyear_index",null);
+ ColumnDefinition def = new org.apache.cassandra.config.ColumnDefinition(cName,LongType.instance,IndexType.KEYS,null,"birthyear_index",null,null);
put (cName,def);
}});
}
@@ -154,7 +155,7 @@ private static CFMetaData cqlTestCf(String ksName, String cfName,
.keyValidator(UTF8Type.instance).columnMetadata(new HashMap<ByteBuffer, ColumnDefinition>()
{{
ByteBuffer cName = ByteBuffer.wrap("birthyear".getBytes(Charsets.UTF_8));
- put(cName, new ColumnDefinition(cName, LongType.instance, null, null, null,null));
+ put(cName, new ColumnDefinition(cName, LongType.instance, null, null, null,null,null));
}});
}
}

No commit comments for this range

Something went wrong with that request. Please try again.