mirror of https://github.com/apache/cassandra
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts: CHANGES.txt NEWS.txt src/java/org/apache/cassandra/cql3/Lists.java
This commit is contained in:
commit
dc74ae67a6
|
|
@ -85,6 +85,7 @@
|
|||
* Fix sstableupgrade throws exception (CASSANDRA-8688)
|
||||
* Fix hang when repairing empty keyspace (CASSANDRA-8694)
|
||||
Merged from 2.0:
|
||||
* Fix reversal of list prepends (CASSANDRA-8733)
|
||||
* Prevent non-zero default_time_to_live on tables with counters
|
||||
(CASSANDRA-8678)
|
||||
* Fix SSTableSimpleUnsortedWriter ConcurrentModificationException
|
||||
|
|
|
|||
9
NEWS.txt
9
NEWS.txt
|
|
@ -13,6 +13,15 @@ restore snapshots created with the previous major version using the
|
|||
'sstableloader' tool. You can upgrade the file format of your snapshots
|
||||
using the provided 'sstableupgrade' tool.
|
||||
|
||||
2.1.3
|
||||
=====
|
||||
|
||||
Upgrading
|
||||
---------
|
||||
- Prepending a list to a list collection was erroneously resulting in
|
||||
the prepended list being reversed upon insertion. If you were depending
|
||||
on this buggy behavior, note that it has been corrected.
|
||||
|
||||
2.1.2
|
||||
=====
|
||||
|
||||
|
|
|
|||
|
|
@ -424,7 +424,7 @@ public abstract class Lists
|
|||
long time = PrecisionTime.REFERENCE_TIME - (System.currentTimeMillis() - PrecisionTime.REFERENCE_TIME);
|
||||
|
||||
List<ByteBuffer> toAdd = ((Lists.Value)value).elements;
|
||||
for (int i = 0; i < toAdd.size(); i++)
|
||||
for (int i = toAdd.size() - 1; i >= 0; i--)
|
||||
{
|
||||
PrecisionTime pt = PrecisionTime.getNext(time);
|
||||
ByteBuffer uuid = ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes(pt.millis, pt.nanos));
|
||||
|
|
|
|||
Loading…
Reference in New Issue