@@ -71,7 +71,7 @@ public void createIndex() throws IOException {
71
71
newVersion = nodes .getNewNodes ().get (0 ).getVersion ();
72
72
isBwcNodeBeforeFieldsApiInQL = bwcVersion .before (FIELDS_API_QL_INTRODUCTION );
73
73
isBwcNodeBeforeFieldsApiInES = bwcVersion .before (SWITCH_TO_FIELDS_API_VERSION );
74
-
74
+
75
75
String mappings = readResource (SqlSearchIT .class .getResourceAsStream ("/all_field_types.json" ));
76
76
createIndex (
77
77
index ,
@@ -90,6 +90,7 @@ public void cleanUpIndex() throws IOException {
90
90
}
91
91
}
92
92
93
+ @ AwaitsFix (bugUrl = "https://github.com/elastic/elasticsearch/issues/70630" )
93
94
public void testAllTypesWithRequestToOldNodes () throws Exception {
94
95
Map <String , Object > expectedResponse = prepareTestData (
95
96
columns -> {
@@ -173,7 +174,7 @@ private Map<String, Object> prepareTestData(Consumer<List<Map<String, Object>>>
173
174
columns .add (columnInfo ("geo_point_no_dv_field" , "geo_point" ));
174
175
columns .add (columnInfo ("geo_shape_field" , "geo_shape" ));
175
176
columns .add (columnInfo ("shape_field" , "shape" ));
176
-
177
+
177
178
expectedResponse .put ("columns" , columns );
178
179
additionalColumns .accept (columns );
179
180
List <List <Object >> rows = new ArrayList <>(numDocs );
@@ -196,7 +197,7 @@ private Map<String, Object> prepareTestData(Consumer<List<Map<String, Object>>>
196
197
builder .append ("\" double_field\" :" + fieldValues .computeIfAbsent ("double_field" , v -> randomDouble ()) + "," );
197
198
builder .append ("\" scaled_float_field\" :" + fieldValues .computeIfAbsent ("scaled_float_field" , v -> 123.5d ) + "," );
198
199
builder .append ("\" boolean_field\" :" + fieldValues .computeIfAbsent ("boolean_field" , v -> randomBoolean ()) + "," );
199
- builder .append ("\" ip_field\" :\" " + fieldValues .computeIfAbsent ("ip_field" , v -> "123.123.123.123" ) + "\" ," );
200
+ builder .append ("\" ip_field\" :\" " + fieldValues .computeIfAbsent ("ip_field" , v -> "123.123.123.123" ) + "\" ," );
200
201
builder .append ("\" text_field\" : \" " + fieldValues .computeIfAbsent ("text_field" , v -> randomAlphaOfLength (5 )) + "\" ," );
201
202
builder .append ("\" keyword_field\" : \" " + fieldValues .computeIfAbsent ("keyword_field" , v -> randomAlphaOfLength (5 )) + "\" ," );
202
203
builder .append ("\" constant_keyword_field\" : \" " + fieldValues .computeIfAbsent ("constant_keyword_field" ,
@@ -210,7 +211,7 @@ private Map<String, Object> prepareTestData(Consumer<List<Map<String, Object>>>
210
211
fieldValues .put ("shape_field" , "POINT (-122.083843 37.386483 30.0)" );
211
212
additionalValues .accept (builder , fieldValues );
212
213
builder .append ("}" );
213
-
214
+
214
215
Request request = new Request ("PUT" , index + "/_doc/" + i );
215
216
request .setJsonEntity (builder .toString ());
216
217
assertOK (client ().performRequest (request ));
0 commit comments