Skip to content

Commit 24b58c2

Browse files
committed
Changed auto generated file name
1 parent c6113c9 commit 24b58c2

4 files changed

Lines changed: 17 additions & 25 deletions

File tree

scripts/nrt.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# /root/jdk1.6.0_31/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC
99

1010
/opt/zing/zingLX-jdk1.6.0_31-5.2.0.0-18-x86_64/bin/java -verbose:gc -Xms40G -Xmx40G -cp .:$LUCENE_HOME/build/core/classes/java:$LUCENE_HOME/build/highlighter/classes/java:$LUCENE_HOME/build/test-framework/classes/java:$LUCENE_HOME/build/queryparser/classes/java:$LUCENE_HOME/build/suggest/classes/java:$LUCENE_HOME/build/analysis/common/classes/java:$LUCENE_HOME/build/grouping/classes/java perf.SearchPerfTest \
11-
-indexPath /large/indices/wikimediumall.lucene4x.Lucene40.nd33.3326M/index \
11+
-indexPath /large/indices/wikimediumall.lucene4x.nd33.3326M/index \
1212
-dirImpl RAMDirectory \
1313
-analyzer StandardAnalyzer \
1414
-taskSource server:localhost:7777 \

src/main/IndexToFST.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.apache.lucene.util.fst.PositiveIntOutputs;
2222
import org.apache.lucene.util.fst.Util;
2323

24-
// javac -cp lucene/core/build/libs/lucene-core-10.0.0-SNAPSHOT.jar IndexToFST.java; java -cp .:lucene/core/build/libs/lucene-core-10.0.0-SNAPSHOT.jar IndexToFST /l/indices/wikimediumall.trunk.facets.taxonomy:Date.taxonomy:Month.taxonomy:DayOfYear.taxonomy:RandomLabel.taxonomy.sortedset:Date.sortedset:Month.sortedset:DayOfYear.sortedset:RandomLabel.sortedset.Lucene90.Lucene90.dvfields.nd33.3326M/index
24+
// javac -cp lucene/core/build/libs/lucene-core-10.0.0-SNAPSHOT.jar IndexToFST.java; java -cp .:lucene/core/build/libs/lucene-core-10.0.0-SNAPSHOT.jar IndexToFST /l/indices/wikimediumall.trunk.nd33.3326M/index
2525

2626
public class IndexToFST {
2727

src/python/competition.py

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -236,37 +236,29 @@ def getName(self):
236236
if self.useCFS:
237237
name.append("cfs")
238238

239-
# TODO: adding facets to filename makes it too long and runs into limits on some machines
240-
# Can we remove this from file name and record it in a different logfile.
239+
# Print index configuration instead of adding to filename
240+
config_parts = []
241241
if self.facets is not None:
242-
name.append("facets")
243-
for arg in self.facets:
244-
name.append(arg[0])
245-
name.append(self.facetDVFormat)
246-
242+
config_parts.append(f"facets: {[arg[0] for arg in self.facets]} (format: {self.facetDVFormat})")
247243
if self.bodyTermVectors:
248-
name.append("tv")
249-
244+
config_parts.append("bodyTermVectors: enabled")
250245
if self.bodyStoredFields:
251-
name.append("stored")
252-
246+
config_parts.append("bodyStoredFields: enabled")
253247
if self.bodyPostingsOffsets:
254-
name.append("offsets")
255-
256-
name.append(self.postingsFormat)
248+
config_parts.append("bodyPostingsOffsets: enabled")
249+
config_parts.append(f"postingsFormat: {self.postingsFormat}")
257250
if self.postingsFormat != self.idFieldPostingsFormat:
258-
name.append(self.idFieldPostingsFormat)
259-
251+
config_parts.append(f"idFieldPostingsFormat: {self.idFieldPostingsFormat}")
260252
if self.addDVFields:
261-
name.append("dvfields")
262-
253+
config_parts.append("addDVFields: enabled")
263254
if self.indexSort:
264-
name.append("sort=%s" % self.indexSort)
265-
255+
config_parts.append(f"indexSort: {self.indexSort}")
266256
if self.vectorFile:
267-
name.append("vectors=%d" % self.vectorDimension)
257+
config_parts.append(f"vectors: dimension={self.vectorDimension}")
268258
if self.quantizeKNNGraph:
269-
name.append("int8-quantized")
259+
config_parts.append("quantizeKNNGraph: enabled")
260+
config_parts.append(f"numDocs: {self.numDocs / 1000000.0:.3f}M")
261+
print(f"Index configuration for {'.'.join(name)}: {', '.join(config_parts)}")
270262

271263
name.append("nd%gM" % (self.numDocs / 1000000.0))
272264
return ".".join(name)

src/python/test_all_fst_sizes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
while True:
2424
print(f"\nTest ram_mb={ram_mb}")
2525
stdout = subprocess.check_output(
26-
f"java -cp .:lucene/core/build/libs/lucene-core-10.0.0-SNAPSHOT.jar IndexToFST /l/indices/wikimediumall.trunk.facets.taxonomy:Date.taxonomy:Month.taxonomy:DayOfYear.taxonomy:RandomLabel.taxonomy.sortedset:Date.sortedset:Month.sortedset:DayOfYear.sortedset:RandomLabel.sortedset.Lucene90.Lucene90.dvfields.nd33.3326M/index {ram_mb}",
26+
f"java -cp .:lucene/core/build/libs/lucene-core-10.0.0-SNAPSHOT.jar IndexToFST /l/indices/wikimediumall.trunk.nd33.3326M/index {ram_mb}",
2727
shell=True,
2828
)
2929

0 commit comments

Comments
 (0)