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 2016/01/22 16:56:20 UTC
[1/6] cassandra git commit: Flush dropped_columns when flushing schema
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 e1cc0150d -> b21472277
refs/heads/cassandra-3.3 7074ddab8 -> 94c4bdb6f
refs/heads/trunk ee9e38b7d -> aa2d31b18
Flush dropped_columns when flushing schema
patch by amorton; reviewed by slebresne for CASSANDRA-11050
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2147227
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2147227
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2147227
Branch: refs/heads/cassandra-3.0
Commit: b214722770113398d22c6c00d46ce0510d868ff9
Parents: e1cc015
Author: Aaron Morton <aa...@thelastpickle.com>
Authored: Thu Jan 21 14:41:47 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 16:55:33 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2147227/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4a0bca8..8bfb1d1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
3.0.3
+ * Add dropped_columns to the list of schema table so it gets handled
+ properly (CASSANDRA-11050)
* Update CQL documentation (CASSANDRA-10899)
* Check the column name, not cell name, for dropped columns when reading
legacy sstables (CASSANDRA-11018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2147227/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 f1ea6cf..f91ec9c 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -82,7 +82,7 @@ public final class SchemaKeyspace
public static final String INDEXES = "indexes";
public static final List<String> ALL =
- ImmutableList.of(KEYSPACES, TABLES, COLUMNS, TRIGGERS, VIEWS, TYPES, FUNCTIONS, AGGREGATES, INDEXES);
+ ImmutableList.of(KEYSPACES, TABLES, COLUMNS, DROPPED_COLUMNS, TRIGGERS, VIEWS, TYPES, FUNCTIONS, AGGREGATES, INDEXES);
private static final CFMetaData Keyspaces =
compile(KEYSPACES,
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94c4bdb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94c4bdb6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94c4bdb6
Branch: refs/heads/cassandra-3.3
Commit: 94c4bdb6f1d1524325de5b0805541b1575a73dcb
Parents: 7074dda b214722
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 22 16:55:58 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 16:55:58 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94c4bdb6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 94b723c,8bfb1d1..6b25d10
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,6 +1,8 @@@
-3.0.3
+3.3
+ * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010)
+Merged from 3.0:
+ * Add dropped_columns to the list of schema table so it gets handled
+ properly (CASSANDRA-11050)
* Update CQL documentation (CASSANDRA-10899)
* Check the column name, not cell name, for dropped columns when reading
legacy sstables (CASSANDRA-11018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94c4bdb6/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------
[3/6] cassandra git commit: Flush dropped_columns when flushing schema
Posted by sl...@apache.org.
Flush dropped_columns when flushing schema
patch by amorton; reviewed by slebresne for CASSANDRA-11050
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2147227
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2147227
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2147227
Branch: refs/heads/trunk
Commit: b214722770113398d22c6c00d46ce0510d868ff9
Parents: e1cc015
Author: Aaron Morton <aa...@thelastpickle.com>
Authored: Thu Jan 21 14:41:47 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 16:55:33 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2147227/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4a0bca8..8bfb1d1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
3.0.3
+ * Add dropped_columns to the list of schema table so it gets handled
+ properly (CASSANDRA-11050)
* Update CQL documentation (CASSANDRA-10899)
* Check the column name, not cell name, for dropped columns when reading
legacy sstables (CASSANDRA-11018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2147227/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 f1ea6cf..f91ec9c 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -82,7 +82,7 @@ public final class SchemaKeyspace
public static final String INDEXES = "indexes";
public static final List<String> ALL =
- ImmutableList.of(KEYSPACES, TABLES, COLUMNS, TRIGGERS, VIEWS, TYPES, FUNCTIONS, AGGREGATES, INDEXES);
+ ImmutableList.of(KEYSPACES, TABLES, COLUMNS, DROPPED_COLUMNS, TRIGGERS, VIEWS, TYPES, FUNCTIONS, AGGREGATES, INDEXES);
private static final CFMetaData Keyspaces =
compile(KEYSPACES,
[6/6] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa2d31b1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa2d31b1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa2d31b1
Branch: refs/heads/trunk
Commit: aa2d31b181088561784852771f56d9bb60e98abd
Parents: ee9e38b 94c4bdb
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 22 16:56:04 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 16:56:04 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa2d31b1/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa2d31b1/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94c4bdb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94c4bdb6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94c4bdb6
Branch: refs/heads/trunk
Commit: 94c4bdb6f1d1524325de5b0805541b1575a73dcb
Parents: 7074dda b214722
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 22 16:55:58 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 16:55:58 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94c4bdb6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 94b723c,8bfb1d1..6b25d10
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,6 +1,8 @@@
-3.0.3
+3.3
+ * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010)
+Merged from 3.0:
+ * Add dropped_columns to the list of schema table so it gets handled
+ properly (CASSANDRA-11050)
* Update CQL documentation (CASSANDRA-10899)
* Check the column name, not cell name, for dropped columns when reading
legacy sstables (CASSANDRA-11018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94c4bdb6/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------
[2/6] cassandra git commit: Flush dropped_columns when flushing schema
Posted by sl...@apache.org.
Flush dropped_columns when flushing schema
patch by amorton; reviewed by slebresne for CASSANDRA-11050
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2147227
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2147227
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2147227
Branch: refs/heads/cassandra-3.3
Commit: b214722770113398d22c6c00d46ce0510d868ff9
Parents: e1cc015
Author: Aaron Morton <aa...@thelastpickle.com>
Authored: Thu Jan 21 14:41:47 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 16:55:33 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2147227/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4a0bca8..8bfb1d1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
3.0.3
+ * Add dropped_columns to the list of schema table so it gets handled
+ properly (CASSANDRA-11050)
* Update CQL documentation (CASSANDRA-10899)
* Check the column name, not cell name, for dropped columns when reading
legacy sstables (CASSANDRA-11018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2147227/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 f1ea6cf..f91ec9c 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -82,7 +82,7 @@ public final class SchemaKeyspace
public static final String INDEXES = "indexes";
public static final List<String> ALL =
- ImmutableList.of(KEYSPACES, TABLES, COLUMNS, TRIGGERS, VIEWS, TYPES, FUNCTIONS, AGGREGATES, INDEXES);
+ ImmutableList.of(KEYSPACES, TABLES, COLUMNS, DROPPED_COLUMNS, TRIGGERS, VIEWS, TYPES, FUNCTIONS, AGGREGATES, INDEXES);
private static final CFMetaData Keyspaces =
compile(KEYSPACES,