You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by pa...@apache.org on 2018/03/30 15:18:45 UTC
[01/10] cassandra git commit: Downgrade logger.debug calls to
logger.trace in the read path
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 53b6116d5 -> ac77e5e77
refs/heads/cassandra-3.0 68079e4b2 -> 2d2b1a71f
refs/heads/cassandra-3.11 18278e422 -> 6f30677b2
refs/heads/trunk c22ee2bd4 -> b08b4dcc7
Downgrade logger.debug calls to logger.trace in the read path
Patch by Alexander Dejanovski; Reviewed by Paulo Motta for CASSANDRA-14318
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac77e5e7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac77e5e7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac77e5e7
Branch: refs/heads/cassandra-2.2
Commit: ac77e5e7742548f7c7c25da3923841f59d4b2713
Parents: 53b6116
Author: Alexander Dejanovski <al...@thelastpickle.com>
Authored: Tue Mar 27 12:05:27 2018 +0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Mar 30 12:10:05 2018 -0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/service/pager/AbstractQueryPager.java | 9 +++++----
.../org/apache/cassandra/service/pager/SliceQueryPager.java | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac77e5e7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2e45b85..4828517 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.13
+ * Fix query pager DEBUG log leak causing hit in paged reads throughput (CASSANDRA-14318)
* Backport circleci yaml (CASSANDRA-14240)
Merged from 2.1:
* CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac77e5e7/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
index 02623eb..46d4a3e 100644
--- a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
@@ -86,13 +86,13 @@ abstract class AbstractQueryPager implements QueryPager
if (rows.isEmpty())
{
- logger.debug("Got empty set of rows, considering pager exhausted");
+ logger.trace("Got empty set of rows, considering pager exhausted");
exhausted = true;
return Collections.emptyList();
}
int liveCount = getPageLiveCount(rows);
- logger.debug("Fetched {} live rows", liveCount);
+ logger.trace("Fetched {} live rows", liveCount);
// Because SP.getRangeSlice doesn't trim the result (see SP.trim()), liveCount may be greater than what asked
// (currentPageSize). This would throw off the paging logic so we trim the excess. It's not extremely efficient
@@ -109,7 +109,8 @@ abstract class AbstractQueryPager implements QueryPager
// we still need to return the current page)
if (liveCount < currentPageSize)
{
- logger.debug("Got result ({}) smaller than page size ({}), considering pager exhausted", liveCount, currentPageSize);
+ logger.trace("Got result ({}) smaller than page size ({}), considering pager exhausted", liveCount,
+ currentPageSize);
exhausted = true;
}
@@ -130,7 +131,7 @@ abstract class AbstractQueryPager implements QueryPager
remaining++;
}
- logger.debug("Remaining rows to page: {}", remaining);
+ logger.trace("Remaining rows to page: {}", remaining);
if (!isExhausted())
shouldFetchExtraRow = recordLast(rows.get(rows.size() - 1));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac77e5e7/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
index 1a2fc6c..3420831 100644
--- a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
@@ -89,7 +89,7 @@ public class SliceQueryPager extends AbstractQueryPager implements SinglePartiti
if (lastReturned != null)
filter = filter.withUpdatedStart(lastReturned, cfm);
- logger.debug("Querying next page of slice query; new filter: {}", filter);
+ logger.trace("Querying next page of slice query; new filter: {}", filter);
ReadCommand pageCmd = command.withUpdatedFilter(filter);
return localQuery
? Collections.singletonList(pageCmd.getRow(Keyspace.open(command.ksName)))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by pa...@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/2d2b1a71
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d2b1a71
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d2b1a71
Branch: refs/heads/trunk
Commit: 2d2b1a71f8bd8dbd069cb2bc321936e819baa9ad
Parents: 68079e4 ac77e5e
Author: Paulo Motta <pa...@apache.org>
Authored: Fri Mar 30 12:15:17 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Mar 30 12:15:17 2018 -0300
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by pa...@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/2d2b1a71
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d2b1a71
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d2b1a71
Branch: refs/heads/cassandra-3.0
Commit: 2d2b1a71f8bd8dbd069cb2bc321936e819baa9ad
Parents: 68079e4 ac77e5e
Author: Paulo Motta <pa...@apache.org>
Authored: Fri Mar 30 12:15:17 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Mar 30 12:15:17 2018 -0300
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by pa...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b08b4dcc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b08b4dcc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b08b4dcc
Branch: refs/heads/trunk
Commit: b08b4dcc72a8d9b4fa5b92dae97ba527161f130d
Parents: c22ee2b 6f30677
Author: Paulo Motta <pa...@apache.org>
Authored: Fri Mar 30 12:16:19 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Mar 30 12:16:19 2018 -0300
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[02/10] cassandra git commit: Downgrade logger.debug calls to
logger.trace in the read path
Posted by pa...@apache.org.
Downgrade logger.debug calls to logger.trace in the read path
Patch by Alexander Dejanovski; Reviewed by Paulo Motta for CASSANDRA-14318
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac77e5e7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac77e5e7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac77e5e7
Branch: refs/heads/cassandra-3.0
Commit: ac77e5e7742548f7c7c25da3923841f59d4b2713
Parents: 53b6116
Author: Alexander Dejanovski <al...@thelastpickle.com>
Authored: Tue Mar 27 12:05:27 2018 +0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Mar 30 12:10:05 2018 -0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/service/pager/AbstractQueryPager.java | 9 +++++----
.../org/apache/cassandra/service/pager/SliceQueryPager.java | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac77e5e7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2e45b85..4828517 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.13
+ * Fix query pager DEBUG log leak causing hit in paged reads throughput (CASSANDRA-14318)
* Backport circleci yaml (CASSANDRA-14240)
Merged from 2.1:
* CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac77e5e7/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
index 02623eb..46d4a3e 100644
--- a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
@@ -86,13 +86,13 @@ abstract class AbstractQueryPager implements QueryPager
if (rows.isEmpty())
{
- logger.debug("Got empty set of rows, considering pager exhausted");
+ logger.trace("Got empty set of rows, considering pager exhausted");
exhausted = true;
return Collections.emptyList();
}
int liveCount = getPageLiveCount(rows);
- logger.debug("Fetched {} live rows", liveCount);
+ logger.trace("Fetched {} live rows", liveCount);
// Because SP.getRangeSlice doesn't trim the result (see SP.trim()), liveCount may be greater than what asked
// (currentPageSize). This would throw off the paging logic so we trim the excess. It's not extremely efficient
@@ -109,7 +109,8 @@ abstract class AbstractQueryPager implements QueryPager
// we still need to return the current page)
if (liveCount < currentPageSize)
{
- logger.debug("Got result ({}) smaller than page size ({}), considering pager exhausted", liveCount, currentPageSize);
+ logger.trace("Got result ({}) smaller than page size ({}), considering pager exhausted", liveCount,
+ currentPageSize);
exhausted = true;
}
@@ -130,7 +131,7 @@ abstract class AbstractQueryPager implements QueryPager
remaining++;
}
- logger.debug("Remaining rows to page: {}", remaining);
+ logger.trace("Remaining rows to page: {}", remaining);
if (!isExhausted())
shouldFetchExtraRow = recordLast(rows.get(rows.size() - 1));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac77e5e7/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
index 1a2fc6c..3420831 100644
--- a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
@@ -89,7 +89,7 @@ public class SliceQueryPager extends AbstractQueryPager implements SinglePartiti
if (lastReturned != null)
filter = filter.withUpdatedStart(lastReturned, cfm);
- logger.debug("Querying next page of slice query; new filter: {}", filter);
+ logger.trace("Querying next page of slice query; new filter: {}", filter);
ReadCommand pageCmd = command.withUpdatedFilter(filter);
return localQuery
? Collections.singletonList(pageCmd.getRow(Keyspace.open(command.ksName)))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by pa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f30677b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f30677b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f30677b
Branch: refs/heads/trunk
Commit: 6f30677b28dcbf82bcd0a291f3294ddf87dafaac
Parents: 18278e4 2d2b1a7
Author: Paulo Motta <pa...@apache.org>
Authored: Fri Mar 30 12:15:37 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Mar 30 12:15:37 2018 -0300
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[04/10] cassandra git commit: Downgrade logger.debug calls to
logger.trace in the read path
Posted by pa...@apache.org.
Downgrade logger.debug calls to logger.trace in the read path
Patch by Alexander Dejanovski; Reviewed by Paulo Motta for CASSANDRA-14318
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac77e5e7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac77e5e7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac77e5e7
Branch: refs/heads/trunk
Commit: ac77e5e7742548f7c7c25da3923841f59d4b2713
Parents: 53b6116
Author: Alexander Dejanovski <al...@thelastpickle.com>
Authored: Tue Mar 27 12:05:27 2018 +0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Mar 30 12:10:05 2018 -0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/service/pager/AbstractQueryPager.java | 9 +++++----
.../org/apache/cassandra/service/pager/SliceQueryPager.java | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac77e5e7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2e45b85..4828517 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.13
+ * Fix query pager DEBUG log leak causing hit in paged reads throughput (CASSANDRA-14318)
* Backport circleci yaml (CASSANDRA-14240)
Merged from 2.1:
* CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac77e5e7/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
index 02623eb..46d4a3e 100644
--- a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
@@ -86,13 +86,13 @@ abstract class AbstractQueryPager implements QueryPager
if (rows.isEmpty())
{
- logger.debug("Got empty set of rows, considering pager exhausted");
+ logger.trace("Got empty set of rows, considering pager exhausted");
exhausted = true;
return Collections.emptyList();
}
int liveCount = getPageLiveCount(rows);
- logger.debug("Fetched {} live rows", liveCount);
+ logger.trace("Fetched {} live rows", liveCount);
// Because SP.getRangeSlice doesn't trim the result (see SP.trim()), liveCount may be greater than what asked
// (currentPageSize). This would throw off the paging logic so we trim the excess. It's not extremely efficient
@@ -109,7 +109,8 @@ abstract class AbstractQueryPager implements QueryPager
// we still need to return the current page)
if (liveCount < currentPageSize)
{
- logger.debug("Got result ({}) smaller than page size ({}), considering pager exhausted", liveCount, currentPageSize);
+ logger.trace("Got result ({}) smaller than page size ({}), considering pager exhausted", liveCount,
+ currentPageSize);
exhausted = true;
}
@@ -130,7 +131,7 @@ abstract class AbstractQueryPager implements QueryPager
remaining++;
}
- logger.debug("Remaining rows to page: {}", remaining);
+ logger.trace("Remaining rows to page: {}", remaining);
if (!isExhausted())
shouldFetchExtraRow = recordLast(rows.get(rows.size() - 1));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac77e5e7/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
index 1a2fc6c..3420831 100644
--- a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
@@ -89,7 +89,7 @@ public class SliceQueryPager extends AbstractQueryPager implements SinglePartiti
if (lastReturned != null)
filter = filter.withUpdatedStart(lastReturned, cfm);
- logger.debug("Querying next page of slice query; new filter: {}", filter);
+ logger.trace("Querying next page of slice query; new filter: {}", filter);
ReadCommand pageCmd = command.withUpdatedFilter(filter);
return localQuery
? Collections.singletonList(pageCmd.getRow(Keyspace.open(command.ksName)))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[03/10] cassandra git commit: Downgrade logger.debug calls to
logger.trace in the read path
Posted by pa...@apache.org.
Downgrade logger.debug calls to logger.trace in the read path
Patch by Alexander Dejanovski; Reviewed by Paulo Motta for CASSANDRA-14318
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac77e5e7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac77e5e7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac77e5e7
Branch: refs/heads/cassandra-3.11
Commit: ac77e5e7742548f7c7c25da3923841f59d4b2713
Parents: 53b6116
Author: Alexander Dejanovski <al...@thelastpickle.com>
Authored: Tue Mar 27 12:05:27 2018 +0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Mar 30 12:10:05 2018 -0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/service/pager/AbstractQueryPager.java | 9 +++++----
.../org/apache/cassandra/service/pager/SliceQueryPager.java | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac77e5e7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2e45b85..4828517 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.13
+ * Fix query pager DEBUG log leak causing hit in paged reads throughput (CASSANDRA-14318)
* Backport circleci yaml (CASSANDRA-14240)
Merged from 2.1:
* CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac77e5e7/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
index 02623eb..46d4a3e 100644
--- a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
@@ -86,13 +86,13 @@ abstract class AbstractQueryPager implements QueryPager
if (rows.isEmpty())
{
- logger.debug("Got empty set of rows, considering pager exhausted");
+ logger.trace("Got empty set of rows, considering pager exhausted");
exhausted = true;
return Collections.emptyList();
}
int liveCount = getPageLiveCount(rows);
- logger.debug("Fetched {} live rows", liveCount);
+ logger.trace("Fetched {} live rows", liveCount);
// Because SP.getRangeSlice doesn't trim the result (see SP.trim()), liveCount may be greater than what asked
// (currentPageSize). This would throw off the paging logic so we trim the excess. It's not extremely efficient
@@ -109,7 +109,8 @@ abstract class AbstractQueryPager implements QueryPager
// we still need to return the current page)
if (liveCount < currentPageSize)
{
- logger.debug("Got result ({}) smaller than page size ({}), considering pager exhausted", liveCount, currentPageSize);
+ logger.trace("Got result ({}) smaller than page size ({}), considering pager exhausted", liveCount,
+ currentPageSize);
exhausted = true;
}
@@ -130,7 +131,7 @@ abstract class AbstractQueryPager implements QueryPager
remaining++;
}
- logger.debug("Remaining rows to page: {}", remaining);
+ logger.trace("Remaining rows to page: {}", remaining);
if (!isExhausted())
shouldFetchExtraRow = recordLast(rows.get(rows.size() - 1));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac77e5e7/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
index 1a2fc6c..3420831 100644
--- a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
@@ -89,7 +89,7 @@ public class SliceQueryPager extends AbstractQueryPager implements SinglePartiti
if (lastReturned != null)
filter = filter.withUpdatedStart(lastReturned, cfm);
- logger.debug("Querying next page of slice query; new filter: {}", filter);
+ logger.trace("Querying next page of slice query; new filter: {}", filter);
ReadCommand pageCmd = command.withUpdatedFilter(filter);
return localQuery
? Collections.singletonList(pageCmd.getRow(Keyspace.open(command.ksName)))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by pa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f30677b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f30677b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f30677b
Branch: refs/heads/cassandra-3.11
Commit: 6f30677b28dcbf82bcd0a291f3294ddf87dafaac
Parents: 18278e4 2d2b1a7
Author: Paulo Motta <pa...@apache.org>
Authored: Fri Mar 30 12:15:37 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Mar 30 12:15:37 2018 -0300
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by pa...@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/2d2b1a71
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d2b1a71
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d2b1a71
Branch: refs/heads/cassandra-3.11
Commit: 2d2b1a71f8bd8dbd069cb2bc321936e819baa9ad
Parents: 68079e4 ac77e5e
Author: Paulo Motta <pa...@apache.org>
Authored: Fri Mar 30 12:15:17 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Mar 30 12:15:17 2018 -0300
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org