diff --git a/CHANGES.txt b/CHANGES.txt index 3671af91a5..76a42abe80 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) diff --git a/lib/cassandra-driver-core-2.2.0-rc1-SNAPSHOT-20150603-shaded.jar b/lib/cassandra-driver-core-2.2.0-rc2-SNAPSHOT-20150617-shaded.jar similarity index 87% rename from lib/cassandra-driver-core-2.2.0-rc1-SNAPSHOT-20150603-shaded.jar rename to lib/cassandra-driver-core-2.2.0-rc2-SNAPSHOT-20150617-shaded.jar index d75a595ac7..7d971df718 100644 Binary files a/lib/cassandra-driver-core-2.2.0-rc1-SNAPSHOT-20150603-shaded.jar and b/lib/cassandra-driver-core-2.2.0-rc2-SNAPSHOT-20150617-shaded.jar differ diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java index 3e79ad1679..6db851ddcc 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 } @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); }