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 2021/09/30 12:16:33 UTC
[cassandra] branch trunk updated (9dd0e55 -> b6e400d)
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 9dd0e55 Merge branch 'cassandra-4.0' into trunk
new 3e6faca Do not release new SSTables in offline transactions
new dcc9549 Merge branch 'cassandra-3.0' into cassandra-3.11
new c0916d6 Merge branch 'cassandra-3.11' into cassandra-4.0
new b6e400d Merge branch 'cassandra-4.0' into trunk
The 4 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 +
.../cassandra/db/compaction/CompactionTask.java | 83 ++++++++++------------
.../db/compaction/CompactionTaskTest.java | 34 +++++++++
3 files changed, 74 insertions(+), 44 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-4.0' 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 b6e400d0c3c3f74d17261caaa6388e6c70df322f
Merge: 9dd0e55 c0916d6
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Thu Sep 30 13:14:45 2021 +0100
Merge branch 'cassandra-4.0' into trunk
# Conflicts:
# src/java/org/apache/cassandra/db/compaction/CompactionTask.java
CHANGES.txt | 1 +
.../cassandra/db/compaction/CompactionTask.java | 83 ++++++++++------------
.../db/compaction/CompactionTaskTest.java | 34 +++++++++
3 files changed, 74 insertions(+), 44 deletions(-)
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 9f654e2,74bf246..fe61ab6
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@@ -228,53 -220,48 +228,48 @@@ public class CompactionTask extends Abs
}
if (transaction.isOffline())
+ return;
+
+ // log a bunch of statistics about the result and save to system table compaction_history
- long durationInNano = System.nanoTime() - start;
++ long durationInNano = nanoTime() - start;
+ long dTime = TimeUnit.NANOSECONDS.toMillis(durationInNano);
+ long startsize = inputSizeBytes;
+ long endsize = SSTableReader.getTotalBytes(newSStables);
+ double ratio = (double) endsize / (double) startsize;
+
+ StringBuilder newSSTableNames = new StringBuilder();
+ for (SSTableReader reader : newSStables)
+ newSSTableNames.append(reader.descriptor.baseFilename()).append(",");
+ long totalSourceRows = 0;
+ for (int i = 0; i < mergedRowCounts.length; i++)
+ totalSourceRows += mergedRowCounts[i] * (i + 1);
+
+ String mergeSummary = updateCompactionHistory(cfs.keyspace.getName(), cfs.getTableName(), mergedRowCounts, startsize, endsize);
+
+ logger.info(String.format("Compacted (%s) %d sstables to [%s] to level=%d. %s to %s (~%d%% of original) in %,dms. Read Throughput = %s, Write Throughput = %s, Row Throughput = ~%,d/s. %,d total partitions merged to %,d. Partition merge counts were {%s}",
+ taskId,
+ transaction.originals().size(),
+ newSSTableNames.toString(),
+ getLevel(),
+ FBUtilities.prettyPrintMemory(startsize),
+ FBUtilities.prettyPrintMemory(endsize),
+ (int) (ratio * 100),
+ dTime,
+ FBUtilities.prettyPrintMemoryPerSecond(startsize, durationInNano),
+ FBUtilities.prettyPrintMemoryPerSecond(endsize, durationInNano),
+ (int) totalSourceCQLRows / (TimeUnit.NANOSECONDS.toSeconds(durationInNano) + 1),
+ totalSourceRows,
+ totalKeysWritten,
+ mergeSummary));
+ if (logger.isTraceEnabled())
{
- Refs.release(Refs.selfRefs(newSStables));
+ logger.trace("CF Total Bytes Compacted: {}", FBUtilities.prettyPrintMemory(CompactionTask.addToTotalBytesCompacted(endsize)));
+ logger.trace("Actual #keys: {}, Estimated #keys:{}, Err%: {}", totalKeysWritten, estimatedKeys, ((double)(totalKeysWritten - estimatedKeys)/totalKeysWritten));
}
- else
- {
- // log a bunch of statistics about the result and save to system table compaction_history
-
- long durationInNano = nanoTime() - start;
- long dTime = TimeUnit.NANOSECONDS.toMillis(durationInNano);
- long startsize = inputSizeBytes;
- long endsize = SSTableReader.getTotalBytes(newSStables);
- double ratio = (double) endsize / (double) startsize;
-
- StringBuilder newSSTableNames = new StringBuilder();
- for (SSTableReader reader : newSStables)
- newSSTableNames.append(reader.descriptor.baseFilename()).append(",");
- long totalSourceRows = 0;
- for (int i = 0; i < mergedRowCounts.length; i++)
- totalSourceRows += mergedRowCounts[i] * (i + 1);
-
- String mergeSummary = updateCompactionHistory(cfs.keyspace.getName(), cfs.getTableName(), mergedRowCounts, startsize, endsize);
-
- logger.info(String.format("Compacted (%s) %d sstables to [%s] to level=%d. %s to %s (~%d%% of original) in %,dms. Read Throughput = %s, Write Throughput = %s, Row Throughput = ~%,d/s. %,d total partitions merged to %,d. Partition merge counts were {%s}",
- taskId,
- transaction.originals().size(),
- newSSTableNames.toString(),
- getLevel(),
- FBUtilities.prettyPrintMemory(startsize),
- FBUtilities.prettyPrintMemory(endsize),
- (int) (ratio * 100),
- dTime,
- FBUtilities.prettyPrintMemoryPerSecond(startsize, durationInNano),
- FBUtilities.prettyPrintMemoryPerSecond(endsize, durationInNano),
- (int) totalSourceCQLRows / (TimeUnit.NANOSECONDS.toSeconds(durationInNano) + 1),
- totalSourceRows,
- totalKeysWritten,
- mergeSummary));
- if (logger.isTraceEnabled())
- {
- logger.trace("CF Total Bytes Compacted: {}", FBUtilities.prettyPrintMemory(CompactionTask.addToTotalBytesCompacted(endsize)));
- logger.trace("Actual #keys: {}, Estimated #keys:{}, Err%: {}", totalKeysWritten, estimatedKeys, ((double)(totalKeysWritten - estimatedKeys)/totalKeysWritten));
- }
- cfs.getCompactionStrategyManager().compactionLogger.compaction(startTime, transaction.originals(), currentTimeMillis(), newSStables);
- cfs.getCompactionStrategyManager().compactionLogger.compaction(startTime, transaction.originals(), System.currentTimeMillis(), newSStables);
++ cfs.getCompactionStrategyManager().compactionLogger.compaction(startTime, transaction.originals(), currentTimeMillis(), newSStables);
- // update the metrics
- cfs.metric.compactionBytesWritten.inc(endsize);
- }
+ // update the metrics
+ cfs.metric.compactionBytesWritten.inc(endsize);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org