From c621abc655769348bfd89b14ae7b99d4a10f83a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Fri, 17 Apr 2020 09:44:34 +0200 Subject: [PATCH] HSEARCH-3776 Rename merge_max_optimize_size to merge_max_forced_size Because the "optimize" operation is now called "force-merge", and the related setting in LogByteSizeMergePolicy is now setMaxMergeMBForForcedMerge. --- .../search/backend/lucene/cfg/LuceneIndexSettings.java | 4 ++-- .../lucene/lowlevel/writer/impl/IndexWriterSettings.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/cfg/LuceneIndexSettings.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/cfg/LuceneIndexSettings.java index 17943931cda..b2de382d4e7 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/cfg/LuceneIndexSettings.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/cfg/LuceneIndexSettings.java @@ -192,7 +192,7 @@ private LuceneIndexSettings() { * * @see LogByteSizeMergePolicy#setMaxMergeMBForForcedMerge(double) */ - public static final String WRITER_MERGE_MAX_OPTIMIZE_SIZE = WRITER_PREFIX + WriterRadicals.MERGE_MAX_OPTIMIZE_SIZE; + public static final String WRITER_MERGE_MAX_OPTIMIZE_SIZE = WRITER_PREFIX + WriterRadicals.MERGE_MAX_FORCED_SIZE; /** * The value to pass to {@link LogByteSizeMergePolicy#setCalibrateSizeByDeletes(boolean)}. @@ -307,7 +307,7 @@ private WriterRadicals() { public static final String MERGE_FACTOR = "merge_factor"; public static final String MERGE_MIN_SIZE = "merge_min_size"; public static final String MERGE_MAX_SIZE = "merge_max_size"; - public static final String MERGE_MAX_OPTIMIZE_SIZE = "merge_max_optimize_size"; + public static final String MERGE_MAX_FORCED_SIZE = "merge_max_forced_size"; public static final String MERGE_CALIBRATE_BY_DELETES = "merge_calibrate_by_deletes"; } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/writer/impl/IndexWriterSettings.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/writer/impl/IndexWriterSettings.java index fa034831651..89c8444bf4d 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/writer/impl/IndexWriterSettings.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/writer/impl/IndexWriterSettings.java @@ -11,7 +11,7 @@ import static org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings.WriterRadicals.MAX_MERGE_DOCS; import static org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings.WriterRadicals.MERGE_CALIBRATE_BY_DELETES; import static org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings.WriterRadicals.MERGE_FACTOR; -import static org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings.WriterRadicals.MERGE_MAX_OPTIMIZE_SIZE; +import static org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings.WriterRadicals.MERGE_MAX_FORCED_SIZE; import static org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings.WriterRadicals.MERGE_MAX_SIZE; import static org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings.WriterRadicals.MERGE_MIN_SIZE; import static org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings.WriterRadicals.RAM_BUFFER_SIZE; @@ -69,7 +69,7 @@ public static List> extractAll(ConfigurationPropertyS registerIntegerMergePolicySetting( MERGE_FACTOR, LogByteSizeMergePolicy::setMergeFactor ); registerIntegerMergePolicySetting( MERGE_MIN_SIZE, LogByteSizeMergePolicy::setMinMergeMB ); registerIntegerMergePolicySetting( MERGE_MAX_SIZE, LogByteSizeMergePolicy::setMaxMergeMB ); - registerIntegerMergePolicySetting( MERGE_MAX_OPTIMIZE_SIZE, LogByteSizeMergePolicy::setMaxMergeMBForForcedMerge ); + registerIntegerMergePolicySetting( MERGE_MAX_FORCED_SIZE, LogByteSizeMergePolicy::setMaxMergeMBForForcedMerge ); registerBooleanMergePolicySetting( MERGE_CALIBRATE_BY_DELETES, LogByteSizeMergePolicy::setCalibrateSizeByDeletes ); }