-
Notifications
You must be signed in to change notification settings - Fork 1k
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.
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
Introduce TestLucene90DocValuesFormatVariableSkipInterval for testing docvalues skipper index #13550
Merged
Merged
Introduce TestLucene90DocValuesFormatVariableSkipInterval for testing docvalues skipper index #13550
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
989773d
Introduce a SkipperCodec for testing docvalues skipper index
iverase b358d13
fix module info
iverase a33a909
more fixes
iverase 96ddd53
iter
iverase d8b8cdc
don't be so complicated
iverase b545d62
review suggestions
iverase 7654215
add test
iverase File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
lucene/test-framework/src/java/org/apache/lucene/tests/codecs/skipper/SkipperCodec.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.lucene.tests.codecs.skipper; | ||
|
|
||
| import java.util.Random; | ||
| import org.apache.lucene.codecs.DocValuesFormat; | ||
| import org.apache.lucene.codecs.FilterCodec; | ||
| import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat; | ||
| import org.apache.lucene.tests.util.TestUtil; | ||
|
|
||
| /** | ||
| * A codec that uses {@link Lucene90DocValuesFormat} with a random skip index size for its doc | ||
| * values and delegates to the default codec for everything else. | ||
| */ | ||
| public final class SkipperCodec extends FilterCodec { | ||
iverase marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| /** Create a random instance. */ | ||
| public static SkipperCodec randomInstance(Random random) { | ||
| return switch (random.nextInt(10)) { | ||
| case 0 -> new SkipperCodec(); | ||
| default -> new SkipperCodec(random); | ||
| }; | ||
| } | ||
|
|
||
| private final DocValuesFormat docValuesFormat; | ||
| private final int skipIndexIntervalSize; | ||
|
|
||
| /** no arg constructor */ | ||
| public SkipperCodec() { | ||
| super("SkipperCodec", TestUtil.getDefaultCodec()); | ||
| this.docValuesFormat = new Lucene90DocValuesFormat(); | ||
| skipIndexIntervalSize = -1; // default | ||
| } | ||
|
|
||
| /** Creates a DocValuesFormat with random skipIndexIntervalSize */ | ||
| public SkipperCodec(Random random) { | ||
| super("SkipperCodec", TestUtil.getDefaultCodec()); | ||
| this.skipIndexIntervalSize = random.nextInt(1 << 3, 1 << 10); | ||
| this.docValuesFormat = new Lucene90DocValuesFormat(skipIndexIntervalSize); | ||
| } | ||
|
|
||
| @Override | ||
| public DocValuesFormat docValuesFormat() { | ||
| return docValuesFormat; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return getName() + "(skipIndexIntervalSize= " + skipIndexIntervalSize + ")"; | ||
| } | ||
| } | ||
22 changes: 22 additions & 0 deletions
22
lucene/test-framework/src/java/org/apache/lucene/tests/codecs/skipper/package-info.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| /** | ||
| * Support for testing {@link org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat} skipper | ||
| * index. | ||
| */ | ||
| package org.apache.lucene.tests.codecs.skipper; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we make any assumption anywhere that this needs to be a power of two? If so we should validate it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No , there is no assumption. On the other hand I added in the codec a check so skipIndexIntervalSize must be 1. In addtion I replace 1 << x by an integer to remove the suggestion that this is required.