rename subquery to inner query (#107)

Author: 0aix

src/main/java/com/yahoo/bullet/common/BulletConfig.java

@@ -112,7 +112,7 @@ public class BulletConfig extends Config {
         makeMetadata(ImmutablePair.of(Concept.QUERY_METADATA, "Query"),
                      ImmutablePair.of(Concept.QUERY_ID, "ID"),
                      ImmutablePair.of(Concept.QUERY_STRING, "Query String"),
-                     ImmutablePair.of(Concept.SUBQUERY_METADATA, "Subquery"),
+                     ImmutablePair.of(Concept.INNER_QUERY_METADATA, "Inner Query"),
                      ImmutablePair.of(Concept.QUERY_RECEIVE_TIME, "Receive Time"),
                      ImmutablePair.of(Concept.QUERY_FINISH_TIME, "Finish Time"),
                      ImmutablePair.of(Concept.SKETCH_METADATA, "Sketch"),

src/main/java/com/yahoo/bullet/querying/Querier.java

@@ -681,7 +681,7 @@ private Clip outerQuery(Clip clip) {
             querier.consumeRecord(record);
         }
         Clip result = querier.getResult();
-        result.getMeta().add(getSubMetaKey(), clip.getMeta().asMap());
+        result.getMeta().add(getInnerQueryMetaKey(), clip.getMeta().asMap());
         return result;
     }
 
@@ -725,7 +725,7 @@ private String getMetaKey() {
         return metaKeys.getOrDefault(Concept.QUERY_METADATA.getName(), null);
     }
 
-    private String getSubMetaKey() {
-        return metaKeys.getOrDefault(Concept.SUBQUERY_METADATA.getName(), null);
+    private String getInnerQueryMetaKey() {
+        return metaKeys.getOrDefault(Concept.INNER_QUERY_METADATA.getName(), null);
     }
 }

src/main/java/com/yahoo/bullet/result/Meta.java

@@ -31,7 +31,7 @@ public enum Concept {
         QUERY_ID("Query ID"),
         QUERY_OBJECT("Query Object"),
         QUERY_STRING("Query String"),
-        SUBQUERY_METADATA("Subquery Metadata"),
+        INNER_QUERY_METADATA("Inner Query Metadata"),
 
         // Sketching metadata
         SKETCH_METADATA("Sketch Metadata"),

src/main/resources/bullet_defaults.yaml

@@ -166,8 +166,8 @@ bullet.result.metadata.metrics:
       key: "Receive Time"
     - name: "Query Finish Time"
       key: "Finish Time"
-    - name: "Subquery Metadata"
-      key: "Subquery"
+    - name: "Inner Query Metadata"
+      key: "Inner Query"
     - name: "Sketch Metadata"
       key: "Sketch"
     - name: "Sketch Estimated Result"

src/test/java/com/yahoo/bullet/querying/QuerierTest.java

@@ -934,6 +934,6 @@ public void testOuterQuery() {
 
         Map<String, Object> metadata = result.getMeta().asMap();
 
-        Assert.assertTrue(metadata.containsKey("Subquery"));
+        Assert.assertTrue(metadata.containsKey("Inner Query"));
     }
 }