cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9
Date Thu, 21 Jul 2016 14:04:01 GMT
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/cassandra-3.9
Commit: 5e111e64d065415c128d49086b0a91bfda6f2fca
Parents: 584eae3 864e009
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu Jul 21 15:03:45 2016 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu Jul 21 15:03:45 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                             |  1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e111e64/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index dc7a76e,eb73da2..2b86935
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.9
 +3.9
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114)
   * Respond with v1/v2 protocol header when responding to driver that attempts
     to connect with too low of a protocol version (CASSANDRA-11464)
   * NullPointerExpception when reading/compacting table (CASSANDRA-11988)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e111e64/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 0a3ad52,f34a2d5..9088105
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -604,9 -578,10 +604,10 @@@ public class ColumnFamilyStore implemen
       * Removes unnecessary files from the cf directory at startup: these include temp files,
orphans, zero-length files
       * and compacted sstables. Files that cannot be recognized will be ignored.
       */
 -    public static void scrubDataDirectories(CFMetaData metadata)
 +    public static void scrubDataDirectories(CFMetaData metadata) throws StartupException
      {
          Directories directories = new Directories(metadata, initialDirectories);
+         Set<File> cleanedDirectories = new HashSet<>();
  
           // clear ephemeral snapshots that were not properly cleared last session (CASSANDRA-7357)
          clearEphemeralSnapshots(directories);


Mime
View raw message