Repository: cassandra Updated Branches: refs/heads/trunk edade5ac3 -> c9a324153
Fix MV builder when multiple MVs were added Patch by tjake; reviewed by carl for CASSANDRA-10156 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/196b7ab5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/196b7ab5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/196b7ab5 Branch: refs/heads/trunk Commit: 196b7ab5406abcc21bb12b6a562fec86adc69231 Parents: efe9a7d Author: T Jake Luciani <[email protected]> Authored: Thu Aug 27 15:50:24 2015 -0400 Committer: T Jake Luciani <[email protected]> Committed: Fri Aug 28 10:14:34 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/view/MaterializedViewBuilder.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/196b7ab5/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 457814f..a2cf9c8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.0-beta2 + * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156) * Choose better poolingOptions for protocol v4 in cassandra-stress (CASSANDRA-10182) * Fix LWW bug affecting Materialized Views (CASSANDRA-10197) * Ensures frozen sets and maps are always sorted (CASSANDRA-10162) http://git-wip-us.apache.org/repos/asf/cassandra/blob/196b7ab5/src/java/org/apache/cassandra/db/view/MaterializedViewBuilder.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/view/MaterializedViewBuilder.java b/src/java/org/apache/cassandra/db/view/MaterializedViewBuilder.java index 5fa5a82..6083634 100644 --- a/src/java/org/apache/cassandra/db/view/MaterializedViewBuilder.java +++ b/src/java/org/apache/cassandra/db/view/MaterializedViewBuilder.java @@ -183,7 +183,8 @@ public class MaterializedViewBuilder extends CompactionInfo.Holder } } - SystemKeyspace.finishMaterializedViewBuildStatus(ksname, viewName); + if (!isStopped) + SystemKeyspace.finishMaterializedViewBuildStatus(ksname, viewName); } catch (Exception e)
