[CALCITE-1734] Fix select query result parsing with druid 0.9.2 (Nishant Bangarwa)

nishantmonu51 · jcamachor · commit 9f87b6669761 · 2017-04-10T09:23:07.000+01:00
Close #416
diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidConnectionImpl.java b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidConnectionImpl.java
@@ -188,36 +188,41 @@ private void parse(QueryType queryType, InputStream in, Sink sink,
           if (parser.nextToken() == JsonToken.FIELD_NAME
               && parser.getCurrentName().equals("result")
               && parser.nextToken() == JsonToken.START_OBJECT) {
-            if (parser.nextToken() == JsonToken.FIELD_NAME
-                && parser.getCurrentName().equals("pagingIdentifiers")
-                && parser.nextToken() == JsonToken.START_OBJECT) {
-              JsonToken token = parser.nextToken();
-              while (parser.getCurrentToken() == JsonToken.FIELD_NAME) {
-                page.pagingIdentifier = parser.getCurrentName();
-                if (parser.nextToken() == JsonToken.VALUE_NUMBER_INT) {
-                  page.offset = parser.getIntValue();
+            while (parser.nextToken() == JsonToken.FIELD_NAME) {
+              if (parser.getCurrentName().equals("pagingIdentifiers")
+                  && parser.nextToken() == JsonToken.START_OBJECT) {
+                JsonToken token = parser.nextToken();
+                while (parser.getCurrentToken() == JsonToken.FIELD_NAME) {
+                  page.pagingIdentifier = parser.getCurrentName();
+                  if (parser.nextToken() == JsonToken.VALUE_NUMBER_INT) {
+                    page.offset = parser.getIntValue();
+                  }
+                  token = parser.nextToken();
                 }
-                token = parser.nextToken();
-              }
-              expect(token, JsonToken.END_OBJECT);
-            }
-            if (parser.nextToken() == JsonToken.FIELD_NAME
-                && parser.getCurrentName().equals("events")
-                && parser.nextToken() == JsonToken.START_ARRAY) {
-              while (parser.nextToken() == JsonToken.START_OBJECT) {
-                expectScalarField(parser, "segmentId");
-                expectScalarField(parser, "offset");
-                if (parser.nextToken() == JsonToken.FIELD_NAME
-                    && parser.getCurrentName().equals("event")
-                    && parser.nextToken() == JsonToken.START_OBJECT) {
-                  parseFields(fieldNames, fieldTypes, posTimestampField, rowBuilder, parser);
-                  sink.send(rowBuilder.build());
-                  rowBuilder.reset();
-                  page.totalRowCount += 1;
+                expect(token, JsonToken.END_OBJECT);
+              } else if (parser.getCurrentName().equals("events")
+                  && parser.nextToken() == JsonToken.START_ARRAY) {
+                while (parser.nextToken() == JsonToken.START_OBJECT) {
+                  expectScalarField(parser, "segmentId");
+                  expectScalarField(parser, "offset");
+                  if (parser.nextToken() == JsonToken.FIELD_NAME
+                      && parser.getCurrentName().equals("event")
+                      && parser.nextToken() == JsonToken.START_OBJECT) {
+                    parseFields(fieldNames, fieldTypes, posTimestampField, rowBuilder, parser);
+                    sink.send(rowBuilder.build());
+                    rowBuilder.reset();
+                    page.totalRowCount += 1;
+                  }
+                  expect(parser, JsonToken.END_OBJECT);
+                }
+                parser.nextToken();
+              } else if (parser.getCurrentName().equals("dimensions")
+                  || parser.getCurrentName().equals("metrics")) {
+                expect(parser, JsonToken.START_ARRAY);
+                while (parser.nextToken() != JsonToken.END_ARRAY) {
+                  // empty
                 }
-                expect(parser, JsonToken.END_OBJECT);
               }
-              parser.nextToken();
             }
           }
         }
