You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2018/07/31 19:29:54 UTC
[1/2] cassandra git commit: Fix reading columns with non-UTF names
from schema
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 31d5d870f -> 559d61af6
Fix reading columns with non-UTF names from schema
patch by Jordan West; reviewed by Aleksey Yeschenko for CASSANDRA-14468
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b00601e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b00601e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b00601e
Branch: refs/heads/cassandra-3.11
Commit: 4b00601e831690e4ccf4ea95f70c09381d0ce49a
Parents: d52c7b8
Author: Jordan West <jo...@gmail.com>
Authored: Mon Jul 30 13:06:13 2018 -0700
Committer: Aleksey Yeshchenko <al...@apple.com>
Committed: Tue Jul 31 20:26:12 2018 +0100
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/config/ColumnDefinition.java | 1 -
src/java/org/apache/cassandra/cql3/ColumnIdentifier.java | 5 +++++
src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 4 +---
.../org/apache/cassandra/utils/NativeSSTableLoaderClient.java | 4 +---
5 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b00601e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 47e5cd0..d2ca759 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+3.0.18
+ * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)
+
+
3.0.17
* Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages (CASSANDRA-14568)
* Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b00601e/src/java/org/apache/cassandra/config/ColumnDefinition.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/ColumnDefinition.java b/src/java/org/apache/cassandra/config/ColumnDefinition.java
index 6a0f530..6f7f749 100644
--- a/src/java/org/apache/cassandra/config/ColumnDefinition.java
+++ b/src/java/org/apache/cassandra/config/ColumnDefinition.java
@@ -153,7 +153,6 @@ public class ColumnDefinition extends ColumnSpecification implements Comparable<
{
super(ksName, cfName, name, type);
assert name != null && type != null && kind != null;
- assert name.isInterned();
assert (position == NO_POSITION) == !kind.isPrimaryKeyKind(); // The position really only make sense for partition and clustering columns (and those must have one),
// so make sure we don't sneak it for something else since it'd breaks equals()
this.kind = kind;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b00601e/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
index 9b9ec4a..71e7b9a 100644
--- a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
@@ -124,6 +124,11 @@ public class ColumnIdentifier extends Selectable implements IMeasurableMemory, C
this(bytes, type.getString(bytes), false);
}
+ public ColumnIdentifier(ByteBuffer bytes, String text)
+ {
+ this(bytes, text, false);
+ }
+
private ColumnIdentifier(ByteBuffer bytes, String text, boolean interned)
{
this.bytes = bytes;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b00601e/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 81cc2e1..94832ed 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -1075,9 +1075,7 @@ public final class SchemaKeyspace
if (order == ClusteringOrder.DESC)
type = ReversedType.getInstance(type);
- ColumnIdentifier name = ColumnIdentifier.getInterned(type,
- row.getBytes("column_name_bytes"),
- row.getString("column_name"));
+ ColumnIdentifier name = new ColumnIdentifier(row.getBytes("column_name_bytes"), row.getString("column_name"));
return new ColumnDefinition(keyspace, table, name, type, position, kind);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b00601e/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java b/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java
index 97237d0..3e0d97b 100644
--- a/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java
+++ b/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java
@@ -218,9 +218,7 @@ public class NativeSSTableLoaderClient extends SSTableLoader.Client
if (order == ClusteringOrder.DESC)
type = ReversedType.getInstance(type);
- ColumnIdentifier name = ColumnIdentifier.getInterned(type,
- row.getBytes("column_name_bytes"),
- row.getString("column_name"));
+ ColumnIdentifier name = new ColumnIdentifier(row.getBytes("column_name_bytes"), row.getString("column_name"));
int position = row.getInt("position");
ColumnDefinition.Kind kind = ColumnDefinition.Kind.valueOf(row.getString("kind").toUpperCase());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by al...@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/559d61af
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/559d61af
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/559d61af
Branch: refs/heads/cassandra-3.11
Commit: 559d61af6e2f8c6b6779168d86f05646f6cb6bf6
Parents: 31d5d87 4b00601
Author: Aleksey Yeshchenko <al...@apple.com>
Authored: Tue Jul 31 20:28:55 2018 +0100
Committer: Aleksey Yeshchenko <al...@apple.com>
Committed: Tue Jul 31 20:28:55 2018 +0100
----------------------------------------------------------------------
CHANGES.txt | 5 +++++
src/java/org/apache/cassandra/config/ColumnDefinition.java | 1 -
src/java/org/apache/cassandra/cql3/ColumnIdentifier.java | 5 +++++
src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 4 +---
.../org/apache/cassandra/utils/NativeSSTableLoaderClient.java | 4 +---
5 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/559d61af/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5e39b5e,d2ca759..3557863
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,11 +1,30 @@@
-3.0.18
++3.11.4
++Merged from 3.0:
+ * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)
+
+
-3.0.17
+3.11.3
+ * Validate supported column type with SASI analyzer (CASSANDRA-13669)
+ * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929)
+ * Reduce nodetool GC thread count (CASSANDRA-14475)
+ * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
+ * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
+ * Update metrics to 3.1.5 (CASSANDRA-12924)
+ * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
+ * Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271)
+ * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
+ * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
+ * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
+ * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
+ * Serialize empty buffer as empty string for json output format (CASSANDRA-14245)
+ * Allow logging implementation to be interchanged for embedded testing (CASSANDRA-13396)
+ * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
+ * Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170)
+ * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163)
+ * Fix wildcard GROUP BY queries (CASSANDRA-14209)
+Merged from 3.0:
* Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages (CASSANDRA-14568)
* Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
- * Restore resumable hints delivery, backport CASSANDRA-11960 (CASSANDRA-14419)
* Always close RT markers returned by ReadCommand#executeLocally() (CASSANDRA-14515)
* Reverse order queries with range tombstones can cause data loss (CASSANDRA-14513)
* Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/559d61af/src/java/org/apache/cassandra/config/ColumnDefinition.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/559d61af/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/559d61af/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/559d61af/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org