You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/02/01 23:11:49 UTC

[1/6] cassandra git commit: Fix isClientMode check in Keyspace

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 d0005a83e -> 2dd6944f1
  refs/heads/cassandra-2.1 9c38a103b -> 2a283e10f
  refs/heads/trunk 97d7d139f -> 6e9aec312


Fix isClientMode check in Keyspace

patch by Jeremiah Jordan; reviewed by yukim for CASSANDRA-8687


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

Branch: refs/heads/cassandra-2.0
Commit: 2dd6944f1cf9236e2ca63f6a1fa67b020c175f8f
Parents: d0005a8
Author: Jeremiah Jordan <je...@datastax.com>
Authored: Sun Feb 1 16:07:59 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Sun Feb 1 16:07:59 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                    | 1 +
 src/java/org/apache/cassandra/db/Keyspace.java | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd6944f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4754867..9e9b772 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
    (CASSANDRA-8619)
  * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
  * Add batch remove iterator to ABSC (CASSANDRA-8414, 8666)
+ * Fix isClientMode check in Keyspace (CASSANDRA-8687)
 
 
 2.0.12:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd6944f/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Keyspace.java b/src/java/org/apache/cassandra/db/Keyspace.java
index 28045f4..38b7c2b 100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@ -30,10 +30,7 @@ import com.google.common.collect.Iterables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.config.KSMetaData;
-import org.apache.cassandra.config.Schema;
+import org.apache.cassandra.config.*;
 import org.apache.cassandra.db.commitlog.CommitLog;
 import org.apache.cassandra.db.filter.QueryFilter;
 import org.apache.cassandra.db.index.SecondaryIndex;
@@ -69,7 +66,7 @@ public class Keyspace
     // proper directories here as well as in CassandraDaemon.
     static
     {
-        if (!StorageService.instance.isClientMode())
+        if (!(Config.isClientMode() || StorageService.instance.isClientMode()))
             DatabaseDescriptor.createAllDirectories();
     }

