diff --git a/src/main/java/com/yahoo/bullet/querying/Querier.java b/src/main/java/com/yahoo/bullet/querying/Querier.java index a6f6d7e8..918dc9aa 100644 --- a/src/main/java/com/yahoo/bullet/querying/Querier.java +++ b/src/main/java/com/yahoo/bullet/querying/Querier.java @@ -568,7 +568,7 @@ public Clip finish() { @Override public String toString() { - return runningQuery.toString(); + return String.format("%s : %s", runningQuery.getId(), runningQuery.toString()); } // ********************************* Private helpers ********************************* diff --git a/src/main/java/com/yahoo/bullet/querying/RunningQuery.java b/src/main/java/com/yahoo/bullet/querying/RunningQuery.java index c1d6f347..53a1cb17 100644 --- a/src/main/java/com/yahoo/bullet/querying/RunningQuery.java +++ b/src/main/java/com/yahoo/bullet/querying/RunningQuery.java @@ -62,8 +62,7 @@ public Optional> initialize() { @Override public String toString() { - String body = queryString != null ? queryString : query.toString(); - return String.format("%s : %s", id, body); + return queryString != null ? queryString : query.toString(); } /** diff --git a/src/test/java/com/yahoo/bullet/querying/RunningQueryTest.java b/src/test/java/com/yahoo/bullet/querying/RunningQueryTest.java index 81d72c56..e4ba828e 100644 --- a/src/test/java/com/yahoo/bullet/querying/RunningQueryTest.java +++ b/src/test/java/com/yahoo/bullet/querying/RunningQueryTest.java @@ -27,7 +27,7 @@ public void testCreatingWithStringQuery() { Assert.assertFalse(runningQuery.initialize().isPresent()); Assert.assertEquals(runningQuery.getId(), "foo"); Assert.assertNotNull(runningQuery.getQuery()); - Assert.assertEquals(runningQuery.toString(), "foo : {}"); + Assert.assertEquals(runningQuery.toString(), "{}"); } @Test @@ -43,7 +43,7 @@ public void testCreatingWithQuery() { Assert.assertEquals(runningQuery.getId(), "foo"); Assert.assertNotNull(runningQuery.getQuery()); String actual = runningQuery.toString(); - Assert.assertTrue(actual.contains("foo : {")); + Assert.assertTrue(actual.contains("{")); Assert.assertTrue(actual.contains("filters: null, projection: null,")); Assert.assertTrue(actual.contains("aggregation: {size: 500, type: RAW, fields: null, attributes: null},")); Assert.assertTrue(actual.contains("window: null, duration:"));