dsmiley commented on code in PR #3883:
URL: https://github.com/apache/solr/pull/3883#discussion_r2550052503
##########
solr/core/src/java/org/apache/solr/index/LatestVersionFilterMergePolicy.java:
##########
@@ -0,0 +1,52 @@
+package org.apache.solr.index;
+
+import java.io.IOException;
+import java.util.Map;
+import org.apache.lucene.index.MergePolicy;
+import org.apache.lucene.index.MergeTrigger;
+import org.apache.lucene.index.SegmentCommitInfo;
+import org.apache.lucene.index.SegmentInfos;
+import org.apache.lucene.index.TieredMergePolicy;
+import org.apache.lucene.util.Version;
+
+/**
+ * Only allows latest version segments to be considered for merges. That way a
snapshot of older
Review Comment:
I suggest this wording instead:
> Prevents merging segments with differing Lucene major version number
origins. This assists in upgrading to a future Lucene major version.
##########
solr/core/src/java/org/apache/solr/index/LatestVersionFilterMergePolicy.java:
##########
@@ -0,0 +1,52 @@
+package org.apache.solr.index;
+
+import java.io.IOException;
+import java.util.Map;
+import org.apache.lucene.index.MergePolicy;
+import org.apache.lucene.index.MergeTrigger;
+import org.apache.lucene.index.SegmentCommitInfo;
+import org.apache.lucene.index.SegmentInfos;
+import org.apache.lucene.index.TieredMergePolicy;
+import org.apache.lucene.util.Version;
+
+/**
+ * Only allows latest version segments to be considered for merges. That way a
snapshot of older
+ * segments can remain consistent
+ */
+public class LatestVersionFilterMergePolicy extends MergePolicy {
+ MergePolicy delegatePolicy = new TieredMergePolicy();
+
+ @Override
+ public MergeSpecification findMerges(
+ MergeTrigger mergeTrigger, SegmentInfos infos, MergeContext
mergeContext) throws IOException {
+ /*we don't want to remove from the original SegmentInfos, else the
segments may not carry forward upon a commit.
+ That would be catastrophic. Hence we clone.*/
+ SegmentInfos infosClone = infos.clone();
+ infosClone.clear();
+ for (SegmentCommitInfo info : infos) {
+ if (info.info.getMinVersion() != null
+ && info.info.getMinVersion().major == Version.LATEST.major) {
+ infosClone.add(info);
+ }
+ }
+
+ return delegatePolicy.findMerges(mergeTrigger, infosClone, mergeContext);
+ }
+
+ @Override
+ public MergeSpecification findForcedMerges(
+ SegmentInfos segmentInfos,
+ int maxSegmentCount,
+ Map<SegmentCommitInfo, Boolean> segmentsToMerge,
+ MergeContext mergeContext)
+ throws IOException {
+ return delegatePolicy.findForcedMerges(
Review Comment:
the constraint isn't applied, but shouldn't it?
##########
solr/core/src/java/org/apache/solr/index/LatestVersionFilterMergePolicy.java:
##########
@@ -0,0 +1,52 @@
+package org.apache.solr.index;
+
+import java.io.IOException;
+import java.util.Map;
+import org.apache.lucene.index.MergePolicy;
+import org.apache.lucene.index.MergeTrigger;
+import org.apache.lucene.index.SegmentCommitInfo;
+import org.apache.lucene.index.SegmentInfos;
+import org.apache.lucene.index.TieredMergePolicy;
+import org.apache.lucene.util.Version;
+
+/**
+ * Only allows latest version segments to be considered for merges. That way a
snapshot of older
+ * segments can remain consistent
+ */
+public class LatestVersionFilterMergePolicy extends MergePolicy {
Review Comment:
Have you seen FilterMergePolicy for delegation?
##########
solr/core/src/java/org/apache/solr/index/LatestVersionFilterMergePolicy.java:
##########
@@ -0,0 +1,52 @@
+package org.apache.solr.index;
+
+import java.io.IOException;
+import java.util.Map;
+import org.apache.lucene.index.MergePolicy;
+import org.apache.lucene.index.MergeTrigger;
+import org.apache.lucene.index.SegmentCommitInfo;
+import org.apache.lucene.index.SegmentInfos;
+import org.apache.lucene.index.TieredMergePolicy;
+import org.apache.lucene.util.Version;
+
+/**
+ * Only allows latest version segments to be considered for merges. That way a
snapshot of older
+ * segments can remain consistent
+ */
+public class LatestVersionFilterMergePolicy extends MergePolicy {
+ MergePolicy delegatePolicy = new TieredMergePolicy();
+
+ @Override
+ public MergeSpecification findMerges(
+ MergeTrigger mergeTrigger, SegmentInfos infos, MergeContext
mergeContext) throws IOException {
+ /*we don't want to remove from the original SegmentInfos, else the
segments may not carry forward upon a commit.
Review Comment:
I think you could merely say that input SegmentInfos should be treated as
immutable, and that modifying it is dangerous (ideally would be impossible).
An FYI. Your text had me thinking for a moment that the concern was specific
to this MP but it's a general statement across Lucene, I see. When I see other
usages in Lucene, I don't see dire warnings.
##########
solr/core/src/java/org/apache/solr/index/LatestVersionFilterMergePolicy.java:
##########
@@ -0,0 +1,52 @@
+package org.apache.solr.index;
+
+import java.io.IOException;
+import java.util.Map;
+import org.apache.lucene.index.MergePolicy;
+import org.apache.lucene.index.MergeTrigger;
+import org.apache.lucene.index.SegmentCommitInfo;
+import org.apache.lucene.index.SegmentInfos;
+import org.apache.lucene.index.TieredMergePolicy;
+import org.apache.lucene.util.Version;
+
+/**
+ * Only allows latest version segments to be considered for merges. That way a
snapshot of older
+ * segments can remain consistent
+ */
+public class LatestVersionFilterMergePolicy extends MergePolicy {
+ MergePolicy delegatePolicy = new TieredMergePolicy();
+
+ @Override
+ public MergeSpecification findMerges(
+ MergeTrigger mergeTrigger, SegmentInfos infos, MergeContext
mergeContext) throws IOException {
+ /*we don't want to remove from the original SegmentInfos, else the
segments may not carry forward upon a commit.
+ That would be catastrophic. Hence we clone.*/
+ SegmentInfos infosClone = infos.clone();
+ infosClone.clear();
+ for (SegmentCommitInfo info : infos) {
+ if (info.info.getMinVersion() != null
+ && info.info.getMinVersion().major == Version.LATEST.major) {
+ infosClone.add(info);
+ }
+ }
+
+ return delegatePolicy.findMerges(mergeTrigger, infosClone, mergeContext);
+ }
+
+ @Override
+ public MergeSpecification findForcedMerges(
+ SegmentInfos segmentInfos,
+ int maxSegmentCount,
+ Map<SegmentCommitInfo, Boolean> segmentsToMerge,
+ MergeContext mergeContext)
+ throws IOException {
+ return delegatePolicy.findForcedMerges(
+ segmentInfos, maxSegmentCount, segmentsToMerge, mergeContext);
+ }
+
+ @Override
+ public MergeSpecification findForcedDeletesMerges(
+ SegmentInfos segmentInfos, MergeContext mergeContext) throws IOException
{
+ return delegatePolicy.findForcedDeletesMerges(segmentInfos, mergeContext);
Review Comment:
the constraint isn't applied, but shouldn't it?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
