Browse Source

group dataset files (#118739) (#119045)

*.csv files used for creating data and *.csv-spec used to define test scenarios are blending in the resource directory.
This change moves all *.csv files to data/*.csv so that it is easier to distinguish between data and specs.
This allows to have a quicker overview of existing data when starting a new spec.
Ievgen Degtiarenko 10 months ago
parent
commit
023f73f93e
36 changed files with 2 additions and 2 deletions
  1. 1 1
      x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java
  2. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/addresses.csv
  3. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/ages.csv
  4. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airport_city_boundaries.csv
  5. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airports.csv
  6. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airports_mp.csv
  7. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airports_web.csv
  8. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/alerts.csv
  9. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/apps.csv
  10. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/books.csv
  11. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/cartesian_multipolygons.csv
  12. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/client_cidr.csv
  13. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/clientips.csv
  14. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/countries_bbox.csv
  15. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/countries_bbox_web.csv
  16. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/date_nanos.csv
  17. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/decades.csv
  18. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/distances.csv
  19. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/employees.csv
  20. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/employees_incompatible.csv
  21. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/heights.csv
  22. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/hosts.csv
  23. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/k8s.csv
  24. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/languages.csv
  25. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/languages_non_unique_key.csv
  26. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/message_types.csv
  27. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/missing_ip_sample_data.csv
  28. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/multivalue_geometries.csv
  29. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/multivalue_points.csv
  30. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/mv_sample_data.csv
  31. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/sample_data.csv
  32. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/sample_data_ts_long.csv
  33. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/sample_data_ts_nanos.csv
  34. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/semantic_text.csv
  35. 0 0
      x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/ul_logs.csv
  36. 1 1
      x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java

+ 1 - 1
x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java

@@ -362,7 +362,7 @@ public class CsvTestsDataLoader {
         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);

+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/addresses.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/addresses.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/ages.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/ages.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/airport_city_boundaries.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airport_city_boundaries.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/airports.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airports.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/airports_mp.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airports_mp.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/airports_web.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airports_web.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/alerts.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/alerts.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/apps.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/apps.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/books.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/books.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/cartesian_multipolygons.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/cartesian_multipolygons.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/client_cidr.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/client_cidr.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/clientips.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/clientips.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/countries_bbox.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/countries_bbox.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/countries_bbox_web.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/countries_bbox_web.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/date_nanos.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/date_nanos.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/decades.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/decades.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/distances.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/distances.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/employees.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/employees.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/employees_incompatible.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/employees_incompatible.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/heights.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/heights.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/hosts.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/hosts.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/k8s.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/k8s.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/languages.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/languages.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/languages_non_unique_key.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/languages_non_unique_key.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/message_types.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/message_types.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/missing_ip_sample_data.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/missing_ip_sample_data.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/multivalue_geometries.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/multivalue_geometries.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/multivalue_points.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/multivalue_points.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/mv_sample_data.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/mv_sample_data.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample_data.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/sample_data.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample_data_ts_long.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/sample_data_ts_long.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample_data_ts_nanos.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/sample_data_ts_nanos.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/semantic_text.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/semantic_text.csv


+ 0 - 0
x-pack/plugin/esql/qa/testFixtures/src/main/resources/ul_logs.csv → x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/ul_logs.csv


+ 1 - 1
x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java

@@ -423,7 +423,7 @@ public class CsvTests extends ESTestCase {
     }
 
     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());
     }