Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix split package with org.apache.lucene.index.ShuffleForceMergePolicy #78605

Merged
merged 2 commits into from
Oct 5, 2021
Merged

Fix split package with org.apache.lucene.index.ShuffleForceMergePolicy #78605

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d9363f
Fix split package with org.apache.lucene.index.ShuffleForceMergePolicy
ChrisHegarty Oct 4, 2021
c5ba106
Merge branch 'master' into shuffleforce
ChrisHegarty Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@ tasks.named('splitPackagesAudit').configure {
// but this should be fixed in Lucene 9
'org.apache.lucene.index.LazySoftDeletesDirectoryReaderWrapper',
'org.apache.lucene.index.OneMergeHelper',
'org.apache.lucene.index.ShuffleForcedMergePolicy',

// Joda should own its own packages! This should be a simple move.
'org.joda.time.format.StrictISODateTimeFormat',
Expand Down
1 change: 0 additions & 1 deletion server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.SegmentCommitInfo;
import org.apache.lucene.index.SegmentInfos;
import org.apache.lucene.index.ShuffleForcedMergePolicy;
import org.apache.lucene.index.SoftDeletesRetentionMergePolicy;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause;
Expand Down
14 changes: 9 additions & 5 deletions ...ucene/index/ShuffleForcedMergePolicy.java → ...ndex/engine/ShuffleForcedMergePolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,21 @@
* Side Public License, v 1.
*/

package org.apache.lucene.index;
package org.elasticsearch.index.engine;

import org.apache.lucene.index.CodecReader;
import org.apache.lucene.index.FilterMergePolicy;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.SegmentCommitInfo;
import org.apache.lucene.index.SegmentInfos;
import org.apache.lucene.index.SegmentReader;
import org.elasticsearch.common.lucene.Lucene;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -67,9 +73,7 @@ public CodecReader wrapForMerge(CodecReader reader) throws IOException {
@Override
public void setMergeInfo(SegmentCommitInfo info) {
// record that this segment was merged with interleaved segments
Map<String, String> copy = new HashMap<>(info.info.getDiagnostics());
copy.put(SHUFFLE_MERGE_KEY, "");
info.info.setDiagnostics(copy);
info.info.addDiagnostics(Map.of(SHUFFLE_MERGE_KEY, ""));
super.setMergeInfo(info);
}
});
Expand Down
1 change: 0 additions & 1 deletion server/src/test/java/org/elasticsearch/index/engine/PrunePostingsMergePolicyTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.ShuffleForcedMergePolicy;
import org.apache.lucene.index.SoftDeletesRetentionMergePolicy;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
Expand Down
1 change: 0 additions & 1 deletion server/src/test/java/org/elasticsearch/index/engine/RecoverySourcePruneMergePolicyTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.SegmentCommitInfo;
import org.apache.lucene.index.SegmentInfos;
import org.apache.lucene.index.ShuffleForcedMergePolicy;
import org.apache.lucene.index.StandardDirectoryReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.DocIdSetIterator;
Expand Down
3 changes: 1 addition & 2 deletions .../index/ShuffleForcedMergePolicyTests.java → ...engine/ShuffleForcedMergePolicyTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.lucene.index;
package org.elasticsearch.index.engine;

import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
Expand All @@ -20,7 +20,6 @@
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.SegmentInfos;
import org.apache.lucene.index.ShuffleForcedMergePolicy;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.apache.lucene.store.Directory;
Expand Down