Nor hardcoding perf filenames

mikemccand · Oct 8, 2024 · 5d91470 · 5d91470
1 parent 48da507
commit 5d91470
Show file tree

Hide file tree

Showing 51 changed files with 2 additions and 31 deletions.
diff --git a/src/main/perf/AutoPrefixPerf.java → src/extra/perf/AutoPrefixPerf.java b/src/main/perf/AutoPrefixPerf.java → src/extra/perf/AutoPrefixPerf.java
diff --git a/src/main/perf/CreateQueries.java → src/extra/perf/CreateQueries.java b/src/main/perf/CreateQueries.java → src/extra/perf/CreateQueries.java
diff --git a/src/main/perf/DiskUsage.60.java → src/extra/perf/DiskUsage.60.java b/src/main/perf/DiskUsage.60.java → src/extra/perf/DiskUsage.60.java
diff --git a/src/main/perf/DiskUsage.62.java → src/extra/perf/DiskUsage.62.java b/src/main/perf/DiskUsage.62.java → src/extra/perf/DiskUsage.62.java
diff --git a/...main/perf/DiskUsage.62.pre-iterators.java → ...xtra/perf/DiskUsage.62.pre-iterators.java b/...main/perf/DiskUsage.62.pre-iterators.java → ...xtra/perf/DiskUsage.62.pre-iterators.java
diff --git a/src/main/perf/DiskUsage.70.java → src/extra/perf/DiskUsage.70.java b/src/main/perf/DiskUsage.70.java → src/extra/perf/DiskUsage.70.java
diff --git a/src/main/perf/DiskUsage.java → src/extra/perf/DiskUsage.java b/src/main/perf/DiskUsage.java → src/extra/perf/DiskUsage.java
diff --git a/src/main/perf/FlakeID.java → src/extra/perf/FlakeID.java b/src/main/perf/FlakeID.java → src/extra/perf/FlakeID.java
diff --git a/src/main/perf/IDPerfTest.java → src/extra/perf/IDPerfTest.java b/src/main/perf/IDPerfTest.java → src/extra/perf/IDPerfTest.java
diff --git a/src/main/perf/Index1BNumbers.java → src/extra/perf/Index1BNumbers.java b/src/main/perf/Index1BNumbers.java → src/extra/perf/Index1BNumbers.java
diff --git a/...in/perf/IndexAndSearchOpenStreetMaps.java → ...ra/perf/IndexAndSearchOpenStreetMaps.java b/...in/perf/IndexAndSearchOpenStreetMaps.java → ...ra/perf/IndexAndSearchOpenStreetMaps.java
diff --git a/.../perf/IndexAndSearchOpenStreetMaps1D.java → .../perf/IndexAndSearchOpenStreetMaps1D.java b/.../perf/IndexAndSearchOpenStreetMaps1D.java → .../perf/IndexAndSearchOpenStreetMaps1D.java
diff --git a/src/main/perf/IndexAndSearchShapes.java → src/extra/perf/IndexAndSearchShapes.java b/src/main/perf/IndexAndSearchShapes.java → src/extra/perf/IndexAndSearchShapes.java
diff --git a/src/main/perf/IndexGeoNames.java → src/extra/perf/IndexGeoNames.java b/src/main/perf/IndexGeoNames.java → src/extra/perf/IndexGeoNames.java
diff --git a/src/main/perf/IndexGeoNames2.java → src/extra/perf/IndexGeoNames2.java b/src/main/perf/IndexGeoNames2.java → src/extra/perf/IndexGeoNames2.java
diff --git a/src/main/perf/IndexNumbers.java → src/extra/perf/IndexNumbers.java b/src/main/perf/IndexNumbers.java → src/extra/perf/IndexNumbers.java
diff --git a/src/main/perf/IndexOSM.java → src/extra/perf/IndexOSM.java b/src/main/perf/IndexOSM.java → src/extra/perf/IndexOSM.java
diff --git a/src/main/perf/IndexTaxis.java → src/extra/perf/IndexTaxis.java b/src/main/perf/IndexTaxis.java → src/extra/perf/IndexTaxis.java
diff --git a/src/main/perf/LoadGeoJSONPolygon.java → src/extra/perf/LoadGeoJSONPolygon.java b/src/main/perf/LoadGeoJSONPolygon.java → src/extra/perf/LoadGeoJSONPolygon.java
diff --git a/...main/perf/NumericValueFacetBenchmark.java → ...xtra/perf/NumericValueFacetBenchmark.java b/...main/perf/NumericValueFacetBenchmark.java → ...xtra/perf/NumericValueFacetBenchmark.java
diff --git a/src/main/perf/OpenCloseIndexWriter.java → src/extra/perf/OpenCloseIndexWriter.java b/src/main/perf/OpenCloseIndexWriter.java → src/extra/perf/OpenCloseIndexWriter.java
diff --git a/src/main/perf/OrdinalMapBenchmark.java → src/extra/perf/OrdinalMapBenchmark.java b/src/main/perf/OrdinalMapBenchmark.java → src/extra/perf/OrdinalMapBenchmark.java
diff --git a/src/main/perf/PreComputedRandomFilter.java → src/extra/perf/PreComputedRandomFilter.java b/src/main/perf/PreComputedRandomFilter.java → src/extra/perf/PreComputedRandomFilter.java
diff --git a/src/main/perf/PrintPerFieldHeapUsage.java → src/extra/perf/PrintPerFieldHeapUsage.java b/src/main/perf/PrintPerFieldHeapUsage.java → src/extra/perf/PrintPerFieldHeapUsage.java
diff --git a/src/main/perf/ReadCSVFile.java → src/extra/perf/ReadCSVFile.java b/src/main/perf/ReadCSVFile.java → src/extra/perf/ReadCSVFile.java
diff --git a/src/main/perf/RunFuzzyQuery.java → src/extra/perf/RunFuzzyQuery.java b/src/main/perf/RunFuzzyQuery.java → src/extra/perf/RunFuzzyQuery.java
diff --git a/src/main/perf/Search1B.java → src/extra/perf/Search1B.java b/src/main/perf/Search1B.java → src/extra/perf/Search1B.java
diff --git a/src/main/perf/SearchGeoNames.java → src/extra/perf/SearchGeoNames.java b/src/main/perf/SearchGeoNames.java → src/extra/perf/SearchGeoNames.java
diff --git a/src/main/perf/SearchOSM.java → src/extra/perf/SearchOSM.java b/src/main/perf/SearchOSM.java → src/extra/perf/SearchOSM.java
diff --git a/src/main/perf/SearchOSMGeoPointDistance.java → ...extra/perf/SearchOSMGeoPointDistance.java b/src/main/perf/SearchOSMGeoPointDistance.java → ...extra/perf/SearchOSMGeoPointDistance.java
diff --git a/src/main/perf/SearchTaxis.java → src/extra/perf/SearchTaxis.java b/src/main/perf/SearchTaxis.java → src/extra/perf/SearchTaxis.java
diff --git a/src/main/perf/ShowFields.java → src/extra/perf/ShowFields.java b/src/main/perf/ShowFields.java → src/extra/perf/ShowFields.java
diff --git a/src/main/perf/StoredFieldsBenchmark.java → src/extra/perf/StoredFieldsBenchmark.java b/src/main/perf/StoredFieldsBenchmark.java → src/extra/perf/StoredFieldsBenchmark.java
diff --git a/src/main/perf/TermsQueryPerf.java → src/extra/perf/TermsQueryPerf.java b/src/main/perf/TermsQueryPerf.java → src/extra/perf/TermsQueryPerf.java
diff --git a/src/main/perf/TestAnalyzerPerf.java → src/extra/perf/TestAnalyzerPerf.java b/src/main/perf/TestAnalyzerPerf.java → src/extra/perf/TestAnalyzerPerf.java
diff --git a/src/main/perf/TestAnalyzerPerf4x.java → src/extra/perf/TestAnalyzerPerf4x.java b/src/main/perf/TestAnalyzerPerf4x.java → src/extra/perf/TestAnalyzerPerf4x.java
diff --git a/src/main/perf/TestBenchNRTPKLookup.java → src/extra/perf/TestBenchNRTPKLookup.java b/src/main/perf/TestBenchNRTPKLookup.java → src/extra/perf/TestBenchNRTPKLookup.java
diff --git a/src/main/perf/TokenizeFile.java → src/extra/perf/TokenizeFile.java b/src/main/perf/TokenizeFile.java → src/extra/perf/TokenizeFile.java
diff --git a/....0166171566d70e776b872f312cc6a9b4fce937da → ....0166171566d70e776b872f312cc6a9b4fce937da b/....0166171566d70e776b872f312cc6a9b4fce937da → ....0166171566d70e776b872f312cc6a9b4fce937da
diff --git a/....05d62a357711d1e4e850a5d2fb7336bf0a7acf24 → ....05d62a357711d1e4e850a5d2fb7336bf0a7acf24 b/....05d62a357711d1e4e850a5d2fb7336bf0a7acf24 → ....05d62a357711d1e4e850a5d2fb7336bf0a7acf24
diff --git a/...ndexAndSearchOpenStreetMaps.java.20160414 → ...ndexAndSearchOpenStreetMaps.java.20160414 b/...ndexAndSearchOpenStreetMaps.java.20160414 → ...ndexAndSearchOpenStreetMaps.java.20160414
diff --git a/...ndexAndSearchOpenStreetMaps.java.20160424 → ...ndexAndSearchOpenStreetMaps.java.20160424 b/...ndexAndSearchOpenStreetMaps.java.20160424 → ...ndexAndSearchOpenStreetMaps.java.20160424
diff --git a/....3500b45d6d28253d44e48ff8e444774a5fb3ace0 → ....3500b45d6d28253d44e48ff8e444774a5fb3ace0 b/....3500b45d6d28253d44e48ff8e444774a5fb3ace0 → ....3500b45d6d28253d44e48ff8e444774a5fb3ace0
diff --git a/....6d288704c447a129fc73bdc03d36fe0b6cc6fe4b → ....6d288704c447a129fc73bdc03d36fe0b6cc6fe4b b/....6d288704c447a129fc73bdc03d36fe0b6cc6fe4b → ....6d288704c447a129fc73bdc03d36fe0b6cc6fe4b
diff --git a/....b0af7a4adf4b8e5494a5fa40ac20e01f0d449f40 → ....b0af7a4adf4b8e5494a5fa40ac20e01f0d449f40 b/....b0af7a4adf4b8e5494a5fa40ac20e01f0d449f40 → ....b0af7a4adf4b8e5494a5fa40ac20e01f0d449f40
diff --git a/....bfc6dcf92ea49713ecdaa14543ffaa07c62de807 → ....bfc6dcf92ea49713ecdaa14543ffaa07c62de807 b/....bfc6dcf92ea49713ecdaa14543ffaa07c62de807 → ....bfc6dcf92ea49713ecdaa14543ffaa07c62de807
diff --git a/....e1b45568b41bf67b48baae7b8fec5793300a6814 → ....e1b45568b41bf67b48baae7b8fec5793300a6814 b/....e1b45568b41bf67b48baae7b8fec5793300a6814 → ....e1b45568b41bf67b48baae7b8fec5793300a6814
diff --git a/src/main/perf/facets/BenchmarkFacets.java → src/extra/perf/facets/BenchmarkFacets.java b/src/main/perf/facets/BenchmarkFacets.java → src/extra/perf/facets/BenchmarkFacets.java
diff --git a/src/main/perf/facets/IndexFacets.java → src/extra/perf/facets/IndexFacets.java b/src/main/perf/facets/IndexFacets.java → src/extra/perf/facets/IndexFacets.java
diff --git a/src/main/perf/facets/README.md → src/extra/perf/facets/README.md b/src/main/perf/facets/README.md → src/extra/perf/facets/README.md
diff --git a/src/python/competition.py b/src/python/competition.py
@@ -400,37 +400,8 @@ def compile(self, cp):
       print('Skip compiling luceneutil: all .class are up to date')
       return
 
