You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2020/05/11 10:46:59 UTC
[cassandra] branch trunk updated (66eae58 -> 5f61e94)
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 66eae58 Only calculate dynamicBadnessThreshold once per loop in DynamicEndpointSnitch
new 406a859 Fix CQL formatting of read command restrictions for slow query log
new 5f61e94 Merge branch 'cassandra-3.11' into trunk
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/DataRange.java | 11 +++++++----
src/java/org/apache/cassandra/db/Slices.java | 16 ++++++++++++++--
.../cassandra/db/filter/ClusteringIndexNamesFilter.java | 4 ++--
4 files changed, 24 insertions(+), 8 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5f61e94ea5d25aae1eb96e74512e55edef1cef14
Merge: 66eae58 406a859
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Mon May 11 11:45:50 2020 +0100
Merge branch 'cassandra-3.11' into trunk
# Conflicts:
# CHANGES.txt
# src/java/org/apache/cassandra/db/DataRange.java
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/DataRange.java | 11 +++++++----
src/java/org/apache/cassandra/db/Slices.java | 16 ++++++++++++++--
.../cassandra/db/filter/ClusteringIndexNamesFilter.java | 4 ++--
4 files changed, 24 insertions(+), 8 deletions(-)
diff --cc CHANGES.txt
index 3e7343c,46625b3..e6acf40
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,6 +1,30 @@@
-3.11.7
+4.0-alpha5
+ * Only calculate dynamicBadnessThreshold once per loop in DynamicEndpointSnitch (CASSANDRA-15798)
+ * Cleanup redundant nodetool commands added in 4.0 (CASSANDRA-15256)
+ * Update to Python driver 3.23 for cqlsh (CASSANDRA-15793)
+ * Add tunable initial size and growth factor to RangeTombstoneList (CASSANDRA-15763)
+ * Improve debug logging in SSTableReader for index summary (CASSANDRA-15755)
+ * bin/sstableverify should support user provided token ranges (CASSANDRA-15753)
+ * Improve logging when mutation passed to commit log is too large (CASSANDRA-14781)
+ * replace LZ4FastDecompressor with LZ4SafeDecompressor (CASSANDRA-15560)
+ * Fix buffer pool NPE with concurrent release due to in-progress tiny pool eviction (CASSANDRA-15726)
+ * Avoid race condition when completing stream sessions (CASSANDRA-15666)
+ * Flush with fast compressors by default (CASSANDRA-15379)
+ * Fix CqlInputFormat regression from the switch to system.size_estimates (CASSANDRA-15637)
+ * Allow sending Entire SSTables over SSL (CASSANDRA-15740)
+ * Fix CQLSH UTF-8 encoding issue for Python 2/3 compatibility (CASSANDRA-15739)
+ * Fix batch statement preparation when multiple tables and parameters are used (CASSANDRA-15730)
+ * Fix regression with traceOutgoingMessage printing message size (CASSANDRA-15687)
+ * Ensure repaired data tracking reads a consistent amount of data across replicas (CASSANDRA-15601)
+ * Fix CQLSH to avoid arguments being evaluated (CASSANDRA-15660)
+ * Correct Visibility and Improve Safety of Methods in LatencyMetrics (CASSANDRA-15597)
+ * Allow cqlsh to run with Python2.7/Python3.6+ (CASSANDRA-15659,CASSANDRA-15573)
+ * Improve logging around incremental repair (CASSANDRA-15599)
+ * Do not check cdc_raw_directory filesystem space if CDC disabled (CASSANDRA-15688)
+ * Replace array iterators with get by index (CASSANDRA-15394)
+ * Minimize BTree iterator allocations (CASSANDRA-15389)
+Merged from 3.11:
+ * Fix CQL formatting of read command restrictions for slow query log (CASSANDRA-15503)
- * Allow sstableloader to use SSL on the native port (CASSANDRA-14904)
Merged from 3.0:
* liveDiskSpaceUsed and totalDiskSpaceUsed get corrupted if IndexSummaryRedistribution gets interrupted (CASSANDRA-15674)
* Fix Debian init start/stop (CASSANDRA-15770)
diff --cc src/java/org/apache/cassandra/db/DataRange.java
index 420f3da,c77d9dc..4db4198
--- a/src/java/org/apache/cassandra/db/DataRange.java
+++ b/src/java/org/apache/cassandra/db/DataRange.java
@@@ -274,15 -274,16 +274,16 @@@ public class DataRang
return sb.toString();
}
- private void appendClause(PartitionPosition pos, StringBuilder sb, CFMetaData metadata, boolean isStart, boolean isInclusive)
+ private void appendClause(PartitionPosition pos, StringBuilder sb, TableMetadata metadata, boolean isStart, boolean isInclusive)
{
sb.append("token(");
- sb.append(ColumnDefinition.toCQLString(metadata.partitionKeyColumns()));
+ sb.append(ColumnMetadata.toCQLString(metadata.partitionKeyColumns()));
- sb.append(") ").append(getOperator(isStart, isInclusive)).append(" ");
+ sb.append(") ");
if (pos instanceof DecoratedKey)
{
+ sb.append(getOperator(isStart, isInclusive)).append(" ");
sb.append("token(");
- appendKeyString(sb, metadata.getKeyValidator(), ((DecoratedKey)pos).getKey());
+ appendKeyString(sb, metadata.partitionKeyType, ((DecoratedKey)pos).getKey());
sb.append(")");
}
else
diff --cc src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
index f25dc91,6c7e14b..63815a1
--- a/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
@@@ -189,9 -189,9 +189,9 @@@ public class ClusteringIndexNamesFilte
return sb.append(')').toString();
}
- public String toCQLString(CFMetaData metadata)
+ public String toCQLString(TableMetadata metadata)
{
- if (metadata.clusteringColumns().isEmpty() || clusterings.size() <= 1)
+ if (metadata.clusteringColumns().isEmpty() || clusterings.isEmpty())
return "";
StringBuilder sb = new StringBuilder();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org