cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [8/8] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Date Tue, 04 Apr 2017 16:48:54 GMT
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/522ddba2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/522ddba2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/522ddba2

Branch: refs/heads/trunk
Commit: 522ddba275926761bf2870b67664cf318401f158
Parents: 633babf be96c28
Author: T Jake Luciani <jake@apache.org>
Authored: Tue Apr 4 12:48:01 2017 -0400
Committer: T Jake Luciani <jake@apache.org>
Committed: Tue Apr 4 12:48:01 2017 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |  5 +-
 src/java/org/apache/cassandra/db/view/View.java |  5 ++
 .../apache/cassandra/db/view/ViewBuilder.java   | 51 +++++++++--------
 .../org/apache/cassandra/cql3/ViewTest.java     | 59 ++++++++++++++++++++
 4 files changed, 95 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/522ddba2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3147eb9,1ca8733..ffe958d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -70,7 -19,11 +70,10 @@@
   * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
   * Address message coalescing regression (CASSANDRA-12676)
  Merged from 3.0:
+  * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
+  * Fix 2i page size calculation when there are no regular columns (CASSANDRA-13400)
+  * Fix the conversion of 2.X expired rows without regular column data (CASSANDRA-13395)
   * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020)
 - * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389)
   * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
   * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
   * Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/522ddba2/src/java/org/apache/cassandra/db/view/View.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/522ddba2/src/java/org/apache/cassandra/db/view/ViewBuilder.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/view/ViewBuilder.java
index 6250ae7,8e647ea..af86392
--- a/src/java/org/apache/cassandra/db/view/ViewBuilder.java
+++ b/src/java/org/apache/cassandra/db/view/ViewBuilder.java
@@@ -96,9 -101,10 +101,10 @@@ public class ViewBuilder extends Compac
  
      public void run()
      {
+         logger.debug("Starting view builder for {}.{}", baseCfs.metadata.ksName, view.name);
 -        logger.trace("Running view builder for {}.{}", baseCfs.metadata.ksName, view.name);
 +        logger.trace("Running view builder for {}.{}", baseCfs.metadata.keyspace, view.name);
          UUID localHostId = SystemKeyspace.getLocalHostId();
 -        String ksname = baseCfs.metadata.ksName, viewName = view.name;
 +        String ksname = baseCfs.metadata.keyspace, viewName = view.name;
  
          if (SystemKeyspace.isViewBuilt(ksname, viewName))
          {
@@@ -222,7 -225,8 +224,8 @@@
              if (lastToken == null || range.contains(lastToken))
                  rangesLeft = 0;
          }
+ 
 -        return new CompactionInfo(baseCfs.metadata, OperationType.VIEW_BUILD, rangesLeft,
rangesTotal, "ranges", compactionId);
 +        return new CompactionInfo(baseCfs.metadata(), OperationType.VIEW_BUILD, rangesLeft,
rangesTotal, "ranges", compactionId);
      }
  
      public void stop()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/522ddba2/test/unit/org/apache/cassandra/cql3/ViewTest.java
----------------------------------------------------------------------


Mime
View raw message