You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2018/05/03 09:55:43 UTC

[01/10] cassandra git commit: CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will.

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 3a713827f -> 1b0b113fa
  refs/heads/cassandra-3.0 eb68c3126 -> 493f9a2b4
  refs/heads/cassandra-3.11 2d19de1cf -> 73f5b8f99
  refs/heads/trunk 60ed982d5 -> dd091d417


CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will.

patch by Cyril Scetbon; reviewed by Mick Semb Wever for CASSANDRA-10751


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b0b113f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b0b113f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b0b113f

Branch: refs/heads/cassandra-2.2
Commit: 1b0b113facb2d8ad125b9baa0127ffe5abe8a16e
Parents: 3a71382
Author: Mick Semb Wever <mc...@apache.org>
Authored: Tue May 1 21:00:25 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Thu May 3 18:39:55 2018 +1000

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 22ee346..1055d51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.13
+ * CqlRecordReader no longer quotes the keyspace when connecting, as the java driver will (CASSANDRA-10751)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/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 b3e440d..18b2f50 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,7 +133,7 @@ public class CqlRecordReader extends RecordReader<Long, Row>
         }
 
         if (cluster != null)
-            session = cluster.connect(quote(keyspace));
+            session = cluster.connect(keyspace);
 
         if (session == null)
           throw new RuntimeException("Can't create connection session");


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by mc...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/73f5b8f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73f5b8f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73f5b8f9

Branch: refs/heads/trunk
Commit: 73f5b8f995da0a56babac588a5476397604b707e
Parents: 2d19de1 493f9a2
Author: Mick Semb Wever <mc...@apache.org>
Authored: Thu May 3 18:56:29 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Thu May 3 18:57:14 2018 +1000

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/73f5b8f9/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/73f5b8f9/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by mc...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/493f9a2b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/493f9a2b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/493f9a2b

