You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/10/14 09:50:25 UTC
git commit: Update java driver to 2.1.2
Repository: cassandra
Updated Branches:
refs/heads/trunk a19c91280 -> b94c87a18
Update java driver to 2.1.2
patch by snazy; reviewed by slebresne for CASSANDRA-7692
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b94c87a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b94c87a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b94c87a1
Branch: refs/heads/trunk
Commit: b94c87a1816b5fc370d14dbc001eaca5b7c720e8
Parents: a19c912
Author: Robert Stupp <sn...@snazy.de>
Authored: Tue Oct 14 08:52:15 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Oct 14 09:49:25 2014 +0200
----------------------------------------------------------------------
build.xml | 2 +-
lib/cassandra-driver-core-2.1.2.jar | Bin 0 -> 638544 bytes
.../cassandra/hadoop/cql3/CqlRecordReader.java | 27 +++++++++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b94c87a1/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 708b950..b758e0a 100644
--- a/build.xml
+++ b/build.xml
@@ -365,7 +365,7 @@
<dependency groupId="io.netty" artifactId="netty-all" version="4.0.23.Final" />
<dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2" />
<dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" />
- <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="2.0.5" />
+ <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="2.1.2" />
<dependency groupId="org.javassist" artifactId="javassist" version="3.18.2-GA" />
<dependency groupId="net.sf.supercsv" artifactId="super-csv" version="2.1.0" />
<dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations" version="1.2.0" />
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b94c87a1/lib/cassandra-driver-core-2.1.2.jar
----------------------------------------------------------------------
diff --git a/lib/cassandra-driver-core-2.1.2.jar b/lib/cassandra-driver-core-2.1.2.jar
new file mode 100644
index 0000000..2095c05
Binary files /dev/null and b/lib/cassandra-driver-core-2.1.2.jar differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b94c87a1/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index a31f013..b31a1a5 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -54,6 +54,9 @@ import com.datastax.driver.core.ColumnMetadata;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.Session;
+import com.datastax.driver.core.TupleValue;
+import com.datastax.driver.core.UDTValue;
+
/**
* CqlRecordReader reads the rows return from the CQL query
* It uses CQL auto-paging.
@@ -514,6 +517,30 @@ public class CqlRecordReader extends RecordReader<Long, Row>
{
return row.getMap(name, keysClass, valuesClass);
}
+
+ @Override
+ public UDTValue getUDTValue(int i)
+ {
+ return row.getUDTValue(i);
+ }
+
+ @Override
+ public UDTValue getUDTValue(String name)
+ {
+ return row.getUDTValue(name);
+ }
+
+ @Override
+ public TupleValue getTupleValue(int i)
+ {
+ return row.getTupleValue(i);
+ }
+
+ @Override
+ public TupleValue getTupleValue(String name)
+ {
+ return row.getTupleValue(name);
+ }
}
/**