You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/06/18 18:04:12 UTC
cassandra git commit: Rename class for DATE type in Java driver
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 94be12c6f -> a13399279
Rename class for DATE type in Java driver
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9563
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1339927
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1339927
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1339927
Branch: refs/heads/cassandra-2.2
Commit: a13399279b4e863779af938fb4f7da9abc4755d2
Parents: 94be12c
Author: Robert Stupp <sn...@snazy.de>
Authored: Thu Jun 18 18:02:45 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Thu Jun 18 18:02:45 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
...r-core-2.2.0-rc1-SNAPSHOT-20150603-shaded.jar | Bin 2155169 -> 0 bytes
...r-core-2.2.0-rc2-SNAPSHOT-20150617-shaded.jar | Bin 0 -> 2154972 bytes
.../cassandra/hadoop/cql3/CqlRecordReader.java | 6 +++---
4 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1339927/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3671af9..76a42ab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2
+ * Rename class for DATE type in Java driver (CASSANDRA-9563)
* Duplicate compilation of UDFs on coordinator (CASSANDRA-9475)
* Fix connection leak in CqlRecordWriter (CASSANDRA-9576)
* Mlockall before opening system sstables & remove boot_without_jna option (CASSANDRA-9573)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1339927/lib/cassandra-driver-core-2.2.0-rc1-SNAPSHOT-20150603-shaded.jar
----------------------------------------------------------------------
diff --git a/lib/cassandra-driver-core-2.2.0-rc1-SNAPSHOT-20150603-shaded.jar b/lib/cassandra-driver-core-2.2.0-rc1-SNAPSHOT-20150603-shaded.jar
deleted file mode 100644
index d75a595..0000000
Binary files a/lib/cassandra-driver-core-2.2.0-rc1-SNAPSHOT-20150603-shaded.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1339927/lib/cassandra-driver-core-2.2.0-rc2-SNAPSHOT-20150617-shaded.jar
----------------------------------------------------------------------
diff --git a/lib/cassandra-driver-core-2.2.0-rc2-SNAPSHOT-20150617-shaded.jar b/lib/cassandra-driver-core-2.2.0-rc2-SNAPSHOT-20150617-shaded.jar
new file mode 100644
index 0000000..7d971df
Binary files /dev/null and b/lib/cassandra-driver-core-2.2.0-rc2-SNAPSHOT-20150617-shaded.jar differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1339927/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 3e79ad1..6db851d 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.ColumnDefinitions;
import com.datastax.driver.core.ColumnMetadata;
-import com.datastax.driver.core.DateWithoutTime;
+import com.datastax.driver.core.LocalDate;
import com.datastax.driver.core.Metadata;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
@@ -418,13 +418,13 @@ public class CqlRecordReader extends RecordReader<Long, Row>
}
@Override
- public DateWithoutTime getDate(int i)
+ public LocalDate getDate(int i)
{
return row.getDate(i);
}
@Override
- public DateWithoutTime getDate(String s)
+ public LocalDate getDate(String s)
{
return row.getDate(s);
}