From 5d91470fb9f3663a2904086444243a24b09441a0 Mon Sep 17 00:00:00 2001 From: Patrick Zhai Date: Tue, 8 Oct 2024 10:17:42 -0600 Subject: [PATCH] Nor hardcoding perf filenames --- src/{main => extra}/perf/AutoPrefixPerf.java | 0 src/{main => extra}/perf/CreateQueries.java | 0 src/{main => extra}/perf/DiskUsage.60.java | 0 src/{main => extra}/perf/DiskUsage.62.java | 0 .../perf/DiskUsage.62.pre-iterators.java | 0 src/{main => extra}/perf/DiskUsage.70.java | 0 src/{main => extra}/perf/DiskUsage.java | 0 src/{main => extra}/perf/FlakeID.java | 0 src/{main => extra}/perf/IDPerfTest.java | 0 src/{main => extra}/perf/Index1BNumbers.java | 0 .../perf/IndexAndSearchOpenStreetMaps.java | 0 .../perf/IndexAndSearchOpenStreetMaps1D.java | 0 .../perf/IndexAndSearchShapes.java | 0 src/{main => extra}/perf/IndexGeoNames.java | 0 src/{main => extra}/perf/IndexGeoNames2.java | 0 src/{main => extra}/perf/IndexNumbers.java | 0 src/{main => extra}/perf/IndexOSM.java | 0 src/{main => extra}/perf/IndexTaxis.java | 0 .../perf/LoadGeoJSONPolygon.java | 0 .../perf/NumericValueFacetBenchmark.java | 0 .../perf/OpenCloseIndexWriter.java | 0 .../perf/OrdinalMapBenchmark.java | 0 .../perf/PreComputedRandomFilter.java | 0 .../perf/PrintPerFieldHeapUsage.java | 0 src/{main => extra}/perf/ReadCSVFile.java | 0 src/{main => extra}/perf/RunFuzzyQuery.java | 0 src/{main => extra}/perf/Search1B.java | 0 src/{main => extra}/perf/SearchGeoNames.java | 0 src/{main => extra}/perf/SearchOSM.java | 0 .../perf/SearchOSMGeoPointDistance.java | 0 src/{main => extra}/perf/SearchTaxis.java | 0 src/{main => extra}/perf/ShowFields.java | 0 .../perf/StoredFieldsBenchmark.java | 0 src/{main => extra}/perf/TermsQueryPerf.java | 0 .../perf/TestAnalyzerPerf.java | 0 .../perf/TestAnalyzerPerf4x.java | 0 .../perf/TestBenchNRTPKLookup.java | 0 src/{main => extra}/perf/TokenizeFile.java | 0 ...a.0166171566d70e776b872f312cc6a9b4fce937da | 0 ...a.05d62a357711d1e4e850a5d2fb7336bf0a7acf24 | 0 ...IndexAndSearchOpenStreetMaps.java.20160414 | 0 ...IndexAndSearchOpenStreetMaps.java.20160424 | 0 ...a.3500b45d6d28253d44e48ff8e444774a5fb3ace0 | 0 ...a.6d288704c447a129fc73bdc03d36fe0b6cc6fe4b | 0 ...a.b0af7a4adf4b8e5494a5fa40ac20e01f0d449f40 | 0 ...a.bfc6dcf92ea49713ecdaa14543ffaa07c62de807 | 0 ...a.e1b45568b41bf67b48baae7b8fec5793300a6814 | 0 .../perf/facets/BenchmarkFacets.java | 0 .../perf/facets/IndexFacets.java | 0 src/{main => extra}/perf/facets/README.md | 0 src/python/competition.py | 33 ++----------------- 51 files changed, 2 insertions(+), 31 deletions(-) rename src/{main => extra}/perf/AutoPrefixPerf.java (100%) rename src/{main => extra}/perf/CreateQueries.java (100%) rename src/{main => extra}/perf/DiskUsage.60.java (100%) rename src/{main => extra}/perf/DiskUsage.62.java (100%) rename src/{main => extra}/perf/DiskUsage.62.pre-iterators.java (100%) rename src/{main => extra}/perf/DiskUsage.70.java (100%) rename src/{main => extra}/perf/DiskUsage.java (100%) rename src/{main => extra}/perf/FlakeID.java (100%) rename src/{main => extra}/perf/IDPerfTest.java (100%) rename src/{main => extra}/perf/Index1BNumbers.java (100%) rename src/{main => extra}/perf/IndexAndSearchOpenStreetMaps.java (100%) rename src/{main => extra}/perf/IndexAndSearchOpenStreetMaps1D.java (100%) rename src/{main => extra}/perf/IndexAndSearchShapes.java (100%) rename src/{main => extra}/perf/IndexGeoNames.java (100%) rename src/{main => extra}/perf/IndexGeoNames2.java (100%) rename src/{main => extra}/perf/IndexNumbers.java (100%) rename src/{main => extra}/perf/IndexOSM.java (100%) rename src/{main => extra}/perf/IndexTaxis.java (100%) rename src/{main => extra}/perf/LoadGeoJSONPolygon.java (100%) rename src/{main => extra}/perf/NumericValueFacetBenchmark.java (100%) rename src/{main => extra}/perf/OpenCloseIndexWriter.java (100%) rename src/{main => extra}/perf/OrdinalMapBenchmark.java (100%) rename src/{main => extra}/perf/PreComputedRandomFilter.java (100%) rename src/{main => extra}/perf/PrintPerFieldHeapUsage.java (100%) rename src/{main => extra}/perf/ReadCSVFile.java (100%) rename src/{main => extra}/perf/RunFuzzyQuery.java (100%) rename src/{main => extra}/perf/Search1B.java (100%) rename src/{main => extra}/perf/SearchGeoNames.java (100%) rename src/{main => extra}/perf/SearchOSM.java (100%) rename src/{main => extra}/perf/SearchOSMGeoPointDistance.java (100%) rename src/{main => extra}/perf/SearchTaxis.java (100%) rename src/{main => extra}/perf/ShowFields.java (100%) rename src/{main => extra}/perf/StoredFieldsBenchmark.java (100%) rename src/{main => extra}/perf/TermsQueryPerf.java (100%) rename src/{main => extra}/perf/TestAnalyzerPerf.java (100%) rename src/{main => extra}/perf/TestAnalyzerPerf4x.java (100%) rename src/{main => extra}/perf/TestBenchNRTPKLookup.java (100%) rename src/{main => extra}/perf/TokenizeFile.java (100%) rename src/{main => extra}/perf/backtest/IndexAndSearchOpenStreetMaps.java.0166171566d70e776b872f312cc6a9b4fce937da (100%) rename src/{main => extra}/perf/backtest/IndexAndSearchOpenStreetMaps.java.05d62a357711d1e4e850a5d2fb7336bf0a7acf24 (100%) rename src/{main => extra}/perf/backtest/IndexAndSearchOpenStreetMaps.java.20160414 (100%) rename src/{main => extra}/perf/backtest/IndexAndSearchOpenStreetMaps.java.20160424 (100%) rename src/{main => extra}/perf/backtest/IndexAndSearchOpenStreetMaps.java.3500b45d6d28253d44e48ff8e444774a5fb3ace0 (100%) rename src/{main => extra}/perf/backtest/IndexAndSearchOpenStreetMaps.java.6d288704c447a129fc73bdc03d36fe0b6cc6fe4b (100%) rename src/{main => extra}/perf/backtest/IndexAndSearchOpenStreetMaps.java.b0af7a4adf4b8e5494a5fa40ac20e01f0d449f40 (100%) rename src/{main => extra}/perf/backtest/IndexAndSearchOpenStreetMaps.java.bfc6dcf92ea49713ecdaa14543ffaa07c62de807 (100%) rename src/{main => extra}/perf/backtest/IndexAndSearchOpenStreetMaps.java.e1b45568b41bf67b48baae7b8fec5793300a6814 (100%) rename src/{main => extra}/perf/facets/BenchmarkFacets.java (100%) rename src/{main => extra}/perf/facets/IndexFacets.java (100%) rename src/{main => extra}/perf/facets/README.md (100%) diff --git a/src/main/perf/AutoPrefixPerf.java b/src/extra/perf/AutoPrefixPerf.java similarity index 100% rename from src/main/perf/AutoPrefixPerf.java rename to src/extra/perf/AutoPrefixPerf.java diff --git a/src/main/perf/CreateQueries.java b/src/extra/perf/CreateQueries.java similarity index 100% rename from src/main/perf/CreateQueries.java rename to src/extra/perf/CreateQueries.java diff --git a/src/main/perf/DiskUsage.60.java b/src/extra/perf/DiskUsage.60.java similarity index 100% rename from src/main/perf/DiskUsage.60.java rename to src/extra/perf/DiskUsage.60.java diff --git a/src/main/perf/DiskUsage.62.java b/src/extra/perf/DiskUsage.62.java similarity index 100% rename from src/main/perf/DiskUsage.62.java rename to src/extra/perf/DiskUsage.62.java diff --git a/src/main/perf/DiskUsage.62.pre-iterators.java b/src/extra/perf/DiskUsage.62.pre-iterators.java similarity index 100% rename from src/main/perf/DiskUsage.62.pre-iterators.java rename to src/extra/perf/DiskUsage.62.pre-iterators.java diff --git a/src/main/perf/DiskUsage.70.java b/src/extra/perf/DiskUsage.70.java similarity index 100% rename from src/main/perf/DiskUsage.70.java rename to src/extra/perf/DiskUsage.70.java diff --git a/src/main/perf/DiskUsage.java b/src/extra/perf/DiskUsage.java similarity index 100% rename from src/main/perf/DiskUsage.java rename to src/extra/perf/DiskUsage.java diff --git a/src/main/perf/FlakeID.java b/src/extra/perf/FlakeID.java similarity index 100% rename from src/main/perf/FlakeID.java rename to src/extra/perf/FlakeID.java diff --git a/src/main/perf/IDPerfTest.java b/src/extra/perf/IDPerfTest.java similarity index 100% rename from src/main/perf/IDPerfTest.java rename to src/extra/perf/IDPerfTest.java diff --git a/src/main/perf/Index1BNumbers.java b/src/extra/perf/Index1BNumbers.java similarity index 100% rename from src/main/perf/Index1BNumbers.java rename to src/extra/perf/Index1BNumbers.java diff --git a/src/main/perf/IndexAndSearchOpenStreetMaps.java b/src/extra/perf/IndexAndSearchOpenStreetMaps.java similarity index 100% rename from src/main/perf/IndexAndSearchOpenStreetMaps.java rename to src/extra/perf/IndexAndSearchOpenStreetMaps.java diff --git a/src/main/perf/IndexAndSearchOpenStreetMaps1D.java b/src/extra/perf/IndexAndSearchOpenStreetMaps1D.java similarity index 100% rename from src/main/perf/IndexAndSearchOpenStreetMaps1D.java rename to src/extra/perf/IndexAndSearchOpenStreetMaps1D.java diff --git a/src/main/perf/IndexAndSearchShapes.java b/src/extra/perf/IndexAndSearchShapes.java similarity index 100% rename from src/main/perf/IndexAndSearchShapes.java rename to src/extra/perf/IndexAndSearchShapes.java diff --git a/src/main/perf/IndexGeoNames.java b/src/extra/perf/IndexGeoNames.java similarity index 100% rename from src/main/perf/IndexGeoNames.java rename to src/extra/perf/IndexGeoNames.java diff --git a/src/main/perf/IndexGeoNames2.java b/src/extra/perf/IndexGeoNames2.java similarity index 100% rename from src/main/perf/IndexGeoNames2.java rename to src/extra/perf/IndexGeoNames2.java diff --git a/src/main/perf/IndexNumbers.java b/src/extra/perf/IndexNumbers.java similarity index 100% rename from src/main/perf/IndexNumbers.java rename to src/extra/perf/IndexNumbers.java diff --git a/src/main/perf/IndexOSM.java b/src/extra/perf/IndexOSM.java similarity index 100% rename from src/main/perf/IndexOSM.java rename to src/extra/perf/IndexOSM.java diff --git a/src/main/perf/IndexTaxis.java b/src/extra/perf/IndexTaxis.java similarity index 100% rename from src/main/perf/IndexTaxis.java rename to src/extra/perf/IndexTaxis.java diff --git a/src/main/perf/LoadGeoJSONPolygon.java b/src/extra/perf/LoadGeoJSONPolygon.java similarity index 100% rename from src/main/perf/LoadGeoJSONPolygon.java rename to src/extra/perf/LoadGeoJSONPolygon.java diff --git a/src/main/perf/NumericValueFacetBenchmark.java b/src/extra/perf/NumericValueFacetBenchmark.java similarity index 100% rename from src/main/perf/NumericValueFacetBenchmark.java rename to src/extra/perf/NumericValueFacetBenchmark.java diff --git a/src/main/perf/OpenCloseIndexWriter.java b/src/extra/perf/OpenCloseIndexWriter.java similarity index 100% rename from src/main/perf/OpenCloseIndexWriter.java rename to src/extra/perf/OpenCloseIndexWriter.java diff --git a/src/main/perf/OrdinalMapBenchmark.java b/src/extra/perf/OrdinalMapBenchmark.java similarity index 100% rename from src/main/perf/OrdinalMapBenchmark.java rename to src/extra/perf/OrdinalMapBenchmark.java diff --git a/src/main/perf/PreComputedRandomFilter.java b/src/extra/perf/PreComputedRandomFilter.java similarity index 100% rename from src/main/perf/PreComputedRandomFilter.java rename to src/extra/perf/PreComputedRandomFilter.java diff --git a/src/main/perf/PrintPerFieldHeapUsage.java b/src/extra/perf/PrintPerFieldHeapUsage.java similarity index 100% rename from src/main/perf/PrintPerFieldHeapUsage.java rename to src/extra/perf/PrintPerFieldHeapUsage.java diff --git a/src/main/perf/ReadCSVFile.java b/src/extra/perf/ReadCSVFile.java similarity index 100% rename from src/main/perf/ReadCSVFile.java rename to src/extra/perf/ReadCSVFile.java diff --git a/src/main/perf/RunFuzzyQuery.java b/src/extra/perf/RunFuzzyQuery.java similarity index 100% rename from src/main/perf/RunFuzzyQuery.java rename to src/extra/perf/RunFuzzyQuery.java diff --git a/src/main/perf/Search1B.java b/src/extra/perf/Search1B.java similarity index 100% rename from src/main/perf/Search1B.java rename to src/extra/perf/Search1B.java diff --git a/src/main/perf/SearchGeoNames.java b/src/extra/perf/SearchGeoNames.java similarity index 100% rename from src/main/perf/SearchGeoNames.java rename to src/extra/perf/SearchGeoNames.java diff --git a/src/main/perf/SearchOSM.java b/src/extra/perf/SearchOSM.java similarity index 100% rename from src/main/perf/SearchOSM.java rename to src/extra/perf/SearchOSM.java diff --git a/src/main/perf/SearchOSMGeoPointDistance.java b/src/extra/perf/SearchOSMGeoPointDistance.java similarity index 100% rename from src/main/perf/SearchOSMGeoPointDistance.java rename to src/extra/perf/SearchOSMGeoPointDistance.java diff --git a/src/main/perf/SearchTaxis.java b/src/extra/perf/SearchTaxis.java similarity index 100% rename from src/main/perf/SearchTaxis.java rename to src/extra/perf/SearchTaxis.java diff --git a/src/main/perf/ShowFields.java b/src/extra/perf/ShowFields.java similarity index 100% rename from src/main/perf/ShowFields.java rename to src/extra/perf/ShowFields.java diff --git a/src/main/perf/StoredFieldsBenchmark.java b/src/extra/perf/StoredFieldsBenchmark.java similarity index 100% rename from src/main/perf/StoredFieldsBenchmark.java rename to src/extra/perf/StoredFieldsBenchmark.java diff --git a/src/main/perf/TermsQueryPerf.java b/src/extra/perf/TermsQueryPerf.java similarity index 100% rename from src/main/perf/TermsQueryPerf.java rename to src/extra/perf/TermsQueryPerf.java diff --git a/src/main/perf/TestAnalyzerPerf.java b/src/extra/perf/TestAnalyzerPerf.java similarity index 100% rename from src/main/perf/TestAnalyzerPerf.java rename to src/extra/perf/TestAnalyzerPerf.java diff --git a/src/main/perf/TestAnalyzerPerf4x.java b/src/extra/perf/TestAnalyzerPerf4x.java similarity index 100% rename from src/main/perf/TestAnalyzerPerf4x.java rename to src/extra/perf/TestAnalyzerPerf4x.java diff --git a/src/main/perf/TestBenchNRTPKLookup.java b/src/extra/perf/TestBenchNRTPKLookup.java similarity index 100% rename from src/main/perf/TestBenchNRTPKLookup.java rename to src/extra/perf/TestBenchNRTPKLookup.java diff --git a/src/main/perf/TokenizeFile.java b/src/extra/perf/TokenizeFile.java similarity index 100% rename from src/main/perf/TokenizeFile.java rename to src/extra/perf/TokenizeFile.java diff --git a/src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.0166171566d70e776b872f312cc6a9b4fce937da b/src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.0166171566d70e776b872f312cc6a9b4fce937da similarity index 100% rename from src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.0166171566d70e776b872f312cc6a9b4fce937da rename to src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.0166171566d70e776b872f312cc6a9b4fce937da diff --git a/src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.05d62a357711d1e4e850a5d2fb7336bf0a7acf24 b/src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.05d62a357711d1e4e850a5d2fb7336bf0a7acf24 similarity index 100% rename from src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.05d62a357711d1e4e850a5d2fb7336bf0a7acf24 rename to src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.05d62a357711d1e4e850a5d2fb7336bf0a7acf24 diff --git a/src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.20160414 b/src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.20160414 similarity index 100% rename from src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.20160414 rename to src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.20160414 diff --git a/src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.20160424 b/src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.20160424 similarity index 100% rename from src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.20160424 rename to src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.20160424 diff --git a/src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.3500b45d6d28253d44e48ff8e444774a5fb3ace0 b/src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.3500b45d6d28253d44e48ff8e444774a5fb3ace0 similarity index 100% rename from src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.3500b45d6d28253d44e48ff8e444774a5fb3ace0 rename to src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.3500b45d6d28253d44e48ff8e444774a5fb3ace0 diff --git a/src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.6d288704c447a129fc73bdc03d36fe0b6cc6fe4b b/src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.6d288704c447a129fc73bdc03d36fe0b6cc6fe4b similarity index 100% rename from src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.6d288704c447a129fc73bdc03d36fe0b6cc6fe4b rename to src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.6d288704c447a129fc73bdc03d36fe0b6cc6fe4b diff --git a/src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.b0af7a4adf4b8e5494a5fa40ac20e01f0d449f40 b/src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.b0af7a4adf4b8e5494a5fa40ac20e01f0d449f40 similarity index 100% rename from src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.b0af7a4adf4b8e5494a5fa40ac20e01f0d449f40 rename to src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.b0af7a4adf4b8e5494a5fa40ac20e01f0d449f40 diff --git a/src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.bfc6dcf92ea49713ecdaa14543ffaa07c62de807 b/src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.bfc6dcf92ea49713ecdaa14543ffaa07c62de807 similarity index 100% rename from src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.bfc6dcf92ea49713ecdaa14543ffaa07c62de807 rename to src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.bfc6dcf92ea49713ecdaa14543ffaa07c62de807 diff --git a/src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.e1b45568b41bf67b48baae7b8fec5793300a6814 b/src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.e1b45568b41bf67b48baae7b8fec5793300a6814 similarity index 100% rename from src/main/perf/backtest/IndexAndSearchOpenStreetMaps.java.e1b45568b41bf67b48baae7b8fec5793300a6814 rename to src/extra/perf/backtest/IndexAndSearchOpenStreetMaps.java.e1b45568b41bf67b48baae7b8fec5793300a6814 diff --git a/src/main/perf/facets/BenchmarkFacets.java b/src/extra/perf/facets/BenchmarkFacets.java similarity index 100% rename from src/main/perf/facets/BenchmarkFacets.java rename to src/extra/perf/facets/BenchmarkFacets.java diff --git a/src/main/perf/facets/IndexFacets.java b/src/extra/perf/facets/IndexFacets.java similarity index 100% rename from src/main/perf/facets/IndexFacets.java rename to src/extra/perf/facets/IndexFacets.java diff --git a/src/main/perf/facets/README.md b/src/extra/perf/facets/README.md similarity index 100% rename from src/main/perf/facets/README.md rename to src/extra/perf/facets/README.md diff --git a/src/python/competition.py b/src/python/competition.py index fc2531de5..41b85e934 100644 --- 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)