You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/10/14 00:55:51 UTC
[1/5] git commit: typos
Updated Branches:
refs/heads/cassandra-1.2 7290abd19 -> 1797b49e2
refs/heads/cassandra-2.0 53b2d9d55 -> a7c654122
refs/heads/trunk 2531424c0 -> 1353e0a37
typos
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4284d98a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4284d98a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4284d98a
Branch: refs/heads/cassandra-2.0
Commit: 4284d98ae4f2cc47af8fead1222ddeb81552b656
Parents: 639c01a
Author: Brandon Williams <br...@apache.org>
Authored: Sun Oct 13 17:52:28 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sun Oct 13 17:52:28 2013 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/statements/CreateUserStatement.java | 2 +-
.../org/apache/cassandra/cql3/statements/DropUserStatement.java | 2 +-
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4284d98a/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java
index df3a5e7..a82b38d 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java
@@ -57,7 +57,7 @@ public class CreateUserStatement extends AuthenticationStatement
public void checkAccess(ClientState state) throws UnauthorizedException
{
if (!state.getUser().isSuper())
- throw new UnauthorizedException("Only superusers are allowed to perfrom CREATE USER queries");
+ throw new UnauthorizedException("Only superusers are allowed to perform CREATE USER queries");
}
public ResultMessage execute(ClientState state) throws RequestValidationException, RequestExecutionException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4284d98a/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java b/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java
index d55566c..0894db0 100644
--- a/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java
@@ -52,7 +52,7 @@ public class DropUserStatement extends AuthenticationStatement
public void checkAccess(ClientState state) throws UnauthorizedException
{
if (!state.getUser().isSuper())
- throw new UnauthorizedException("Only superusers are allowed to perfrom DROP USER queries");
+ throw new UnauthorizedException("Only superusers are allowed to perform DROP USER queries");
}
public ResultMessage execute(ClientState state) throws RequestValidationException, RequestExecutionException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4284d98a/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index cdb0bd6..f195285 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -384,7 +384,7 @@ public class StorageProxy implements StorageProxyMBean
return responseHandler;
}
- // same as above except does not initiate writes (but does perfrom availability checks).
+ // same as above except does not initiate writes (but does perform availability checks).
private static WriteResponseHandlerWrapper wrapResponseHandler(RowMutation mutation, ConsistencyLevel consistency_level, WriteType writeType)
{
AbstractReplicationStrategy rs = Table.open(mutation.getTable()).getReplicationStrategy();
[2/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9a906c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9a906c4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9a906c4
Branch: refs/heads/cassandra-2.0
Commit: c9a906c473d14f2c51a0541de4388e5dd64231ed
Parents: 3e7ebf8 4284d98
Author: Brandon Williams <br...@apache.org>
Authored: Sun Oct 13 17:52:36 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sun Oct 13 17:52:36 2013 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/statements/CreateUserStatement.java | 2 +-
.../org/apache/cassandra/cql3/statements/DropUserStatement.java | 2 +-
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9a906c4/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index cac38a3,f195285..259d2f5
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -736,14 -384,14 +736,14 @@@ public class StorageProxy implements St
return responseHandler;
}
- // same as above except does not initiate writes (but does perfrom availability checks).
+ // same as above except does not initiate writes (but does perform availability checks).
private static WriteResponseHandlerWrapper wrapResponseHandler(RowMutation mutation, ConsistencyLevel consistency_level, WriteType writeType)
{
- AbstractReplicationStrategy rs = Table.open(mutation.getTable()).getReplicationStrategy();
- String table = mutation.getTable();
+ AbstractReplicationStrategy rs = Keyspace.open(mutation.getKeyspaceName()).getReplicationStrategy();
+ String keyspaceName = mutation.getKeyspaceName();
Token tk = StorageService.getPartitioner().getToken(mutation.key());
- List<InetAddress> naturalEndpoints = StorageService.instance.getNaturalEndpoints(table, tk);
- Collection<InetAddress> pendingEndpoints = StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk, table);
+ List<InetAddress> naturalEndpoints = StorageService.instance.getNaturalEndpoints(keyspaceName, tk);
+ Collection<InetAddress> pendingEndpoints = StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk, keyspaceName);
AbstractWriteResponseHandler responseHandler = rs.getWriteResponseHandler(naturalEndpoints, pendingEndpoints, consistency_level, null, writeType);
return new WriteResponseHandlerWrapper(responseHandler, mutation);
}
[3/5] git commit: typos
Posted by br...@apache.org.
typos
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1353e0a3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1353e0a3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1353e0a3
Branch: refs/heads/trunk
Commit: 1353e0a3719a4dc30b7a59f468a58340416cdca2
Parents: 2531424
Author: Brandon Williams <br...@apache.org>
Authored: Sun Oct 13 17:52:28 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sun Oct 13 17:53:10 2013 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/statements/CreateUserStatement.java | 2 +-
.../org/apache/cassandra/cql3/statements/DropUserStatement.java | 2 +-
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1353e0a3/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java
index df3a5e7..a82b38d 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java
@@ -57,7 +57,7 @@ public class CreateUserStatement extends AuthenticationStatement
public void checkAccess(ClientState state) throws UnauthorizedException
{
if (!state.getUser().isSuper())
- throw new UnauthorizedException("Only superusers are allowed to perfrom CREATE USER queries");
+ throw new UnauthorizedException("Only superusers are allowed to perform CREATE USER queries");
}
public ResultMessage execute(ClientState state) throws RequestValidationException, RequestExecutionException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1353e0a3/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java b/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java
index d55566c..0894db0 100644
--- a/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java
@@ -52,7 +52,7 @@ public class DropUserStatement extends AuthenticationStatement
public void checkAccess(ClientState state) throws UnauthorizedException
{
if (!state.getUser().isSuper())
- throw new UnauthorizedException("Only superusers are allowed to perfrom DROP USER queries");
+ throw new UnauthorizedException("Only superusers are allowed to perform DROP USER queries");
}
public ResultMessage execute(ClientState state) throws RequestValidationException, RequestExecutionException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1353e0a3/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index d932130..349e51b 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -740,7 +740,7 @@ public class StorageProxy implements StorageProxyMBean
return responseHandler;
}
- // same as above except does not initiate writes (but does perfrom availability checks).
+ // same as above except does not initiate writes (but does perform availability checks).
private static WriteResponseHandlerWrapper wrapResponseHandler(RowMutation mutation, ConsistencyLevel consistency_level, WriteType writeType)
{
AbstractReplicationStrategy rs = Keyspace.open(mutation.getKeyspaceName()).getReplicationStrategy();
[4/5] git commit: Merge branch 'cassandra-2.0' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7c65412
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7c65412
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7c65412
Branch: refs/heads/cassandra-2.0
Commit: a7c6541220f6e3673075284bd5e398caa9641a54
Parents: c9a906c 53b2d9d
Author: Brandon Williams <br...@apache.org>
Authored: Sun Oct 13 17:53:17 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sun Oct 13 17:53:17 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
NEWS.txt | 3 +-
.../org/apache/cassandra/config/CFMetaData.java | 10 ++++--
.../apache/cassandra/db/ColumnFamilyStore.java | 8 ++---
.../AbstractSimplePerColumnSecondaryIndex.java | 19 ------------
.../apache/cassandra/utils/StatusLogger.java | 2 +-
.../org/apache/cassandra/stress/Session.java | 32 ++++++++++++++++++--
7 files changed, 44 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
[5/5] git commit: typos
Posted by br...@apache.org.
typos
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1797b49e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1797b49e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1797b49e
Branch: refs/heads/cassandra-1.2
Commit: 1797b49e215b5710cda540d734a08429840ac788
Parents: 7290abd
Author: Brandon Williams <br...@apache.org>
Authored: Sun Oct 13 17:52:28 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sun Oct 13 17:54:17 2013 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/statements/CreateUserStatement.java | 2 +-
.../org/apache/cassandra/cql3/statements/DropUserStatement.java | 2 +-
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1797b49e/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java
index df3a5e7..a82b38d 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateUserStatement.java
@@ -57,7 +57,7 @@ public class CreateUserStatement extends AuthenticationStatement
public void checkAccess(ClientState state) throws UnauthorizedException
{
if (!state.getUser().isSuper())
- throw new UnauthorizedException("Only superusers are allowed to perfrom CREATE USER queries");
+ throw new UnauthorizedException("Only superusers are allowed to perform CREATE USER queries");
}
public ResultMessage execute(ClientState state) throws RequestValidationException, RequestExecutionException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1797b49e/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java b/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java
index d55566c..0894db0 100644
--- a/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/DropUserStatement.java
@@ -52,7 +52,7 @@ public class DropUserStatement extends AuthenticationStatement
public void checkAccess(ClientState state) throws UnauthorizedException
{
if (!state.getUser().isSuper())
- throw new UnauthorizedException("Only superusers are allowed to perfrom DROP USER queries");
+ throw new UnauthorizedException("Only superusers are allowed to perform DROP USER queries");
}
public ResultMessage execute(ClientState state) throws RequestValidationException, RequestExecutionException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1797b49e/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index cdb0bd6..f195285 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -384,7 +384,7 @@ public class StorageProxy implements StorageProxyMBean
return responseHandler;
}
- // same as above except does not initiate writes (but does perfrom availability checks).
+ // same as above except does not initiate writes (but does perform availability checks).
private static WriteResponseHandlerWrapper wrapResponseHandler(RowMutation mutation, ConsistencyLevel consistency_level, WriteType writeType)
{
AbstractReplicationStrategy rs = Table.open(mutation.getTable()).getReplicationStrategy();