You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2016/05/19 15:10:03 UTC
[1/3] cassandra git commit: Don't use static dataDirectories field in
Directories instances
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.7 b1cf0fe6b -> f294750f5
refs/heads/trunk da9bb0306 -> 74f41c9cc
Don't use static dataDirectories field in Directories instances
patch by Blake Eggleston; reviewed by Aleksey Yeschenko for CASSANDRA-11647
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f294750f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f294750f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f294750f
Branch: refs/heads/cassandra-3.7
Commit: f294750f535f2a73c71eba589dcaf19074f91bbf
Parents: b1cf0fe
Author: Blake Eggleston <bd...@gmail.com>
Authored: Mon Apr 25 13:06:30 2016 -0700
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu May 19 16:09:00 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Directories.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f294750f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f96c31a..4c50980 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.7
+ * Don't use static dataDirectories field in Directories instances (CASSANDRA-11647)
Merged from 3.0:
* Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
* Allow compaction strategies to disable early open (CASSANDRA-11754)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f294750f/src/java/org/apache/cassandra/db/Directories.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Directories.java b/src/java/org/apache/cassandra/db/Directories.java
index 3898180..7876959 100644
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@ -296,7 +296,7 @@ public class Directories
{
if (directory != null)
{
- for (DataDirectory dataDirectory : dataDirectories)
+ for (DataDirectory dataDirectory : paths)
{
if (directory.getAbsolutePath().startsWith(dataDirectory.location.getAbsolutePath()))
return dataDirectory;
@@ -464,7 +464,7 @@ public class Directories
public DataDirectory[] getWriteableLocations()
{
List<DataDirectory> nonBlacklistedDirs = new ArrayList<>();
- for (DataDirectory dir : dataDirectories)
+ for (DataDirectory dir : paths)
{
if (!BlacklistedDirectories.isUnwritable(dir.location))
nonBlacklistedDirs.add(dir);
[3/3] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74f41c9c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74f41c9c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74f41c9c
Branch: refs/heads/trunk
Commit: 74f41c9cc61959748aa2cb6b42186ecfd8587796
Parents: da9bb03 f294750
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu May 19 16:09:23 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu May 19 16:09:23 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Directories.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74f41c9c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 854ae53,4c50980..4a5dbf4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
+3.8
+ * Support older ant versions (CASSANDRA-11807)
+ * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623)
+ * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546)
+ * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
+ * Faster streaming (CASSANDRA-9766)
+ * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425)
+
+
3.7
+ * Don't use static dataDirectories field in Directories instances (CASSANDRA-11647)
Merged from 3.0:
* Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
* Allow compaction strategies to disable early open (CASSANDRA-11754)
[2/3] cassandra git commit: Don't use static dataDirectories field in
Directories instances
Posted by al...@apache.org.
Don't use static dataDirectories field in Directories instances
patch by Blake Eggleston; reviewed by Aleksey Yeschenko for CASSANDRA-11647
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f294750f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f294750f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f294750f
Branch: refs/heads/trunk
Commit: f294750f535f2a73c71eba589dcaf19074f91bbf
Parents: b1cf0fe
Author: Blake Eggleston <bd...@gmail.com>
Authored: Mon Apr 25 13:06:30 2016 -0700
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu May 19 16:09:00 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Directories.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f294750f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f96c31a..4c50980 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.7
+ * Don't use static dataDirectories field in Directories instances (CASSANDRA-11647)
Merged from 3.0:
* Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
* Allow compaction strategies to disable early open (CASSANDRA-11754)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f294750f/src/java/org/apache/cassandra/db/Directories.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Directories.java b/src/java/org/apache/cassandra/db/Directories.java
index 3898180..7876959 100644
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@ -296,7 +296,7 @@ public class Directories
{
if (directory != null)
{
- for (DataDirectory dataDirectory : dataDirectories)
+ for (DataDirectory dataDirectory : paths)
{
if (directory.getAbsolutePath().startsWith(dataDirectory.location.getAbsolutePath()))
return dataDirectory;
@@ -464,7 +464,7 @@ public class Directories
public DataDirectory[] getWriteableLocations()
{
List<DataDirectory> nonBlacklistedDirs = new ArrayList<>();
- for (DataDirectory dir : dataDirectories)
+ for (DataDirectory dir : paths)
{
if (!BlacklistedDirectories.isUnwritable(dir.location))
nonBlacklistedDirs.add(dir);