Skip to content

Apache Lucene open-source search software

Fix forUtil.gradle to actually execute python script and also fix type error in script (#12411)

Uwe Schindlerf668cfd1cd78
diff --git a/gradle/generation/forUtil.gradle b/gradle/generation/forUtil.gradle
index ca79924b6b6..9ada40c8dde 100644
--- a/gradle/generation/forUtil.gradle
+++ b/gradle/generation/forUtil.gradle
@@ -34,7 +34,7 @@ configure(project(":lucene:core")) {
quietExec {
workingDir genDir
executable project.externalTool("python3")
- args = []
+ args = [ '-B', genScript ]
}
}
}
@@ -59,7 +59,7 @@ configure(project(":lucene:backward-codecs")) {
quietExec {
workingDir genDir
executable project.externalTool("python3")
- args = []
+ args = [ '-B', genScript ]
}
}
}
diff --git a/lucene/backward-codecs/src/generated/checksums/generateForUtil.json b/lucene/backward-codecs/src/generated/checksums/generateForUtil.json
index 543f4f5101b..da9642f3841 100644
--- a/lucene/backward-codecs/src/generated/checksums/generateForUtil.json
+++ b/lucene/backward-codecs/src/generated/checksums/generateForUtil.json
@@ -1,4 +1,4 @@
{
"lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene84/ForUtil.java": "e91aafa414018b34a39c8f0947ff58c1f1dde78d",
- "lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene84/gen_ForUtil.py": "285ed73b9763c541edaf40072667d68bd2537c56"
+ "lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene84/gen_ForUtil.py": "7be3f1e17c9055d68a8ad6b0d6321481dcc4d711"
}
\ No newline at end of file
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene84/gen_ForUtil.py b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene84/gen_ForUtil.py
index 40776450425..74159e97b87 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene84/gen_ForUtil.py
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene84/gen_ForUtil.py
@@ -414,7 +414,7 @@ def writeRemainder(bpv, next_primitive, remaining_bits_per_long, o, num_values,
i = 0
remaining_bits = 0
tmp_idx = 0
- for i in range(num_values):
+ for i in range(int(num_values)):
b = bpv
if remaining_bits == 0:
b -= remaining_bits_per_long
diff --git a/lucene/core/src/generated/checksums/generateForUtil.json b/lucene/core/src/generated/checksums/generateForUtil.json
index 31ea1728047..bbc17c7d26e 100644
--- a/lucene/core/src/generated/checksums/generateForUtil.json
+++ b/lucene/core/src/generated/checksums/generateForUtil.json
@@ -1,4 +1,4 @@
{
"lucene/core/src/java/org/apache/lucene/codecs/lucene90/ForUtil.java": "f2091e2b7284b70c740052a9b0ee389e67eb48a9",
- "lucene/core/src/java/org/apache/lucene/codecs/lucene90/gen_ForUtil.py": "69b6fcb95fc127a5cd29a40e4454048f56570a26"
+ "lucene/core/src/java/org/apache/lucene/codecs/lucene90/gen_ForUtil.py": "7a137c58f88d68247be4368122780fa9cc8dce3e"
}
\ No newline at end of file
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene90/gen_ForUtil.py b/lucene/core/src/java/org/apache/lucene/codecs/lucene90/gen_ForUtil.py
index 9f4b03ab39b..c73acc7ead5 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene90/gen_ForUtil.py
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene90/gen_ForUtil.py
@@ -227,10 +227,7 @@ final class ForUtil {
}
for (int i = 0; i < numLongsPerShift; ++i) {
- // Java longs are big endian and we want to read little endian longs, so we need to reverse
- // bytes
- long l = tmp[i];
- out.writeLong(l);
+ out.writeLong(tmp[i]);
}
}
@@ -317,7 +314,7 @@ def writeRemainder(bpv, next_primitive, remaining_bits_per_long, o, num_values,
i = 0
remaining_bits = 0
tmp_idx = 0
- for i in range(num_values):
+ for i in range(int(num_values)):
b = bpv
if remaining_bits == 0:
b -= remaining_bits_per_long