Branch: refs/heads/trunk
Commit: 493f9a2b4727b5d249842d0fbd2498d6a3d74ff4
Parents: eb68c31 1b0b113
Author: Mick Semb Wever <mc...@apache.org>
Authored: Thu May 3 18:45:05 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Thu May 3 18:45:59 2018 +1000

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/493f9a2b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 39edeb1,1055d51..e549cda
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 -2.2.13
 +3.0.17
 + * Better handle missing partition columns in system_schema.columns (CASSANDRA-14379)
 + * Delay hints store excise by write timeout to avoid race with decommission (CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 (CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up (CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup (CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
 + * Respect max hint window when hinting for LWT (CASSANDRA-14215)
 + * Adding missing WriteType enum values to v3, v4, and v5 spec (CASSANDRA-13697)
 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
 + * Fix NPE when performing comparison against a null frozen in LWT (CASSANDRA-14087)
 + * Log when SSTables are deleted (CASSANDRA-14302)
 + * Fix batch commitlog sync regression (CASSANDRA-14292)
 + * Write to pending endpoint when view replica is also base replica (CASSANDRA-14251)
 + * Chain commit log marker potential performance regression in batch commit mode (CASSANDRA-14194)
 + * Fully utilise specified compaction threads (CASSANDRA-14210)
 + * Pre-create deletion log records to finish compactions quicker (CASSANDRA-12763)
 +Merged from 2.2:
+  * CqlRecordReader no longer quotes the keyspace when connecting, as the java driver will (CASSANDRA-10751)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/493f9a2b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by mc...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/493f9a2b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/493f9a2b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/493f9a2b

Branch: refs/heads/cassandra-3.11
Commit: 493f9a2b4727b5d249842d0fbd2498d6a3d74ff4
Parents: eb68c31 1b0b113
Author: Mick Semb Wever <mc...@apache.org>
Authored: Thu May 3 18:45:05 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Thu May 3 18:45:59 2018 +1000

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/493f9a2b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 39edeb1,1055d51..e549cda
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 -2.2.13
 +3.0.17
 + * Better handle missing partition columns in system_schema.columns (CASSANDRA-14379)
 + * Delay hints store excise by write timeout to avoid race with decommission (CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 (CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up (CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup (CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
 + * Respect max hint window when hinting for LWT (CASSANDRA-14215)
 + * Adding missing WriteType enum values to v3, v4, and v5 spec (CASSANDRA-13697)
 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
 + * Fix NPE when performing comparison against a null frozen in LWT (CASSANDRA-14087)
 + * Log when SSTables are deleted (CASSANDRA-14302)
 + * Fix batch commitlog sync regression (CASSANDRA-14292)
 + * Write to pending endpoint when view replica is also base replica (CASSANDRA-14251)
 + * Chain commit log marker potential performance regression in batch commit mode (CASSANDRA-14194)
 + * Fully utilise specified compaction threads (CASSANDRA-14210)
 + * Pre-create deletion log records to finish compactions quicker (CASSANDRA-12763)
 +Merged from 2.2:
+  * CqlRecordReader no longer quotes the keyspace when connecting, as the java driver will (CASSANDRA-10751)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/493f9a2b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[04/10] cassandra git commit: CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will.

Posted by mc...@apache.org.
CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will.

patch by Cyril Scetbon; reviewed by Mick Semb Wever for CASSANDRA-10751


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b0b113f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b0b113f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b0b113f

Branch: refs/heads/trunk
Commit: 1b0b113facb2d8ad125b9baa0127ffe5abe8a16e
Parents: 3a71382
Author: Mick Semb Wever <mc...@apache.org>
Authored: Tue May 1 21:00:25 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Thu May 3 18:39:55 2018 +1000

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 22ee346..1055d51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.13
+ * CqlRecordReader no longer quotes the keyspace when connecting, as the java driver will (CASSANDRA-10751)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/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 b3e440d..18b2f50 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,7 +133,7 @@ public class CqlRecordReader extends RecordReader<Long, Row>
         }
 
         if (cluster != null)
-            session = cluster.connect(quote(keyspace));
+            session = cluster.connect(keyspace);
 
         if (session == null)
           throw new RuntimeException("Can't create connection session");


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by mc...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/493f9a2b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/493f9a2b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/493f9a2b

Branch: refs/heads/cassandra-3.0
Commit: 493f9a2b4727b5d249842d0fbd2498d6a3d74ff4
Parents: eb68c31 1b0b113
Author: Mick Semb Wever <mc...@apache.org>
Authored: Thu May 3 18:45:05 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Thu May 3 18:45:59 2018 +1000

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/493f9a2b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 39edeb1,1055d51..e549cda
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 -2.2.13
 +3.0.17
 + * Better handle missing partition columns in system_schema.columns (CASSANDRA-14379)
 + * Delay hints store excise by write timeout to avoid race with decommission (CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 (CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up (CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup (CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
 + * Respect max hint window when hinting for LWT (CASSANDRA-14215)
 + * Adding missing WriteType enum values to v3, v4, and v5 spec (CASSANDRA-13697)
 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
 + * Fix NPE when performing comparison against a null frozen in LWT (CASSANDRA-14087)
 + * Log when SSTables are deleted (CASSANDRA-14302)
 + * Fix batch commitlog sync regression (CASSANDRA-14292)
 + * Write to pending endpoint when view replica is also base replica (CASSANDRA-14251)
 + * Chain commit log marker potential performance regression in batch commit mode (CASSANDRA-14194)
 + * Fully utilise specified compaction threads (CASSANDRA-14210)
 + * Pre-create deletion log records to finish compactions quicker (CASSANDRA-12763)
 +Merged from 2.2:
+  * CqlRecordReader no longer quotes the keyspace when connecting, as the java driver will (CASSANDRA-10751)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/493f9a2b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

Posted by mc...@apache.org.
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd091d41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd091d41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd091d41

Branch: refs/heads/trunk
Commit: dd091d417ccca7764cdf016c2921d97121a236c5
Parents: 60ed982 73f5b8f
Author: Mick Semb Wever <mc...@apache.org>
Authored: Thu May 3 19:27:12 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Thu May 3 19:52:28 2018 +1000

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd091d41/CHANGES.txt
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by mc...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/73f5b8f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73f5b8f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73f5b8f9

Branch: refs/heads/cassandra-3.11
Commit: 73f5b8f995da0a56babac588a5476397604b707e
Parents: 2d19de1 493f9a2
Author: Mick Semb Wever <mc...@apache.org>
Authored: Thu May 3 18:56:29 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Thu May 3 18:57:14 2018 +1000

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/73f5b8f9/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/73f5b8f9/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[02/10] cassandra git commit: CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will.

Posted by mc...@apache.org.
CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will.

patch by Cyril Scetbon; reviewed by Mick Semb Wever for CASSANDRA-10751


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b0b113f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b0b113f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b0b113f

Branch: refs/heads/cassandra-3.0
Commit: 1b0b113facb2d8ad125b9baa0127ffe5abe8a16e
Parents: 3a71382
Author: Mick Semb Wever <mc...@apache.org>
Authored: Tue May 1 21:00:25 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Thu May 3 18:39:55 2018 +1000

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 22ee346..1055d51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.13
+ * CqlRecordReader no longer quotes the keyspace when connecting, as the java driver will (CASSANDRA-10751)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/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 b3e440d..18b2f50 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,7 +133,7 @@ public class CqlRecordReader extends RecordReader<Long, Row>
         }
 
         if (cluster != null)
-            session = cluster.connect(quote(keyspace));
+            session = cluster.connect(keyspace);
 
         if (session == null)
           throw new RuntimeException("Can't create connection session");


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[03/10] cassandra git commit: CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will.

Posted by mc...@apache.org.
CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will.

patch by Cyril Scetbon; reviewed by Mick Semb Wever for CASSANDRA-10751


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b0b113f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b0b113f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b0b113f

Branch: refs/heads/cassandra-3.11
Commit: 1b0b113facb2d8ad125b9baa0127ffe5abe8a16e
Parents: 3a71382
Author: Mick Semb Wever <mc...@apache.org>
Authored: Tue May 1 21:00:25 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Thu May 3 18:39:55 2018 +1000

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 22ee346..1055d51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.13
+ * CqlRecordReader no longer quotes the keyspace when connecting, as the java driver will (CASSANDRA-10751)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0b113f/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 b3e440d..18b2f50 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,7 +133,7 @@ public class CqlRecordReader extends RecordReader<Long, Row>
         }
 
         if (cluster != null)
-            session = cluster.connect(quote(keyspace));
+            session = cluster.connect(keyspace);
 
         if (session == null)
           throw new RuntimeException("Can't create connection session");


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org