You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/05/29 21:16:53 UTC
[1/2] cassandra git commit: Consistent error message for mixed
counters, non-counters
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 06e742fc7 -> c34a32921
Consistent error message for mixed counters, non-counters
Patch by Carl Yeksigian; reviewed by Tyler Hobbs for CASSANDRA-9492
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f294ee12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f294ee12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f294ee12
Branch: refs/heads/cassandra-2.2
Commit: f294ee12722d074006bb3a5bc72edf2b248b1d6b
Parents: e1a67a4
Author: Carl Yeksigian <ca...@apache.org>
Authored: Fri May 29 14:15:10 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri May 29 14:15:10 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/cql3/statements/CreateTableStatement.java | 9 ++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f294ee12/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 422f66e..0eb0751 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.1.6
+ * Consistent error message when a table mixes counter and non-counter
+ columns (CASSANDRA-9492)
* Avoid getting unreadable keys during anticompaction (CASSANDRA-9508)
* (cqlsh) Better float precision by default (CASSANDRA-9224)
* Improve estimated row count (CASSANDRA-9107)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f294ee12/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
index 17fd6fd..5c4e9e2 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
@@ -53,7 +53,14 @@ public class CreateTableStatement extends SchemaAlteringStatement
private boolean isDense;
- private final Map<ColumnIdentifier, AbstractType> columns = new HashMap<ColumnIdentifier, AbstractType>();
+ // use a TreeMap to preserve ordering across JDK versions (see CASSANDRA-9492)
+ private final Map<ColumnIdentifier, AbstractType> columns = new TreeMap<>(new Comparator<ColumnIdentifier>()
+ {
+ public int compare(ColumnIdentifier o1, ColumnIdentifier o2)
+ {
+ return o1.bytes.compareTo(o2.bytes);
+ }
+ });
private final Set<ColumnIdentifier> staticColumns;
private final CFPropDefs properties;
private final boolean ifNotExists;
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
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/c34a3292
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c34a3292
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c34a3292
Branch: refs/heads/cassandra-2.2
Commit: c34a329216ee2c73aed623a50501edc15bdea92c
Parents: 06e742f f294ee1
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri May 29 14:16:43 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri May 29 14:16:43 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/cql3/statements/CreateTableStatement.java | 9 ++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c34a3292/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index dc13bea,0eb0751..c73a188
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,6 +1,19 @@@
-2.1.6
+2.2
+ * ant test-all results incomplete when parsed (CASSANDRA-9463)
+ * Disallow frozen<> types in function arguments and return types for
+ clarity (CASSANDRA-9411)
+ * Static Analysis to warn on unsafe use of Autocloseable instances (CASSANDRA-9431)
+ * Update commitlog archiving examples now that commitlog segments are
+ not recycled (CASSANDRA-9350)
+ * Extend Transactional API to sstable lifecycle management (CASSANDRA-8568)
+ * (cqlsh) Add support for native protocol 4 (CASSANDRA-9399)
+ * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409)
+ * Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429)
+ * Add ability to stop compaction by ID (CASSANDRA-7207)
+ * Let CassandraVersion handle SNAPSHOT version (CASSANDRA-9438)
+Merged from 2.1:
+ * Consistent error message when a table mixes counter and non-counter
+ columns (CASSANDRA-9492)
* Avoid getting unreadable keys during anticompaction (CASSANDRA-9508)
* (cqlsh) Better float precision by default (CASSANDRA-9224)
* Improve estimated row count (CASSANDRA-9107)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c34a3292/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
----------------------------------------------------------------------