You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2017/08/07 19:42:26 UTC
[1/6] cassandra git commit: Skip materialized view addition if the
base table doesn't exist
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 d9eabd3d0 -> 918667929
refs/heads/cassandra-3.11 2fd33ba9d -> 15abe2db9
refs/heads/trunk 32de990b7 -> cb32807f6
Skip materialized view addition if the base table doesn't exist
patch by Andres de la Peña; reviewed by Jake Luciani for CASSANDRA-13737
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91866792
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91866792
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91866792
Branch: refs/heads/cassandra-3.0
Commit: 918667929f87a2e8e74913fe6d6e5dd137fe4e4f
Parents: d9eabd3
Author: Andrés de la Peña <a....@gmail.com>
Authored: Mon Aug 7 20:26:09 2017 +0100
Committer: Andrés de la Peña <a....@gmail.com>
Committed: Mon Aug 7 20:26:09 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/view/ViewManager.java | 9 +++++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/91866792/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 799e7f4..905a436 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * Skip materialized view addition if the base table doesn't exist (CASSANDRA-13737)
* Drop table should remove corresponding entries in dropped_columns table (CASSANDRA-13730)
* Log warn message until legacy auth tables have been migrated (CASSANDRA-13371)
* Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 (CASSANDRA-13691)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/91866792/src/java/org/apache/cassandra/db/view/ViewManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/ViewManager.java b/src/java/org/apache/cassandra/db/view/ViewManager.java
index fd04b97..0a0fa7b 100644
--- a/src/java/org/apache/cassandra/db/view/ViewManager.java
+++ b/src/java/org/apache/cassandra/db/view/ViewManager.java
@@ -136,6 +136,15 @@ public class ViewManager
public void addView(ViewDefinition definition)
{
+ // Skip if the base table doesn't exist due to schema propagation issues, see CASSANDRA-13737
+ if (!keyspace.hasColumnFamilyStore(definition.baseTableId))
+ {
+ logger.warn("Not adding view {} because the base table {} is unknown",
+ definition.viewName,
+ definition.baseTableId);
+ return;
+ }
+
View view = new View(definition, keyspace.getColumnFamilyStore(definition.baseTableId));
forTable(view.getDefinition().baseTableMetadata()).add(view);
viewsByName.put(definition.viewName, view);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ad...@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/15abe2db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15abe2db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15abe2db
Branch: refs/heads/cassandra-3.11
Commit: 15abe2db958cc9c373d00800c5b436c4d2617f5f
Parents: 2fd33ba 9186679
Author: Andrés de la Peña <a....@gmail.com>
Authored: Mon Aug 7 20:28:01 2017 +0100
Committer: Andrés de la Peña <a....@gmail.com>
Committed: Mon Aug 7 20:28:01 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/view/ViewManager.java | 9 +++++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15abe2db/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 45ed523,905a436..b8c4bde
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
-3.0.15
+3.11.1
+ * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
+ * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
+ * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512)
+ * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
+Merged from 3.0:
+ * Skip materialized view addition if the base table doesn't exist (CASSANDRA-13737)
* Drop table should remove corresponding entries in dropped_columns table (CASSANDRA-13730)
* Log warn message until legacy auth tables have been migrated (CASSANDRA-13371)
* Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 (CASSANDRA-13691)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15abe2db/src/java/org/apache/cassandra/db/view/ViewManager.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: Skip materialized view addition if the
base table doesn't exist
Posted by ad...@apache.org.
Skip materialized view addition if the base table doesn't exist
patch by Andres de la Peña; reviewed by Jake Luciani for CASSANDRA-13737
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91866792
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91866792
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91866792
Branch: refs/heads/trunk
Commit: 918667929f87a2e8e74913fe6d6e5dd137fe4e4f
Parents: d9eabd3
Author: Andrés de la Peña <a....@gmail.com>
Authored: Mon Aug 7 20:26:09 2017 +0100
Committer: Andrés de la Peña <a....@gmail.com>
Committed: Mon Aug 7 20:26:09 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/view/ViewManager.java | 9 +++++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/91866792/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 799e7f4..905a436 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * Skip materialized view addition if the base table doesn't exist (CASSANDRA-13737)
* Drop table should remove corresponding entries in dropped_columns table (CASSANDRA-13730)
* Log warn message until legacy auth tables have been migrated (CASSANDRA-13371)
* Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 (CASSANDRA-13691)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/91866792/src/java/org/apache/cassandra/db/view/ViewManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/ViewManager.java b/src/java/org/apache/cassandra/db/view/ViewManager.java
index fd04b97..0a0fa7b 100644
--- a/src/java/org/apache/cassandra/db/view/ViewManager.java
+++ b/src/java/org/apache/cassandra/db/view/ViewManager.java
@@ -136,6 +136,15 @@ public class ViewManager
public void addView(ViewDefinition definition)
{
+ // Skip if the base table doesn't exist due to schema propagation issues, see CASSANDRA-13737
+ if (!keyspace.hasColumnFamilyStore(definition.baseTableId))
+ {
+ logger.warn("Not adding view {} because the base table {} is unknown",
+ definition.viewName,
+ definition.baseTableId);
+ return;
+ }
+
View view = new View(definition, keyspace.getColumnFamilyStore(definition.baseTableId));
forTable(view.getDefinition().baseTableMetadata()).add(view);
viewsByName.put(definition.viewName, view);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ad...@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/15abe2db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15abe2db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15abe2db
Branch: refs/heads/trunk
Commit: 15abe2db958cc9c373d00800c5b436c4d2617f5f
Parents: 2fd33ba 9186679
Author: Andrés de la Peña <a....@gmail.com>
Authored: Mon Aug 7 20:28:01 2017 +0100
Committer: Andrés de la Peña <a....@gmail.com>
Committed: Mon Aug 7 20:28:01 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/view/ViewManager.java | 9 +++++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15abe2db/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 45ed523,905a436..b8c4bde
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
-3.0.15
+3.11.1
+ * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
+ * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
+ * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512)
+ * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
+Merged from 3.0:
+ * Skip materialized view addition if the base table doesn't exist (CASSANDRA-13737)
* Drop table should remove corresponding entries in dropped_columns table (CASSANDRA-13730)
* Log warn message until legacy auth tables have been migrated (CASSANDRA-13371)
* Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 (CASSANDRA-13691)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15abe2db/src/java/org/apache/cassandra/db/view/ViewManager.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: Skip materialized view addition if the
base table doesn't exist
Posted by ad...@apache.org.
Skip materialized view addition if the base table doesn't exist
patch by Andres de la Peña; reviewed by Jake Luciani for CASSANDRA-13737
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91866792
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91866792
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91866792
Branch: refs/heads/cassandra-3.11
Commit: 918667929f87a2e8e74913fe6d6e5dd137fe4e4f
Parents: d9eabd3
Author: Andrés de la Peña <a....@gmail.com>
Authored: Mon Aug 7 20:26:09 2017 +0100
Committer: Andrés de la Peña <a....@gmail.com>
Committed: Mon Aug 7 20:26:09 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/view/ViewManager.java | 9 +++++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/91866792/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 799e7f4..905a436 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * Skip materialized view addition if the base table doesn't exist (CASSANDRA-13737)
* Drop table should remove corresponding entries in dropped_columns table (CASSANDRA-13730)
* Log warn message until legacy auth tables have been migrated (CASSANDRA-13371)
* Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 (CASSANDRA-13691)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/91866792/src/java/org/apache/cassandra/db/view/ViewManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/view/ViewManager.java b/src/java/org/apache/cassandra/db/view/ViewManager.java
index fd04b97..0a0fa7b 100644
--- a/src/java/org/apache/cassandra/db/view/ViewManager.java
+++ b/src/java/org/apache/cassandra/db/view/ViewManager.java
@@ -136,6 +136,15 @@ public class ViewManager
public void addView(ViewDefinition definition)
{
+ // Skip if the base table doesn't exist due to schema propagation issues, see CASSANDRA-13737
+ if (!keyspace.hasColumnFamilyStore(definition.baseTableId))
+ {
+ logger.warn("Not adding view {} because the base table {} is unknown",
+ definition.viewName,
+ definition.baseTableId);
+ return;
+ }
+
View view = new View(definition, keyspace.getColumnFamilyStore(definition.baseTableId));
forTable(view.getDefinition().baseTableMetadata()).add(view);
viewsByName.put(definition.viewName, view);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by ad...@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/cb32807f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb32807f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb32807f
Branch: refs/heads/trunk
Commit: cb32807f654cc8b11868cb1ed8e17657137d7ea2
Parents: 32de990 15abe2d
Author: Andrés de la Peña <a....@gmail.com>
Authored: Mon Aug 7 20:32:18 2017 +0100
Committer: Andrés de la Peña <a....@gmail.com>
Committed: Mon Aug 7 20:32:18 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/view/ViewManager.java | 9 +++++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb32807f/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb32807f/src/java/org/apache/cassandra/db/view/ViewManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/view/ViewManager.java
index 84738b1,5c72bb2..75cfe99
--- a/src/java/org/apache/cassandra/db/view/ViewManager.java
+++ b/src/java/org/apache/cassandra/db/view/ViewManager.java
@@@ -135,11 -147,20 +135,20 @@@ public class ViewManage
}
}
- public void addView(ViewDefinition definition)
+ public void addView(ViewMetadata definition)
{
+ // Skip if the base table doesn't exist due to schema propagation issues, see CASSANDRA-13737
+ if (!keyspace.hasColumnFamilyStore(definition.baseTableId))
+ {
+ logger.warn("Not adding view {} because the base table {} is unknown",
- definition.viewName,
++ definition.name,
+ definition.baseTableId);
+ return;
+ }
+
View view = new View(definition, keyspace.getColumnFamilyStore(definition.baseTableId));
- forTable(view.getDefinition().baseTableMetadata()).add(view);
- viewsByName.put(definition.viewName, view);
+ forTable(view.getDefinition().baseTableId).add(view);
+ viewsByName.put(definition.name, view);
}
public void removeView(String name)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org