group dataset files

idegtiarenko · Dec 16, 2024 · c0e6457 · c0e6457
1 parent c1569b2
commit c0e6457
Show file tree

Hide file tree

Showing 36 changed files with 2 additions and 2 deletions.
diff --git a/...n/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java b/...n/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java
@@ -349,7 +349,7 @@ private static void load(RestClient client, TestsDataset dataset, Logger logger,
         if (mapping == null) {
             throw new IllegalArgumentException("Cannot find resource " + mappingName);
         }
-        final String dataName = "/" + dataset.dataFileName;
+        final String dataName = "/data/" + dataset.dataFileName;
         URL data = CsvTestsDataLoader.class.getResource(dataName);
         if (data == null) {
             throw new IllegalArgumentException("Cannot find resource " + dataName);

diff --git a/...Fixtures/src/main/resources/addresses.csv → ...res/src/main/resources/data/addresses.csv b/...Fixtures/src/main/resources/addresses.csv → ...res/src/main/resources/data/addresses.csv
diff --git a/.../testFixtures/src/main/resources/ages.csv → ...Fixtures/src/main/resources/data/ages.csv b/.../testFixtures/src/main/resources/ages.csv → ...Fixtures/src/main/resources/data/ages.csv
diff --git a/...ain/resources/airport_city_boundaries.csv → ...esources/data/airport_city_boundaries.csv b/...ain/resources/airport_city_boundaries.csv → ...esources/data/airport_city_boundaries.csv
diff --git a/...tFixtures/src/main/resources/airports.csv → ...ures/src/main/resources/data/airports.csv b/...tFixtures/src/main/resources/airports.csv → ...ures/src/main/resources/data/airports.csv
diff --git a/...xtures/src/main/resources/airports_mp.csv → ...s/src/main/resources/data/airports_mp.csv b/...xtures/src/main/resources/airports_mp.csv → ...s/src/main/resources/data/airports_mp.csv
diff --git a/...tures/src/main/resources/airports_web.csv → .../src/main/resources/data/airports_web.csv b/...tures/src/main/resources/airports_web.csv → .../src/main/resources/data/airports_web.csv
diff --git a/...estFixtures/src/main/resources/alerts.csv → ...xtures/src/main/resources/data/alerts.csv b/...estFixtures/src/main/resources/alerts.csv → ...xtures/src/main/resources/data/alerts.csv
diff --git a/.../testFixtures/src/main/resources/apps.csv → ...Fixtures/src/main/resources/data/apps.csv b/.../testFixtures/src/main/resources/apps.csv → ...Fixtures/src/main/resources/data/apps.csv
diff --git a/...testFixtures/src/main/resources/books.csv → ...ixtures/src/main/resources/data/books.csv b/...testFixtures/src/main/resources/books.csv → ...ixtures/src/main/resources/data/books.csv
diff --git a/...ain/resources/cartesian_multipolygons.csv → ...esources/data/cartesian_multipolygons.csv b/...ain/resources/cartesian_multipolygons.csv → ...esources/data/cartesian_multipolygons.csv
diff --git a/...xtures/src/main/resources/client_cidr.csv → ...s/src/main/resources/data/client_cidr.csv b/...xtures/src/main/resources/client_cidr.csv → ...s/src/main/resources/data/client_cidr.csv
diff --git a/...Fixtures/src/main/resources/clientips.csv → ...res/src/main/resources/data/clientips.csv b/...Fixtures/src/main/resources/clientips.csv → ...res/src/main/resources/data/clientips.csv
diff --git a/...res/src/main/resources/countries_bbox.csv → ...rc/main/resources/data/countries_bbox.csv b/...res/src/main/resources/countries_bbox.csv → ...rc/main/resources/data/countries_bbox.csv
diff --git a/...src/main/resources/countries_bbox_web.csv → ...ain/resources/data/countries_bbox_web.csv b/...src/main/resources/countries_bbox_web.csv → ...ain/resources/data/countries_bbox_web.csv
diff --git a/...ixtures/src/main/resources/date_nanos.csv → ...es/src/main/resources/data/date_nanos.csv b/...ixtures/src/main/resources/date_nanos.csv → ...es/src/main/resources/data/date_nanos.csv
diff --git a/...stFixtures/src/main/resources/decades.csv → ...tures/src/main/resources/data/decades.csv b/...stFixtures/src/main/resources/decades.csv → ...tures/src/main/resources/data/decades.csv
diff --git a/...Fixtures/src/main/resources/distances.csv → ...res/src/main/resources/data/distances.csv b/...Fixtures/src/main/resources/distances.csv → ...res/src/main/resources/data/distances.csv
diff --git a/...Fixtures/src/main/resources/employees.csv → ...res/src/main/resources/data/employees.csv b/...Fixtures/src/main/resources/employees.csv → ...res/src/main/resources/data/employees.csv
diff --git a/...main/resources/employees_incompatible.csv → ...resources/data/employees_incompatible.csv b/...main/resources/employees_incompatible.csv → ...resources/data/employees_incompatible.csv
diff --git a/...stFixtures/src/main/resources/heights.csv → ...tures/src/main/resources/data/heights.csv b/...stFixtures/src/main/resources/heights.csv → ...tures/src/main/resources/data/heights.csv
diff --git a/...testFixtures/src/main/resources/hosts.csv → ...ixtures/src/main/resources/data/hosts.csv b/...testFixtures/src/main/resources/hosts.csv → ...ixtures/src/main/resources/data/hosts.csv
diff --git a/...a/testFixtures/src/main/resources/k8s.csv → ...tFixtures/src/main/resources/data/k8s.csv b/...a/testFixtures/src/main/resources/k8s.csv → ...tFixtures/src/main/resources/data/k8s.csv
diff --git a/...Fixtures/src/main/resources/languages.csv → ...res/src/main/resources/data/languages.csv b/...Fixtures/src/main/resources/languages.csv → ...res/src/main/resources/data/languages.csv
diff --git a/...in/resources/languages_non_unique_key.csv → ...sources/data/languages_non_unique_key.csv b/...in/resources/languages_non_unique_key.csv → ...sources/data/languages_non_unique_key.csv
diff --git a/...ures/src/main/resources/message_types.csv → ...src/main/resources/data/message_types.csv b/...ures/src/main/resources/message_types.csv → ...src/main/resources/data/message_types.csv
diff --git a/...main/resources/missing_ip_sample_data.csv → ...resources/data/missing_ip_sample_data.csv b/...main/resources/missing_ip_sample_data.csv → ...resources/data/missing_ip_sample_data.csv
diff --git a/.../main/resources/multivalue_geometries.csv → .../resources/data/multivalue_geometries.csv b/.../main/resources/multivalue_geometries.csv → .../resources/data/multivalue_geometries.csv
diff --git a/.../src/main/resources/multivalue_points.csv → ...main/resources/data/multivalue_points.csv b/.../src/main/resources/multivalue_points.csv → ...main/resources/data/multivalue_points.csv
diff --git a/...res/src/main/resources/mv_sample_data.csv → ...rc/main/resources/data/mv_sample_data.csv b/...res/src/main/resources/mv_sample_data.csv → ...rc/main/resources/data/mv_sample_data.csv
diff --git a/...xtures/src/main/resources/sample_data.csv → ...s/src/main/resources/data/sample_data.csv b/...xtures/src/main/resources/sample_data.csv → ...s/src/main/resources/data/sample_data.csv
diff --git a/...rc/main/resources/sample_data_ts_long.csv → ...in/resources/data/sample_data_ts_long.csv b/...rc/main/resources/sample_data_ts_long.csv → ...in/resources/data/sample_data_ts_long.csv
diff --git a/...c/main/resources/sample_data_ts_nanos.csv → ...n/resources/data/sample_data_ts_nanos.csv b/...c/main/resources/sample_data_ts_nanos.csv → ...n/resources/data/sample_data_ts_nanos.csv
diff --git a/...ures/src/main/resources/semantic_text.csv → ...src/main/resources/data/semantic_text.csv b/...ures/src/main/resources/semantic_text.csv → ...src/main/resources/data/semantic_text.csv
diff --git a/...stFixtures/src/main/resources/ul_logs.csv → ...tures/src/main/resources/data/ul_logs.csv b/...stFixtures/src/main/resources/ul_logs.csv → ...tures/src/main/resources/data/ul_logs.csv
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java
@@ -425,7 +425,7 @@ private static CsvTestsDataLoader.TestsDataset testsDataset(LogicalPlan parsed)
     }
 
     private static TestPhysicalOperationProviders testOperationProviders(CsvTestsDataLoader.TestsDataset dataset) throws Exception {
-        var testData = loadPageFromCsv(CsvTests.class.getResource("/" + dataset.dataFileName()), dataset.typeMapping());
+        var testData = loadPageFromCsv(CsvTests.class.getResource("/data/" + dataset.dataFileName()), dataset.typeMapping());
         return new TestPhysicalOperationProviders(testData.v1(), testData.v2());
     }