Skip to content

Commit 4bb1851

Browse files
Revert "[ES|QL] Date nanos implicit casting in union types option #2 (#127797…"
This reverts commit 4fc089b.
1 parent 4dd371d commit 4bb1851

File tree

14 files changed

+12
-1333
lines changed

14 files changed

+12
-1333
lines changed

docs/changelog/127797.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/DateUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class DateUtils {
6565
.appendValue(MINUTE_OF_HOUR, 2)
6666
.appendLiteral(':')
6767
.appendValue(SECOND_OF_MINUTE, 2)
68-
.appendFraction(NANO_OF_SECOND, 0, 9, true)
68+
.appendFraction(NANO_OF_SECOND, 3, 9, true)
6969
.appendOffsetId()
7070
.toFormatter(Locale.ROOT);
7171

x-pack/plugin/esql/qa/server/single-node/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ dependencies {
77
javaRestTestImplementation project(xpackModule('esql:qa:testFixtures'))
88
javaRestTestImplementation project(xpackModule('esql:qa:server'))
99
javaRestTestImplementation project(xpackModule('esql:tools'))
10-
javaRestTestImplementation project(xpackModule('esql'))
1110
yamlRestTestImplementation project(xpackModule('esql:qa:server'))
1211

1312
javaRestTestImplementation('org.apache.arrow:arrow-vector:16.1.0')

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ public class CsvTestsDataLoader {
105105
);
106106
private static final TestDataset AIRPORTS_WEB = new TestDataset("airports_web");
107107
private static final TestDataset DATE_NANOS = new TestDataset("date_nanos");
108-
private static final TestDataset DATE_NANOS_UNION_TYPES = new TestDataset("date_nanos_union_types");
109108
private static final TestDataset COUNTRIES_BBOX = new TestDataset("countries_bbox");
110109
private static final TestDataset COUNTRIES_BBOX_WEB = new TestDataset("countries_bbox_web");
111110
private static final TestDataset AIRPORT_CITY_BOUNDARIES = new TestDataset("airport_city_boundaries");
@@ -164,7 +163,6 @@ public class CsvTestsDataLoader {
164163
Map.entry(MULTIVALUE_GEOMETRIES.indexName, MULTIVALUE_GEOMETRIES),
165164
Map.entry(MULTIVALUE_POINTS.indexName, MULTIVALUE_POINTS),
166165
Map.entry(DATE_NANOS.indexName, DATE_NANOS),
167-
Map.entry(DATE_NANOS_UNION_TYPES.indexName, DATE_NANOS_UNION_TYPES),
168166
Map.entry(K8S.indexName, K8S),
169167
Map.entry(DISTANCES.indexName, DISTANCES),
170168
Map.entry(ADDRESSES.indexName, ADDRESSES),

x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/date_nanos_union_types.csv

Lines changed: 0 additions & 13 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
birth_date:date ,emp_no:long,first_name:text,gender:text,hire_date:date_nanos,languages:byte,languages.long:long,languages.short:short,languages.byte:byte,last_name:text,salary:long,height:float,height.double:double,height.scaled_float:scaled_float,height.half_float:half_float,still_hired:keyword,avg_worked_seconds:unsigned_long,job_positions:text,is_rehired:keyword,salary_change:float,salary_change.int:integer,salary_change.long:long,salary_change.keyword:keyword
1+
birth_date:date_nanos ,emp_no:long,first_name:text,gender:text,hire_date:date_nanos,languages:byte,languages.long:long,languages.short:short,languages.byte:byte,last_name:text,salary:long,height:float,height.double:double,height.scaled_float:scaled_float,height.half_float:half_float,still_hired:keyword,avg_worked_seconds:unsigned_long,job_positions:text,is_rehired:keyword,salary_change:float,salary_change.int:integer,salary_change.long:long,salary_change.keyword:keyword
22
1953-09-02T00:00:00Z,10001,Georgi ,M,1986-06-26T00:00:00Z,2,2,2,2,Facello ,57305,2.03,2.03,2.03,2.03,true ,268728049,[Senior Python Developer,Accountant],[false,true],[1.19],[1],[1],[1.19]
33
1964-06-02T00:00:00Z,10002,Bezalel ,F,1985-11-21T00:00:00Z,5,5,5,5,Simmel ,56371,2.08,2.08,2.08,2.08,true ,328922887,[Senior Team Lead],[false,false],[-7.23,11.17],[-7,11],[-7,11],[-7.23,11.17]
44
1959-12-03T00:00:00Z,10003,Parto ,M,1986-08-28T00:00:00Z,4,4,4,4,Bamford ,61805,1.83,1.83,1.83,1.83,false,200296405,[],[],[14.68,12.82],[14,12],[14,12],[14.68,12.82]

x-pack/plugin/esql/qa/testFixtures/src/main/resources/mapping-date_nanos_union_types.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)