cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [12/12] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Tue, 28 Jul 2015 23:56:45 GMT
Merge branch 'cassandra-2.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e75d5a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e75d5a6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e75d5a6

Branch: refs/heads/trunk
Commit: 3e75d5a627097b82617e3e7b179f8db289485329
Parents: 59a2861 a96b207
Author: Yuki Morishita <yukim@apache.org>
Authored: Tue Jul 28 16:52:31 2015 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Tue Jul 28 16:52:31 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../apache/cassandra/db/ColumnFamilyStore.java  |  3 ++-
 .../io/sstable/format/SSTableReader.java        | 28 ++++++++++++--------
 3 files changed, 21 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e75d5a6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2db4115,4717fca..2e00f3c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -31,8 -6,8 +31,9 @@@ Merged from 2.1
   * Add consistency level to tracing ouput (CASSANDRA-9827)
  Merged from 2.0:
   * Log when messages are dropped due to cross_node_timeout (CASSANDRA-9793)
+  * Don't track hotness when opening from snapshot for validation (CASSANDRA-9382)
  
 +
  2.2.0
   * Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795) 
   * Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e75d5a6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e75d5a6/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
index e1a9cdc,0c4b797..e9ac200
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
@@@ -415,10 -411,10 +420,10 @@@ public abstract class SSTableReader ext
          {
              if (!sstable.loadSummary(ibuilder, dbuilder))
                  sstable.buildSummary(false, ibuilder, dbuilder, false, Downsampling.BASE_SAMPLING_LEVEL);
 -            sstable.ifile = ibuilder.complete(sstable.descriptor.filenameFor(Component.PRIMARY_INDEX));
 -            sstable.dfile = dbuilder.complete(sstable.descriptor.filenameFor(Component.DATA));
 +            sstable.ifile = ibuilder.buildIndex(sstable.descriptor, sstable.indexSummary);
 +            sstable.dfile = dbuilder.buildData(sstable.descriptor, statsMetadata);
              sstable.bf = FilterFactory.AlwaysPresent;
-             sstable.setup(true);
+             sstable.setup(false);
              return sstable;
          }
      }
@@@ -2119,9 -2021,10 +2125,9 @@@
              this.dfile = reader.dfile;
              this.ifile = reader.ifile;
              // get a new reference to the shared descriptor-type tidy
 -            this.typeRef = DescriptorTypeTidy.get(reader);
 -            this.type = typeRef.get();
 -            this.global = type.globalRef.get();
 +            this.globalRef = GlobalTidy.get(reader);
 +            this.global = globalRef.get();
-             if (!isOffline)
+             if (trackHotness)
                  global.ensureReadMeter();
          }
  


Mime
View raw message