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 2015/08/25 11:48:16 UTC
[1/4] cassandra git commit: Avoid returning Permission.NONE when
failing to query users table
Repository: cassandra
Updated Branches:
refs/heads/trunk 5d1102146 -> 676054a55
Avoid returning Permission.NONE when failing to query users table
patch by Vishy Kasar; reviewed by Sankalp Kohli for CASSANDRA-10168
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/978660d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/978660d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/978660d9
Branch: refs/heads/trunk
Commit: 978660d99806d4894fe360cf415e07abdaf8803a
Parents: f5d0595
Author: Vishy Kasar <vk...@apple.com>
Authored: Tue Aug 25 12:41:44 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 25 12:45:10 2015 +0300
----------------------------------------------------------------------
CHANGES.txt | 3 +--
src/java/org/apache/cassandra/auth/CassandraAuthorizer.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/978660d9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2d11d55..d6a0af9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,6 @@
2.1.9
* (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
- * Avoid returning Permission.None when system_auth.permissions table does not
- exist (CASSANDRA-10168)
+ * Avoid returning Permission.NONE when failing to query users table (CASSANDRA-10168)
* (cqlsh) Allow encoding to be set through command line (CASSANDRA-10004)
* Add new JMX methods to change local compaction strategy (CASSANDRA-9965)
* Write hints for paxos commits (CASSANDRA-7342)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/978660d9/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
index 20060c0..49eefb1 100644
--- a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
+++ b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
@@ -83,7 +83,7 @@ public class CassandraAuthorizer implements IAuthorizer
catch (RequestExecutionException e)
{
logger.warn("CassandraAuthorizer failed to authorize {} for {}", user, resource);
- return Permission.NONE;
+ throw new RuntimeException(e);
}
if (result.isEmpty() || !result.one().has(PERMISSIONS))
[3/4] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfb7ec17
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfb7ec17
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfb7ec17
Branch: refs/heads/trunk
Commit: cfb7ec17ffaedd0e8c65c6e1e3df78a7618a3c88
Parents: ee9807e d1d10fa
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Aug 25 12:48:16 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 25 12:48:16 2015 +0300
----------------------------------------------------------------------
CHANGES.txt | 3 +--
src/java/org/apache/cassandra/auth/CassandraAuthorizer.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb7ec17/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b14a5a6,34615db..508f869
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,39 -1,6 +1,38 @@@
-2.2.1
+3.0.0-beta2
+ * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061)
+ * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060)
+ * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
+ * Fix sstablerepairedset (CASSANDRA-10132)
+Merged from 2.2:
+ * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
- * Avoid returning Permission.None when system_auth.permissions table does not
- exist (CASSANDRA-10168)
++ * Avoid returning Permission.NONE when failing to query users table (CASSANDRA-10168)
* add CLEAR cqlsh command (CASSANDRA-10086)
* Support string literals as Role names for compatibility (CASSANDRA-10135)
+
+
+3.0.0-beta1
+ * Redesign secondary index API (CASSANDRA-9459, 7771, 9041)
+ * Fix throwing ReadFailure instead of ReadTimeout on range queries (CASSANDRA-10125)
+ * Rewrite hinted handoff (CASSANDRA-6230)
+ * Fix query on static compact tables (CASSANDRA-10093)
+ * Fix race during construction of commit log (CASSANDRA-10049)
+ * Add option to only purge repaired tombstones (CASSANDRA-6434)
+ * Change authorization handling for MVs (CASSANDRA-9927)
+ * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
+ * Fix row deletion bug for Materialized Views (CASSANDRA-10014)
+ * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704)
+ * Fix multiple slices on RowSearchers (CASSANDRA-10002)
+ * Fix bug in merging of collections (CASSANDRA-10001)
+ * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
+ * Repair improvements when using vnodes (CASSANDRA-5220)
+ * Disable scripted UDFs by default (CASSANDRA-9889)
+ * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
+ * Use byte to serialize MT hash length (CASSANDRA-9792)
+ * Replace usage of Adler32 with CRC32 (CASSANDRA-8684)
+ * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006)
+ * SequentialWriter should extend BufferedDataOutputStreamPlus (CASSANDRA-9500)
+ * Use the same repairedAt timestamp within incremental repair session (CASSANDRA-9111)
+Merged from 2.2:
* Allow count(*) and count(1) to be use as normal aggregation (CASSANDRA-10114)
* An NPE is thrown if the column name is unknown for an IN relation (CASSANDRA-10043)
* Apply commit_failure_policy to more errors on startup (CASSANDRA-9749)
[2/4] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1d10fae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1d10fae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1d10fae
Branch: refs/heads/trunk
Commit: d1d10fae008545b415bd72e68f63c983d44a8db7
Parents: 1992598 978660d
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Aug 25 12:45:51 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 25 12:45:51 2015 +0300
----------------------------------------------------------------------
CHANGES.txt | 3 +--
src/java/org/apache/cassandra/auth/CassandraAuthorizer.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1d10fae/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 664a23e,d6a0af9..34615db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,6 +1,19 @@@
-2.1.9
+2.2.1
+ * add CLEAR cqlsh command (CASSANDRA-10086)
+ * Support string literals as Role names for compatibility (CASSANDRA-10135)
+ * Allow count(*) and count(1) to be use as normal aggregation (CASSANDRA-10114)
+ * An NPE is thrown if the column name is unknown for an IN relation (CASSANDRA-10043)
+ * Apply commit_failure_policy to more errors on startup (CASSANDRA-9749)
+ * Fix histogram overflow exception (CASSANDRA-9973)
+ * Route gossip messages over dedicated socket (CASSANDRA-9237)
+ * Add checksum to saved cache files (CASSANDRA-9265)
+ * Log warning when using an aggregate without partition key (CASSANDRA-9737)
+ * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
+ * UDF / UDA execution time in trace (CASSANDRA-9723)
+ * Fix broken internode SSL (CASSANDRA-9884)
+Merged from 2.1:
* (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
- * Avoid returning Permission.None when system_auth.permissions table does not
- exist (CASSANDRA-10168)
+ * Avoid returning Permission.NONE when failing to query users table (CASSANDRA-10168)
* (cqlsh) Allow encoding to be set through command line (CASSANDRA-10004)
* Add new JMX methods to change local compaction strategy (CASSANDRA-9965)
* Write hints for paxos commits (CASSANDRA-7342)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1d10fae/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
index 7911acc,49eefb1..5cdea3f
--- a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
+++ b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
@@@ -89,9 -83,15 +89,9 @@@ public class CassandraAuthorizer implem
catch (RequestExecutionException e)
{
logger.warn("CassandraAuthorizer failed to authorize {} for {}", user, resource);
- return Permission.NONE;
+ throw new RuntimeException(e);
}
- if (result.isEmpty() || !result.one().has(PERMISSIONS))
- return Permission.NONE;
-
- Set<Permission> permissions = EnumSet.noneOf(Permission.class);
- for (String perm : result.one().getSet(PERMISSIONS, UTF8Type.instance))
- permissions.add(Permission.valueOf(perm));
return permissions;
}
[4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/676054a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/676054a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/676054a5
Branch: refs/heads/trunk
Commit: 676054a55aee1d06acf8e2e5ec89e0a97636020c
Parents: 5d11021 cfb7ec1
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Aug 25 12:48:54 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 25 12:48:54 2015 +0300
----------------------------------------------------------------------
CHANGES.txt | 3 +--
src/java/org/apache/cassandra/auth/CassandraAuthorizer.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/676054a5/CHANGES.txt
----------------------------------------------------------------------