Skip to content

Commit 65fd864

Browse files
A specialized Trie for Block Tree Index (#14563)
* A specialized Trie for Block Tree Index (#14333) * Fix OOM of TestTrie (#14488) * Compute the doc range more efficiently when flushing doc block (#14447) * Fix TestForTooMuchCloning (#14547) * Fix tests: too many calls to IndexInput.clone during merging (#14595) * Simplify rootCodeFp (#14596) --------- Co-authored-by: panguixin <[email protected]>
1 parent 67fdb91 commit 65fd864

File tree

111 files changed

+12192
-289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+12192
-289
lines changed

gradle/generation/forUtil.gradle

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ configure(project(":lucene:core")) {
2323
description "Regenerate gen_ForUtil.py"
2424
group "generation"
2525

26-
def genDir = file("src/java/org/apache/lucene/codecs/lucene101")
26+
def genDir = file("src/java/org/apache/lucene/codecs/lucene103")
2727
def genScript = file("${genDir}/gen_ForUtil.py")
2828
def genOutput = file("${genDir}/ForUtil.java")
2929

@@ -48,7 +48,7 @@ configure(project(":lucene:core")) {
4848
description "Regenerate gen_ForDeltaUtil.py"
4949
group "generation"
5050

51-
def genDir = file("src/java/org/apache/lucene/codecs/lucene101")
51+
def genDir = file("src/java/org/apache/lucene/codecs/lucene103")
5252
def genScript = file("${genDir}/gen_ForDeltaUtil.py")
5353
def genOutput = file("${genDir}/ForDeltaUtil.java")
5454

@@ -197,5 +197,55 @@ configure(project(":lucene:backward-codecs")) {
197197
andThenTasks: ["spotlessJava", "spotlessJavaApply"],
198198
mustRunBefore: [ "compileJava" ]
199199
])
200+
201+
task generateForUtil101Internal() {
202+
description "Regenerate gen_ForUtil.py"
203+
group "generation"
204+
205+
def genDir = file("src/java/org/apache/lucene/backward_codecs/lucene101")
206+
def genScript = file("${genDir}/gen_ForUtil.py")
207+
def genOutput = file("${genDir}/ForUtil.java")
208+
209+
inputs.file genScript
210+
outputs.file genOutput
211+
212+
doLast {
213+
quietExec {
214+
workingDir genDir
215+
executable project.externalTool("python3")
216+
args = [ '-B', genScript ]
217+
}
218+
}
219+
}
220+
221+
regenerate.dependsOn wrapWithPersistentChecksums(generateForUtil101Internal, [
222+
andThenTasks: ["spotlessJava", "spotlessJavaApply"],
223+
mustRunBefore: [ "compileJava" ]
224+
])
225+
226+
task generateForDeltaUtil101Internal() {
227+
description "Regenerate gen_ForDeltaUtil.py"
228+
group "generation"
229+
230+
def genDir = file("src/java/org/apache/lucene/backward_codecs/lucene101")
231+
def genScript = file("${genDir}/gen_ForDeltaUtil.py")
232+
def genOutput = file("${genDir}/ForDeltaUtil.java")
233+
234+
inputs.file genScript
235+
outputs.file genOutput
236+
237+
doLast {
238+
quietExec {
239+
workingDir genDir
240+
executable project.externalTool("python3")
241+
args = [ '-B', genScript ]
242+
}
243+
}
244+
}
245+
246+
regenerate.dependsOn wrapWithPersistentChecksums(generateForDeltaUtil101Internal, [
247+
andThenTasks: ["spotlessJava", "spotlessJavaApply"],
248+
mustRunBefore: [ "compileJava" ]
249+
])
200250
}
201251

lucene/CHANGES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ Optimizations
4141

4242
* GITHUB#14425: KeywordField.newSetQuery() reuses prefixed terms (Mikhail Khludnev)
4343

44+
* GITHUB#14333: Introduce a specialized trie for block tree index, instead of FST. (Guo Feng)
45+
46+
* GITHUB#14447: Compute the doc range more efficiently when flushing doc block. (Pan Guixin)
47+
4448
Bug Fixes
4549
---------------------
4650
(No changes)
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/ForDeltaUtil.java": "f4cff08d9a5dd99f5332c2f9f6d386f0d7f58677",
3+
"lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/gen_ForDeltaUtil.py": "ea46cd6b2384fc1cddb8c1dc5e30bf5f76054d91"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/ForUtil.java": "5a7c2e1e09780a2ccd31c22a1e1fa47443cf2a32",
3+
"lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/gen_ForUtil.py": "c98cce3be0698048ebda6beaa9d404f25089930d"
4+
}

lucene/backward-codecs/src/java/module-info.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@
3131
exports org.apache.lucene.backward_codecs.lucene86;
3232
exports org.apache.lucene.backward_codecs.lucene87;
3333
exports org.apache.lucene.backward_codecs.lucene90;
34+
exports org.apache.lucene.backward_codecs.lucene90.blocktree;
3435
exports org.apache.lucene.backward_codecs.lucene91;
3536
exports org.apache.lucene.backward_codecs.lucene92;
3637
exports org.apache.lucene.backward_codecs.lucene94;
3738
exports org.apache.lucene.backward_codecs.lucene95;
3839
exports org.apache.lucene.backward_codecs.lucene99;
3940
exports org.apache.lucene.backward_codecs.lucene912;
4041
exports org.apache.lucene.backward_codecs.lucene100;
42+
exports org.apache.lucene.backward_codecs.lucene101;
4143
exports org.apache.lucene.backward_codecs.packed;
4244
exports org.apache.lucene.backward_codecs.store;
4345

@@ -48,7 +50,8 @@
4850
org.apache.lucene.backward_codecs.lucene84.Lucene84PostingsFormat,
4951
org.apache.lucene.backward_codecs.lucene90.Lucene90PostingsFormat,
5052
org.apache.lucene.backward_codecs.lucene99.Lucene99PostingsFormat,
51-
org.apache.lucene.backward_codecs.lucene912.Lucene912PostingsFormat;
53+
org.apache.lucene.backward_codecs.lucene912.Lucene912PostingsFormat,
54+
org.apache.lucene.backward_codecs.lucene101.Lucene101PostingsFormat;
5255
provides org.apache.lucene.codecs.KnnVectorsFormat with
5356
org.apache.lucene.backward_codecs.lucene90.Lucene90HnswVectorsFormat,
5457
org.apache.lucene.backward_codecs.lucene91.Lucene91HnswVectorsFormat,
@@ -67,5 +70,6 @@
6770
org.apache.lucene.backward_codecs.lucene95.Lucene95Codec,
6871
org.apache.lucene.backward_codecs.lucene99.Lucene99Codec,
6972
org.apache.lucene.backward_codecs.lucene912.Lucene912Codec,
70-
org.apache.lucene.backward_codecs.lucene100.Lucene100Codec;
73+
org.apache.lucene.backward_codecs.lucene100.Lucene100Codec,
74+
org.apache.lucene.backward_codecs.lucene101.Lucene101Codec;
7175
}

0 commit comments

Comments
 (0)