[4/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by yu...@apache.org.
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/2a283e10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a283e10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a283e10

Branch: refs/heads/trunk
Commit: 2a283e10f9183d9a0138e7622ca135cd3b001ac2
Parents: 9c38a10 2dd6944
Author: Yuki Morishita <yu...@apache.org>
Authored: Sun Feb 1 16:10:31 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Sun Feb 1 16:10:31 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                    | 2 +-
 src/java/org/apache/cassandra/db/Keyspace.java | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a283e10/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 129e1c9,9e9b772..40d844c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -90,7 -5,10 +90,7 @@@ Merged from 2.0
     (CASSANDRA-8619)
   * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
   * Add batch remove iterator to ABSC (CASSANDRA-8414, 8666)
-  * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
+  * Fix isClientMode check in Keyspace (CASSANDRA-8687)
 -
 -
 -2.0.12:
   * Use more efficient slice size for querying internal secondary
     index tables (CASSANDRA-8550)
   * Fix potentially returning deleted rows with range tombstone (CASSANDRA-8558)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a283e10/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/Keyspace.java
index d27424e,38b7c2b..d92eea4
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@@ -35,12 -30,8 +35,9 @@@ import com.google.common.collect.Iterab
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
- import org.apache.cassandra.config.CFMetaData;
- import org.apache.cassandra.config.DatabaseDescriptor;
- import org.apache.cassandra.config.KSMetaData;
- import org.apache.cassandra.config.Schema;
+ import org.apache.cassandra.config.*;
  import org.apache.cassandra.db.commitlog.CommitLog;
 +import org.apache.cassandra.db.commitlog.ReplayPosition;
  import org.apache.cassandra.db.filter.QueryFilter;
  import org.apache.cassandra.db.index.SecondaryIndex;
  import org.apache.cassandra.db.index.SecondaryIndexManager;

[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by yu...@apache.org.
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/2a283e10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a283e10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a283e10

Branch: refs/heads/cassandra-2.1
Commit: 2a283e10f9183d9a0138e7622ca135cd3b001ac2
Parents: 9c38a10 2dd6944
Author: Yuki Morishita <yu...@apache.org>
Authored: Sun Feb 1 16:10:31 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Sun Feb 1 16:10:31 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                    | 2 +-
 src/java/org/apache/cassandra/db/Keyspace.java | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a283e10/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 129e1c9,9e9b772..40d844c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -90,7 -5,10 +90,7 @@@ Merged from 2.0
     (CASSANDRA-8619)
   * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
   * Add batch remove iterator to ABSC (CASSANDRA-8414, 8666)
-  * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
+  * Fix isClientMode check in Keyspace (CASSANDRA-8687)
 -
 -
 -2.0.12:
   * Use more efficient slice size for querying internal secondary
     index tables (CASSANDRA-8550)
   * Fix potentially returning deleted rows with range tombstone (CASSANDRA-8558)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a283e10/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/Keyspace.java
index d27424e,38b7c2b..d92eea4
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@@ -35,12 -30,8 +35,9 @@@ import com.google.common.collect.Iterab
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
- import org.apache.cassandra.config.CFMetaData;
- import org.apache.cassandra.config.DatabaseDescriptor;
- import org.apache.cassandra.config.KSMetaData;
- import org.apache.cassandra.config.Schema;
+ import org.apache.cassandra.config.*;
  import org.apache.cassandra.db.commitlog.CommitLog;
 +import org.apache.cassandra.db.commitlog.ReplayPosition;
  import org.apache.cassandra.db.filter.QueryFilter;
  import org.apache.cassandra.db.index.SecondaryIndex;
  import org.apache.cassandra.db.index.SecondaryIndexManager;

[6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 6e9aec3125d5e549669e07f0c4b3ff22ffc9d8c2
Parents: 97d7d13 2a283e1
Author: Yuki Morishita <yu...@apache.org>
Authored: Sun Feb 1 16:10:40 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Sun Feb 1 16:10:40 2015 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------

[3/6] cassandra git commit: Fix isClientMode check in Keyspace

Posted by yu...@apache.org.
Fix isClientMode check in Keyspace

patch by Jeremiah Jordan; reviewed by yukim for CASSANDRA-8687


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

Branch: refs/heads/trunk
Commit: 2dd6944f1cf9236e2ca63f6a1fa67b020c175f8f
Parents: d0005a8
Author: Jeremiah Jordan <je...@datastax.com>
Authored: Sun Feb 1 16:07:59 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Sun Feb 1 16:07:59 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                    | 1 +
 src/java/org/apache/cassandra/db/Keyspace.java | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd6944f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4754867..9e9b772 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
    (CASSANDRA-8619)
  * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
  * Add batch remove iterator to ABSC (CASSANDRA-8414, 8666)
+ * Fix isClientMode check in Keyspace (CASSANDRA-8687)
 
 
 2.0.12:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd6944f/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Keyspace.java b/src/java/org/apache/cassandra/db/Keyspace.java
index 28045f4..38b7c2b 100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@ -30,10 +30,7 @@ import com.google.common.collect.Iterables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.config.KSMetaData;
-import org.apache.cassandra.config.Schema;
+import org.apache.cassandra.config.*;
 import org.apache.cassandra.db.commitlog.CommitLog;
 import org.apache.cassandra.db.filter.QueryFilter;
 import org.apache.cassandra.db.index.SecondaryIndex;
@@ -69,7 +66,7 @@ public class Keyspace
     // proper directories here as well as in CassandraDaemon.
     static
     {
-        if (!StorageService.instance.isClientMode())
+        if (!(Config.isClientMode() || StorageService.instance.isClientMode()))
             DatabaseDescriptor.createAllDirectories();
     }

[2/6] cassandra git commit: Fix isClientMode check in Keyspace

Posted by yu...@apache.org.
Fix isClientMode check in Keyspace

patch by Jeremiah Jordan; reviewed by yukim for CASSANDRA-8687


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

Branch: refs/heads/cassandra-2.1
Commit: 2dd6944f1cf9236e2ca63f6a1fa67b020c175f8f
Parents: d0005a8
Author: Jeremiah Jordan <je...@datastax.com>
Authored: Sun Feb 1 16:07:59 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Sun Feb 1 16:07:59 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                    | 1 +
 src/java/org/apache/cassandra/db/Keyspace.java | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd6944f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4754867..9e9b772 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
    (CASSANDRA-8619)
  * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
  * Add batch remove iterator to ABSC (CASSANDRA-8414, 8666)
+ * Fix isClientMode check in Keyspace (CASSANDRA-8687)
 
 
 2.0.12:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd6944f/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Keyspace.java b/src/java/org/apache/cassandra/db/Keyspace.java
index 28045f4..38b7c2b 100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@ -30,10 +30,7 @@ import com.google.common.collect.Iterables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.config.KSMetaData;
-import org.apache.cassandra.config.Schema;
+import org.apache.cassandra.config.*;
 import org.apache.cassandra.db.commitlog.CommitLog;
 import org.apache.cassandra.db.filter.QueryFilter;
 import org.apache.cassandra.db.index.SecondaryIndex;
@@ -69,7 +66,7 @@ public class Keyspace
     // proper directories here as well as in CassandraDaemon.
     static
     {
-        if (!StorageService.instance.isClientMode())
+        if (!(Config.isClientMode() || StorageService.instance.isClientMode()))
             DatabaseDescriptor.createAllDirectories();
     }