You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/10/21 10:24:20 UTC
[1/5] cassandra git commit: Uncomment mistakenly commented sanity
check
Repository: cassandra
Updated Branches:
refs/heads/trunk f8fa3a427 -> 2af041bdf
Uncomment mistakenly commented sanity check
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/79097d75
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79097d75
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/79097d75
Branch: refs/heads/trunk
Commit: 79097d75cd320eda9cf29cc56e254687b4a0162e
Parents: 615945d
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Oct 21 10:01:34 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Oct 21 10:01:34 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/io/sstable/format/big/BigTableWriter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/79097d75/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
index d2500b4..fdc1c64 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
@@ -101,8 +101,8 @@ public class BigTableWriter extends SSTableWriter
private long beforeAppend(DecoratedKey decoratedKey)
{
assert decoratedKey != null : "Keys must not be null"; // empty keys ARE allowed b/c of indexed column values
- //if (lastWrittenKey != null && lastWrittenKey.compareTo(decoratedKey) >= 0)
- // throw new RuntimeException("Last written key " + lastWrittenKey + " >= current key " + decoratedKey + " writing into " + getFilename());
+ if (lastWrittenKey != null && lastWrittenKey.compareTo(decoratedKey) >= 0)
+ throw new RuntimeException("Last written key " + lastWrittenKey + " >= current key " + decoratedKey + " writing into " + getFilename());
return (lastWrittenKey == null) ? 0 : dataFile.position();
}
[3/5] cassandra git commit: Merge branch cassandra-2.1 into
cassandra-2.2
Posted by bl...@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/ccb738f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccb738f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ccb738f8
Branch: refs/heads/trunk
Commit: ccb738f8d333965d1b80d2b41606421d37d5f4e3
Parents: 98be5de 86583af
Author: blerer <be...@datastax.com>
Authored: Wed Oct 21 10:12:13 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Wed Oct 21 10:12:43 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccb738f8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 458d0d5,6734f75..4f5e8a7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -12,15 -8,10 +12,16 @@@ Merged from 2.1
* (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
* Don't allow startup if the node's rack has changed (CASSANDRA-10242)
* (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+ * Fix sorting for queries with an IN condition on partition key columns (CASSANDRA-10363)
-2.1.11
+2.2.3
+ * Avoid NoClassDefFoundError during DataDescriptor initialization on windows (CASSANDRA-10412)
+ * Preserve case of quoted Role & User names (CASSANDRA-10394)
+ * cqlsh pg-style-strings broken (CASSANDRA-10484)
+ * Make Hadoop CF splits more polite to custom orderered partitioners (CASSANDRA-10400)
+ * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
+Merged from 2.1:
* Fix mmap file segment seeking to EOF (CASSANDRA-10478)
* Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
* Mark nodes as dead even if they've already left (CASSANDRA-10205)
[5/5] cassandra git commit: Merge branch cassandra-3.0 into trunk
Posted by bl...@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/2af041bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2af041bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2af041bd
Branch: refs/heads/trunk
Commit: 2af041bdf6e6d910ce0d4bdf4d780da80b45e030
Parents: f8fa3a4 b13e480
Author: blerer <be...@datastax.com>
Authored: Wed Oct 21 10:22:12 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Wed Oct 21 10:23:20 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/io/sstable/format/big/BigTableWriter.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2af041bd/CHANGES.txt
----------------------------------------------------------------------
[2/5] cassandra git commit: Add missing CHANGES.txt entry for
CASSANDRA-10363
Posted by bl...@apache.org.
Add missing CHANGES.txt entry for CASSANDRA-10363
patch by Benjamin Lerer for CASSANDRA-10363
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86583af4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86583af4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86583af4
Branch: refs/heads/trunk
Commit: 86583af4ca0eac34725136adee3143f9b14b75b4
Parents: 328916d
Author: blerer <be...@datastax.com>
Authored: Wed Oct 21 10:08:50 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Wed Oct 21 10:08:50 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/86583af4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dbb3480..6734f75 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@
* (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
* Don't allow startup if the node's rack has changed (CASSANDRA-10242)
* (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+ * Fix sorting for queries with an IN condition on partition key columns (CASSANDRA-10363)
2.1.11
[4/5] cassandra git commit: Merge branch cassandra-2.2 into
cassandra-3.0
Posted by bl...@apache.org.
Merge branch cassandra-2.2 into cassandra-3.0
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/b13e480e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b13e480e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b13e480e
Branch: refs/heads/trunk
Commit: b13e480e6ecbb2306146b9f671bde7edf2b11937
Parents: 79097d7 ccb738f
Author: blerer <be...@datastax.com>
Authored: Wed Oct 21 10:20:27 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Wed Oct 21 10:20:27 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b13e480e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6c97ffb,4f5e8a7..69e616f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -7,31 -8,14 +7,32 @@@ Merged from 2.1
* Fix paging issues with partitions containing only static columns data (CASSANDRA-10381)
* Fix conditions on static columns (CASSANDRA-10264)
* AssertionError: attempted to delete non-existing file CommitLog (CASSANDRA-10377)
- * (cqlsh) Distinguish negative and positive infinity in output (CASSANDRA-10523)
- * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
- * Don't allow startup if the node's rack has changed (CASSANDRA-10242)
- * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+ * Fix sorting for queries with an IN condition on partition key columns (CASSANDRA-10363)
-2.2.3
+3.0-rc2
+ * Fix SELECT DISTINCT queries between 2.2.2 nodes and 3.0 nodes (CASSANDRA-10473)
+ * Remove circular references in SegmentedFile (CASSANDRA-10543)
+ * Ensure validation of indexed values only occurs once per-partition (CASSANDRA-10536)
+ * Fix handling of static columns for range tombstones in thrift (CASSANDRA-10174)
+ * Support empty ColumnFilter for backward compatility on empty IN (CASSANDRA-10471)
+ * Remove Pig support (CASSANDRA-10542)
+ * Fix LogFile throws Exception when assertion is disabled (CASSANDRA-10522)
+ * Revert CASSANDRA-7486, make CMS default GC, move GC config to
+ conf/jvm.options (CASSANDRA-10403)
+ * Fix TeeingAppender causing some logs to be truncated/empty (CASSANDRA-10447)
+ * Allow EACH_QUORUM for reads (CASSANDRA-9602)
+ * Fix potential ClassCastException while upgrading (CASSANDRA-10468)
+ * Fix NPE in MVs on update (CASSANDRA-10503)
+ * Only include modified cell data in indexing deltas (CASSANDRA-10438)
+ * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
+ * If node is not yet gossiping write all MV updates to batchlog only (CASSANDRA-10413)
+ * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
+ * Provide additional metrics for materialized views (CASSANDRA-10323)
+ * Flush system schema tables after local schema changes (CASSANDRA-10429)
+Merged from 2.2:
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+ * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
* Avoid NoClassDefFoundError during DataDescriptor initialization on windows (CASSANDRA-10412)
* Preserve case of quoted Role & User names (CASSANDRA-10394)
* cqlsh pg-style-strings broken (CASSANDRA-10484)