This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 8cc2b481922dd77a9956e76aca1220aeb799953b Merge: fdbb975188 90e12e3fc9 Author: Stefan Miklosovic <[email protected]> AuthorDate: Mon Oct 2 13:58:41 2023 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 2 + .../db/compaction/CompactionIterator.java | 17 ++++-- .../partitions/UnfilteredPartitionIterators.java | 65 +++++++++++++++++----- 3 files changed, 65 insertions(+), 19 deletions(-) diff --cc CHANGES.txt index 78e7e350e9,581b7fdc48..07859f33dc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -19,9 -14,10 +19,11 @@@ Merged from 4.1 * Internode legacy SSL storage port certificate is not hot reloaded on update (CASSANDRA-18681) * Nodetool paxos-only repair is no longer incremental (CASSANDRA-18466) Merged from 4.0: + * Improve performance of compactions when table does not have an index (CASSANDRA-18773) + * JMH improvements - faster build and async profiler (CASSANDRA-18871) * Enable 3rd party JDK installations for Debian package (CASSANDRA-18844) Merged from 3.11: + * Revert CASSANDRA-18543 (CASSANDRA-18854) Merged from 3.0: * Upgrade snappy-java to 1.1.10.4 (CASSANDRA-18878) * Add cqlshrc.sample and credentials.sample into Debian package (CASSANDRA-18818) diff --cc src/java/org/apache/cassandra/db/compaction/CompactionIterator.java index a31e137e04,de1b022dae..d06ad37bdd --- a/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java @@@ -221,12 -233,9 +233,9 @@@ public class CompactionIterator extend CompactionIterator.this.updateCounterFor(merged); - if ( (type != OperationType.COMPACTION && type != OperationType.MAJOR_COMPACTION) - || !controller.cfs.indexManager.handles(IndexTransaction.Type.COMPACTION) ) - { + if (!rowProcessingNeeded()) return null; - } - + Columns statics = Columns.NONE; Columns regulars = Columns.NONE; for (int i=0, isize=versions.size(); i<isize; i++) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
