cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Tue, 01 Apr 2014 05:44:36 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/cassandra-2.1
Commit: 26191ca6968a21bf4cc1dd0a2dd1e5eef132e47c
Parents: e5639f4 a90b98e
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Tue Apr 1 07:43:13 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Tue Apr 1 07:43:13 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                         |  2 ++
 .../db/compaction/AbstractCompactionStrategy.java   |  2 ++
 .../cassandra/db/compaction/CompactionManager.java  |  2 +-
 .../db/compaction/LeveledCompactionStrategy.java    | 16 ++++++++++++++++
 .../db/compaction/SizeTieredCompactionStrategy.java |  6 ++++++
 .../apache/cassandra/db/compaction/Upgrader.java    |  2 ++
 6 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26191ca6/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26191ca6/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26191ca6/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26191ca6/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26191ca6/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26191ca6/src/java/org/apache/cassandra/db/compaction/Upgrader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/Upgrader.java
index dfadfcd,98a55e9..740a3eb
--- a/src/java/org/apache/cassandra/db/compaction/Upgrader.java
+++ b/src/java/org/apache/cassandra/db/compaction/Upgrader.java
@@@ -75,9 -75,10 +76,10 @@@ public class Upgrade
                  if (new File(sstable.descriptor.withGeneration(i).filenameFor(Component.DATA)).exists())
                      sstableMetadataCollector.addAncestor(i);
              }
+             sstableMetadataCollector.sstableLevel(sstable.getSSTableLevel());
          }
  
 -        return new SSTableWriter(cfs.getTempSSTablePath(directory), estimatedRows, cfs.metadata,
cfs.partitioner, sstableMetadataCollector);
 +        return new SSTableWriter(cfs.getTempSSTablePath(directory), estimatedRows, repairedAt,
cfs.metadata, cfs.partitioner, sstableMetadataCollector);
      }
  
      public void upgrade()


Mime
View raw message