natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into cassandra-2.2 

Conflicts:
	CHANGES.txt
This commit is contained in:
Tyler Hobbs 2015-05-29 14:16:43 -05:00
parent 06e742fc7f f294ee1272
commit c34a329216
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -12,6 +12,8 @@
* 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)

9
src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
View File

@ -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;