-    # Can we iterate the perf directory and get this list automatically?
-    files = ['%s/perf/%s' % (perfSrc, x) for x in (
-      'Args.java',
-      'IndexState.java',
-      'IndexThreads.java',
-      'NRTPerfTest.java',
-      'Indexer.java',
-      'KeepNoCommitsDeletionPolicy.java',
-      'LineFileDocs.java',
-      'LocalTaskSource.java',
-      'OpenDirectory.java',
-      'PKLookupTask.java',
-      'PKLookupWithTermStateTask.java',
-      'PointsPKLookupTask.java',
-      'PerfUtils.java',
-      'RandomQuery.java',
-      'RemoteTaskSource.java',
-      'RespellTask.java',
-      'SearchPerfTest.java',
-      'SearchTask.java',
-      'StatisticsHelper.java',
-      'Task.java',
-      'TaskParser.java',
-      'TaskSource.java',
-      'TaskThreads.java',
-      'VectorDictionary.java',
-      'BenchRearranger.java',
-      'StringFieldDocSelector.java',
-      'UnparsedTask.java',
-      'TaskParserFactory.java',
-      )]
+    perfSrcDir = os.path.join(perfSrc, 'perf')
+    files = list(filter(os.path.isfile, [os.path.join(perfSrcDir, f) for f in os.listdir(perfSrcDir)]))
 
     print('files %s' % files)