This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 7e2739bfb66971e8b7b148dcd847230d2d43eadc Merge: 8c4ddb30bc bd9c2c3908 Author: Daniel Roberts ddanielr <[email protected]> AuthorDate: Tue Feb 24 14:12:48 2026 +0000 Merge branch '2.1' .../accumulo/server/compaction/FileCompactor.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --cc server/base/src/main/java/org/apache/accumulo/server/compaction/FileCompactor.java index 7a79d2d5c2,e058db5ac8..1e5d204638 --- a/server/base/src/main/java/org/apache/accumulo/server/compaction/FileCompactor.java +++ b/server/base/src/main/java/org/apache/accumulo/server/compaction/FileCompactor.java @@@ -349,18 -357,14 +358,16 @@@ public class FileCompactor implements C final EnumSet<FilePrefix> dropCacheFileTypes = ConfigurationTypeHelper.getDropCacheBehindFilePrefixes(dropCachePrefixProperty); - final boolean isMinC = env.getIteratorScope() == IteratorUtil.IteratorScope.minc; - - final boolean dropCacheBehindOutput = !RootTable.ID.equals(this.extent.tableId()) - && !MetadataTable.ID.equals(this.extent.tableId()) - && ((isMinC && acuTableConf.getBoolean(Property.TABLE_MINC_OUTPUT_DROP_CACHE)) - || (!isMinC && acuTableConf.getBoolean(Property.TABLE_MAJC_OUTPUT_DROP_CACHE))); + final boolean dropCacheBehindOutput = + !SystemTables.ROOT.tableId().equals(this.extent.tableId()) + && !SystemTables.METADATA.tableId().equals(this.extent.tableId()) + && ((isMinC && acuTableConf.getBoolean(Property.TABLE_MINC_OUTPUT_DROP_CACHE)) + || (!isMinC && acuTableConf.getBoolean(Property.TABLE_MAJC_OUTPUT_DROP_CACHE))); WriterBuilder outBuilder = fileFactory.newWriterBuilder().forTable(this.extent.tableId()) - .forFile(outputFile.getMetaInsert(), ns, ns.getConf(), cryptoService) - .withTableConfiguration(acuTableConf).withRateLimiter(env.getWriteLimiter()); + .forFile(outputFile, ns, ns.getConf(), cryptoService) + .withTableConfiguration(acuTableConf); + if (dropCacheBehindOutput) { outBuilder.dropCachesBehind(); }
