You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ca...@apache.org on 2016/05/16 20:49:18 UTC
[01/21] cassandra git commit: Fix paging on DISTINCT queries repeats
result when first row in partition changes
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 f5baa9c71 -> 6e6bde8ca
refs/heads/cassandra-2.2 bf40aa443 -> 330d7d40b
refs/heads/cassandra-3.0 14918b76f -> ca5bf64bf
refs/heads/cassandra-3.7 13ee50a51 -> 3e7a2c8f1
refs/heads/trunk adea6678f -> b84bf68fe
Fix paging on DISTINCT queries repeats result when first row in partition changes
patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-11679
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5baa9c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5baa9c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5baa9c7
Branch: refs/heads/cassandra-3.0
Commit: f5baa9c712c283d7f9897dfbb9ca269b2f5a3de3
Parents: fccded5
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri May 13 21:07:27 2016 +0200
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri May 13 21:07:27 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/service/pager/RangeSliceQueryPager.java | 11 +++++++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5baa9c7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index edf5aa3..e407140 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.15
+ * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-11679)
* Add option to disable use of severity in DynamicEndpointSnitch (CASSANDRA-11737)
* cqlsh COPY FROM fails for null values with non-prepared statements (CASSANDRA-11631)
* Make cython optional in pylib/setup.py (CASSANDRA-11630)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5baa9c7/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
index fd14c82..caa146a 100644
--- a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
@@ -96,8 +96,13 @@ public class RangeSliceQueryPager extends AbstractQueryPager
if (lastReturnedKey == null || !lastReturnedKey.equals(first.key))
return false;
+ // If the query is a DISTINCT one we can stop there
+ if (isDistinct())
+ return true;
+
// Same as SliceQueryPager, we ignore a deleted column
Cell firstCell = isReversed() ? lastCell(first.cf) : firstNonStaticCell(first.cf);
+
// If the row was containing only static columns it has already been returned and we can skip it.
if (firstCell == null)
return true;
@@ -108,6 +113,12 @@ public class RangeSliceQueryPager extends AbstractQueryPager
&& firstCell.name().isSameCQL3RowAs(metadata.comparator, lastReturnedName);
}
+ private boolean isDistinct()
+ {
+ // As this pager is never used for Thrift queries, checking the countCQL3Rows is enough.
+ return !command.countCQL3Rows;
+ }
+
protected boolean recordLast(Row last)
{
lastReturnedKey = last.key;
[12/21] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ca...@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/330d7d40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/330d7d40
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/330d7d40
Branch: refs/heads/cassandra-3.0
Commit: 330d7d40be066973e9980ae9875e6efbe1ade362
Parents: bf40aa4 6e6bde8
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:45:21 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:45:21 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[11/21] cassandra git commit: ninja changes for 10979
Posted by ca...@apache.org.
ninja changes for 10979
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e6bde8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e6bde8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e6bde8c
Branch: refs/heads/trunk
Commit: 6e6bde8ca2aad0357705f0c48595cbde4f3bc415
Parents: f5baa9c
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:43:56 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:43:56 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e6bde8c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e407140..68f8dd9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,8 @@
2.1.14
+ * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
+ going (CASSANDRA-10979)
* (cqlsh) Fix potential COPY deadlock when parent process is terminating child
processes (CASSANDRA-11505)
* Replace sstables on DataTracker before marking them as non-compacting during anti-compaction (CASSANDRA-11548)
[03/21] cassandra git commit: Fix paging on DISTINCT queries repeats
result when first row in partition changes
Posted by ca...@apache.org.
Fix paging on DISTINCT queries repeats result when first row in partition changes
patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-11679
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5baa9c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5baa9c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5baa9c7
Branch: refs/heads/trunk
Commit: f5baa9c712c283d7f9897dfbb9ca269b2f5a3de3
Parents: fccded5
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri May 13 21:07:27 2016 +0200
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri May 13 21:07:27 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/service/pager/RangeSliceQueryPager.java | 11 +++++++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5baa9c7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index edf5aa3..e407140 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.15
+ * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-11679)
* Add option to disable use of severity in DynamicEndpointSnitch (CASSANDRA-11737)
* cqlsh COPY FROM fails for null values with non-prepared statements (CASSANDRA-11631)
* Make cython optional in pylib/setup.py (CASSANDRA-11630)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5baa9c7/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
index fd14c82..caa146a 100644
--- a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
@@ -96,8 +96,13 @@ public class RangeSliceQueryPager extends AbstractQueryPager
if (lastReturnedKey == null || !lastReturnedKey.equals(first.key))
return false;
+ // If the query is a DISTINCT one we can stop there
+ if (isDistinct())
+ return true;
+
// Same as SliceQueryPager, we ignore a deleted column
Cell firstCell = isReversed() ? lastCell(first.cf) : firstNonStaticCell(first.cf);
+
// If the row was containing only static columns it has already been returned and we can skip it.
if (firstCell == null)
return true;
@@ -108,6 +113,12 @@ public class RangeSliceQueryPager extends AbstractQueryPager
&& firstCell.name().isSameCQL3RowAs(metadata.comparator, lastReturnedName);
}
+ private boolean isDistinct()
+ {
+ // As this pager is never used for Thrift queries, checking the countCQL3Rows is enough.
+ return !command.countCQL3Rows;
+ }
+
protected boolean recordLast(Row last)
{
lastReturnedKey = last.key;
[06/21] cassandra git commit: Merge branch cassandra-2.1 into
cassandra-2.2
Posted by ca...@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/bf40aa44
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf40aa44
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf40aa44
Branch: refs/heads/trunk
Commit: bf40aa4439ef7ab53321638d86b58ff50194da31
Parents: 280da18 f5baa9c
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri May 13 21:19:54 2016 +0200
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri May 13 21:20:01 2016 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[10/21] cassandra git commit: ninja changes for 10979
Posted by ca...@apache.org.
ninja changes for 10979
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e6bde8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e6bde8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e6bde8c
Branch: refs/heads/cassandra-3.7
Commit: 6e6bde8ca2aad0357705f0c48595cbde4f3bc415
Parents: f5baa9c
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:43:56 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:43:56 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e6bde8c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e407140..68f8dd9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,8 @@
2.1.14
+ * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
+ going (CASSANDRA-10979)
* (cqlsh) Fix potential COPY deadlock when parent process is terminating child
processes (CASSANDRA-11505)
* Replace sstables on DataTracker before marking them as non-compacting during anti-compaction (CASSANDRA-11548)
[19/21] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.7
Posted by ca...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e7a2c8f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e7a2c8f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e7a2c8f
Branch: refs/heads/trunk
Commit: 3e7a2c8f1f998a0cb1514fbe81d88724e6b2af22
Parents: 13ee50a ca5bf64
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:46:58 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:46:58 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[15/21] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ca...@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/330d7d40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/330d7d40
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/330d7d40
Branch: refs/heads/cassandra-2.2
Commit: 330d7d40be066973e9980ae9875e6efbe1ade362
Parents: bf40aa4 6e6bde8
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:45:21 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:45:21 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[21/21] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Posted by ca...@apache.org.
Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b84bf68f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b84bf68f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b84bf68f
Branch: refs/heads/trunk
Commit: b84bf68feeddecef3e9f2eee29c68a809d0b8516
Parents: adea667 3e7a2c8
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:47:25 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:47:25 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[13/21] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ca...@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/330d7d40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/330d7d40
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/330d7d40
Branch: refs/heads/trunk
Commit: 330d7d40be066973e9980ae9875e6efbe1ade362
Parents: bf40aa4 6e6bde8
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:45:21 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:45:21 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/21] cassandra git commit: ninja changes for 10979
Posted by ca...@apache.org.
ninja changes for 10979
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e6bde8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e6bde8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e6bde8c
Branch: refs/heads/cassandra-2.1
Commit: 6e6bde8ca2aad0357705f0c48595cbde4f3bc415
Parents: f5baa9c
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:43:56 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:43:56 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e6bde8c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e407140..68f8dd9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,8 @@
2.1.14
+ * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
+ going (CASSANDRA-10979)
* (cqlsh) Fix potential COPY deadlock when parent process is terminating child
processes (CASSANDRA-11505)
* Replace sstables on DataTracker before marking them as non-compacting during anti-compaction (CASSANDRA-11548)
[14/21] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ca...@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/330d7d40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/330d7d40
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/330d7d40
Branch: refs/heads/cassandra-3.7
Commit: 330d7d40be066973e9980ae9875e6efbe1ade362
Parents: bf40aa4 6e6bde8
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:45:21 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:45:21 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/21] cassandra git commit: Fix paging on DISTINCT queries repeats
result when first row in partition changes
Posted by ca...@apache.org.
Fix paging on DISTINCT queries repeats result when first row in partition changes
patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-11679
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5baa9c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5baa9c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5baa9c7
Branch: refs/heads/cassandra-3.7
Commit: f5baa9c712c283d7f9897dfbb9ca269b2f5a3de3
Parents: fccded5
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri May 13 21:07:27 2016 +0200
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri May 13 21:07:27 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/service/pager/RangeSliceQueryPager.java | 11 +++++++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5baa9c7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index edf5aa3..e407140 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.15
+ * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-11679)
* Add option to disable use of severity in DynamicEndpointSnitch (CASSANDRA-11737)
* cqlsh COPY FROM fails for null values with non-prepared statements (CASSANDRA-11631)
* Make cython optional in pylib/setup.py (CASSANDRA-11630)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5baa9c7/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
index fd14c82..caa146a 100644
--- a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
@@ -96,8 +96,13 @@ public class RangeSliceQueryPager extends AbstractQueryPager
if (lastReturnedKey == null || !lastReturnedKey.equals(first.key))
return false;
+ // If the query is a DISTINCT one we can stop there
+ if (isDistinct())
+ return true;
+
// Same as SliceQueryPager, we ignore a deleted column
Cell firstCell = isReversed() ? lastCell(first.cf) : firstNonStaticCell(first.cf);
+
// If the row was containing only static columns it has already been returned and we can skip it.
if (firstCell == null)
return true;
@@ -108,6 +113,12 @@ public class RangeSliceQueryPager extends AbstractQueryPager
&& firstCell.name().isSameCQL3RowAs(metadata.comparator, lastReturnedName);
}
+ private boolean isDistinct()
+ {
+ // As this pager is never used for Thrift queries, checking the countCQL3Rows is enough.
+ return !command.countCQL3Rows;
+ }
+
protected boolean recordLast(Row last)
{
lastReturnedKey = last.key;
[09/21] cassandra git commit: ninja changes for 10979
Posted by ca...@apache.org.
ninja changes for 10979
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e6bde8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e6bde8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e6bde8c
Branch: refs/heads/cassandra-3.0
Commit: 6e6bde8ca2aad0357705f0c48595cbde4f3bc415
Parents: f5baa9c
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:43:56 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:43:56 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e6bde8c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e407140..68f8dd9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,8 @@
2.1.14
+ * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
+ going (CASSANDRA-10979)
* (cqlsh) Fix potential COPY deadlock when parent process is terminating child
processes (CASSANDRA-11505)
* Replace sstables on DataTracker before marking them as non-compacting during anti-compaction (CASSANDRA-11548)
[04/21] cassandra git commit: Merge branch cassandra-2.1 into
cassandra-2.2
Posted by ca...@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/bf40aa44
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf40aa44
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf40aa44
Branch: refs/heads/cassandra-3.7
Commit: bf40aa4439ef7ab53321638d86b58ff50194da31
Parents: 280da18 f5baa9c
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri May 13 21:19:54 2016 +0200
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri May 13 21:20:01 2016 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[16/21] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ca...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca5bf64b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca5bf64b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca5bf64b
Branch: refs/heads/cassandra-3.7
Commit: ca5bf64bf1e9757ab7f53fb5e4803b5dc8ceaac1
Parents: 14918b7 330d7d4
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:46:26 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:46:26 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[20/21] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.7
Posted by ca...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e7a2c8f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e7a2c8f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e7a2c8f
Branch: refs/heads/cassandra-3.7
Commit: 3e7a2c8f1f998a0cb1514fbe81d88724e6b2af22
Parents: 13ee50a ca5bf64
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:46:58 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:46:58 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[17/21] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ca...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca5bf64b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca5bf64b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca5bf64b
Branch: refs/heads/trunk
Commit: ca5bf64bf1e9757ab7f53fb5e4803b5dc8ceaac1
Parents: 14918b7 330d7d4
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:46:26 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:46:26 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[18/21] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ca...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca5bf64b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca5bf64b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca5bf64b
Branch: refs/heads/cassandra-3.0
Commit: ca5bf64bf1e9757ab7f53fb5e4803b5dc8ceaac1
Parents: 14918b7 330d7d4
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:46:26 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:46:26 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[07/21] cassandra git commit: ninja changes for 10979
Posted by ca...@apache.org.
ninja changes for 10979
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e6bde8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e6bde8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e6bde8c
Branch: refs/heads/cassandra-2.2
Commit: 6e6bde8ca2aad0357705f0c48595cbde4f3bc415
Parents: f5baa9c
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon May 16 16:43:56 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon May 16 16:43:56 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e6bde8c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e407140..68f8dd9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,8 @@
2.1.14
+ * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
+ going (CASSANDRA-10979)
* (cqlsh) Fix potential COPY deadlock when parent process is terminating child
processes (CASSANDRA-11505)
* Replace sstables on DataTracker before marking them as non-compacting during anti-compaction (CASSANDRA-11548)
[05/21] cassandra git commit: Merge branch cassandra-2.1 into
cassandra-2.2
Posted by ca...@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/bf40aa44
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf40aa44
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf40aa44
Branch: refs/heads/cassandra-3.0
Commit: bf40aa4439ef7ab53321638d86b58ff50194da31
Parents: 280da18 f5baa9c
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri May 13 21:19:54 2016 +0200
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri May 13 21:20:01 2016 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------