Repository: cassandra Updated Branches: refs/heads/trunk 522ddba27 -> 5d8b5cce4
Fix bad merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d8b5cce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d8b5cce Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d8b5cce Branch: refs/heads/trunk Commit: 5d8b5cce497fc602f4bb55086aa5096fd51fe38b Parents: 522ddba Author: T Jake Luciani <j...@apache.org> Authored: Tue Apr 4 12:56:57 2017 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Tue Apr 4 12:56:57 2017 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/view/ViewBuilder.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d8b5cce/src/java/org/apache/cassandra/db/view/ViewBuilder.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/view/ViewBuilder.java b/src/java/org/apache/cassandra/db/view/ViewBuilder.java index af86392..fcb1e98 100644 --- a/src/java/org/apache/cassandra/db/view/ViewBuilder.java +++ b/src/java/org/apache/cassandra/db/view/ViewBuilder.java @@ -101,14 +101,13 @@ public class ViewBuilder extends CompactionInfo.Holder public void run() { - logger.debug("Starting view builder for {}.{}", baseCfs.metadata.ksName, view.name); - logger.trace("Running view builder for {}.{}", baseCfs.metadata.keyspace, view.name); + logger.debug("Starting view builder for {}.{}", baseCfs.metadata.keyspace, view.name); UUID localHostId = SystemKeyspace.getLocalHostId(); String ksname = baseCfs.metadata.keyspace, viewName = view.name; if (SystemKeyspace.isViewBuilt(ksname, viewName)) { - logger.debug("View already marked built for {}.{}", baseCfs.metadata.ksName, view.name); + logger.debug("View already marked built for {}.{}", baseCfs.metadata.keyspace, view.name); if (!SystemKeyspace.isViewStatusReplicated(ksname, viewName)) updateDistributed(ksname, viewName, localHostId); return; @@ -120,7 +119,7 @@ public class ViewBuilder extends CompactionInfo.Holder Function<org.apache.cassandra.db.lifecycle.View, Iterable<SSTableReader>> function; if (buildStatus == null) { - logger.debug("Starting new view build. flushing base table {}.{}", baseCfs.metadata.ksName, baseCfs.name); + logger.debug("Starting new view build. flushing base table {}.{}", baseCfs.metadata.keyspace, baseCfs.name); lastToken = null; //We don't track the generation number anymore since if a rebuild is stopped and @@ -132,7 +131,7 @@ public class ViewBuilder extends CompactionInfo.Holder else { lastToken = buildStatus.right; - logger.debug("Resuming view build from token {}. flushing base table {}.{}", lastToken, baseCfs.metadata.ksName, baseCfs.name); + logger.debug("Resuming view build from token {}. flushing base table {}.{}", lastToken, baseCfs.metadata.keyspace, baseCfs.name); } baseCfs.forceBlockingFlush();
