Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4654C200CEE for ; Mon, 7 Aug 2017 21:42:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4566D165F10; Mon, 7 Aug 2017 19:42:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 950AE165F0D for ; Mon, 7 Aug 2017 21:42:29 +0200 (CEST) Received: (qmail 46574 invoked by uid 500); 7 Aug 2017 19:42:28 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 46294 invoked by uid 99); 7 Aug 2017 19:42:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Aug 2017 19:42:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5EDF4F32A2; Mon, 7 Aug 2017 19:42:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: adelapena@apache.org To: commits@cassandra.apache.org Date: Mon, 07 Aug 2017 19:42:27 -0000 Message-Id: <5d0fd5668b2045e997deb9fa64f38f85@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/6] cassandra git commit: Skip materialized view addition if the base table doesn't exist archived-at: Mon, 07 Aug 2017 19:42:30 -0000 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 Authored: Mon Aug 7 20:26:09 2017 +0100 Committer: Andrés de la Peña 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