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 2014/07/24 19:38:03 UTC
[1/3] git commit: Give read access to system.schema_usertypes to all
authenticated users
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.0 c7b7a2493 -> 33719e759
Give read access to system.schema_usertypes to all authenticated users
patch by Mike Adamson; reviewed by Aleksey Yeschenko for CASSANDRA-7578
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/465d520c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/465d520c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/465d520c
Branch: refs/heads/cassandra-2.1.0
Commit: 465d520cc2053abbc08c5b272c820de35c9392fa
Parents: c7b7a24
Author: Mike Adamson <ma...@datastax.com>
Authored: Mon Jul 21 14:36:01 2014 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jul 24 20:30:07 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 3 +++
src/java/org/apache/cassandra/service/ClientState.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/465d520c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index caef095..78b0186 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,10 @@
2.1.0-final
+ * Give read access to system.schema_usertypes to all authenticated users
+ (CASSANDRA-7578)
* Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
* Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
+
2.1.0-rc4
* Fix word count hadoop example (CASSANDRA-7200)
* Updated memtable_cleanup_threshold and memtable_flush_writers defaults
http://git-wip-us.apache.org/repos/asf/cassandra/blob/465d520c/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ClientState.java b/src/java/org/apache/cassandra/service/ClientState.java
index be3b895..c0396cb 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -67,7 +67,8 @@ public class ClientState
SystemKeyspace.PEERS_CF,
SystemKeyspace.SCHEMA_KEYSPACES_CF,
SystemKeyspace.SCHEMA_COLUMNFAMILIES_CF,
- SystemKeyspace.SCHEMA_COLUMNS_CF };
+ SystemKeyspace.SCHEMA_COLUMNS_CF,
+ SystemKeyspace.SCHEMA_USER_TYPES_CF};
for (String cf : cfs)
READABLE_SYSTEM_RESOURCES.add(DataResource.columnFamily(Keyspace.SYSTEM_KS, cf));
[3/3] git commit: Fix native protocol drop user type notification
Posted by al...@apache.org.
Fix native protocol drop user type notification
patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-7571
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/33719e75
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33719e75
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33719e75
Branch: refs/heads/cassandra-2.1.0
Commit: 33719e759aa600149b4b1286c63e4f895a920b4e
Parents: 4f6e108
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Jul 19 00:19:34 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jul 24 20:36:50 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/DefsTables.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33719e75/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7117a77..3776319 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.0-final
+ * Fix native protocol drop user type notification (CASSANDRA-7571)
* Give read access to system.schema_usertypes to all authenticated users
(CASSANDRA-7578)
* Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33719e75/src/java/org/apache/cassandra/db/DefsTables.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DefsTables.java b/src/java/org/apache/cassandra/db/DefsTables.java
index 98ced8d..96327c4 100644
--- a/src/java/org/apache/cassandra/db/DefsTables.java
+++ b/src/java/org/apache/cassandra/db/DefsTables.java
@@ -537,7 +537,7 @@ public class DefsTables
ksm.userTypes.removeType(ut);
if (!StorageService.instance.isClientMode())
- MigrationManager.instance.notifyUpdateUserType(ut);
+ MigrationManager.instance.notifyDropUserType(ut);
}
private static KSMetaData makeNewKeyspaceDefinition(KSMetaData ksm, CFMetaData toExclude)
[2/3] git commit: Fix ReversedType(DateType) mapping to native
protocol
Posted by al...@apache.org.
Fix ReversedType(DateType) mapping to native protocol
patch by Karl Rieb; reviewed by Aleksey Yeschenko for CASSANDRA-7576
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/4f6e108e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f6e108e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f6e108e
Branch: refs/heads/cassandra-2.1.0
Commit: 4f6e108e146f5226a6a20ad83fb5c46c7d18d046
Parents: 465d520
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Jul 22 01:42:24 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jul 24 20:33:49 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/transport/DataType.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f6e108e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 78b0186..7117a77 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,8 @@
(CASSANDRA-7578)
* Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
* Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
+Merged from 2.0:
+ * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
2.1.0-rc4
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f6e108e/src/java/org/apache/cassandra/transport/DataType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/DataType.java b/src/java/org/apache/cassandra/transport/DataType.java
index 0710645..a45d7ce 100644
--- a/src/java/org/apache/cassandra/transport/DataType.java
+++ b/src/java/org/apache/cassandra/transport/DataType.java
@@ -202,8 +202,9 @@ public enum DataType implements OptionCodec.Codecable<DataType>
// shouldn't have to care about it.
if (type instanceof ReversedType)
type = ((ReversedType)type).baseType;
+
// For compatibility sake, we still return DateType as the timestamp type in resultSet metadata (#5723)
- else if (type instanceof DateType)
+ if (type instanceof DateType)
type = TimestampType.instance;
DataType dt = dataTypeMap.get(type);