@@ -299,8 +299,37 @@ public void testExpandEmptyArray() throws Exception {
299299 // first element of the column, it is set to "undefined".
300300 schema ("address" , "undefined" ));
301301 verifyDataRows (response , rows ("ben" , 437821 , 47 , null ));
302+ verifyNumOfRows (response , 1 );
303+
304+ Request deleteRequest =
305+ new Request (
306+ "DELETE" , String .format ("/%s/_doc/%d?refresh=true" , TEST_INDEX_NESTED_SIMPLE , docId ));
307+ client ().performRequest (deleteRequest );
308+ }
309+
310+ @ Test
311+ public void testExpandOnNullField () throws Exception {
312+ final int docId = 6 ;
313+ Request insertRequest =
314+ new Request (
315+ "PUT" , String .format ("/%s/_doc/%d?refresh=true" , TEST_INDEX_NESTED_SIMPLE , docId ));
316+ insertRequest .setJsonEntity (
317+ "{\" name\" :\" ben\" ,\" age\" :47, \" id\" : 437821, \" address\" :null}\n " );
318+ client ().performRequest (insertRequest );
302319
320+ JSONObject response =
321+ executeQuery (
322+ String .format (
323+ "source=%s | where name='ben' | expand address" , TEST_INDEX_NESTED_SIMPLE ));
324+ verifySchema (
325+ response ,
326+ schema ("name" , "string" ),
327+ schema ("age" , "bigint" ),
328+ schema ("id" , "bigint" ),
329+ schema ("address" , "undefined" ));
330+ verifyDataRows (response , rows ("ben" , 437821 , 47 , null ));
303331 verifyNumOfRows (response , 1 );
332+
304333 Request deleteRequest =
305334 new Request (
306335 "DELETE" , String .format ("/%s/_doc/%d?refresh=true" , TEST_INDEX_NESTED_SIMPLE , docId ));
0 commit comments