Adjusting query_id to be a higher level field and not a metric

Author: Paultagoras

client-v2/src/main/java/com/clickhouse/client/api/insert/InsertResponse.java

@@ -87,10 +87,10 @@ public long getResultRows() {
     }
 
     /**
-     * Alias for {@link ServerMetrics#QUERY_ID}
+     * Alias for {@link OperationMetrics#getQueryId()}
      * @return number of returned bytes
      */
     public String getQueryId() {
-        return operationMetrics.getMetric(ServerMetrics.QUERY_ID).getString();
+        return operationMetrics.getQueryId();
     }
 }

client-v2/src/main/java/com/clickhouse/client/api/internal/GenericMetric.java

@@ -8,9 +8,4 @@ public interface Metric {
      */
     long getLong();
 
-    /**
-     * Returns value of the metric as a string.
-     * @return value of the metric as a string
-     */
-    String getString();
 }

client-v2/src/main/java/com/clickhouse/client/api/metrics/Metric.java

@@ -3,7 +3,6 @@
 import com.clickhouse.client.ClickHouseResponseSummary;
 import com.clickhouse.client.api.internal.ClientStatisticsHolder;
 import com.clickhouse.client.api.internal.Gauge;
-import com.clickhouse.client.api.internal.GenericMetric;
 import com.clickhouse.client.api.internal.StopWatch;
 
 import java.util.HashMap;
@@ -17,6 +16,7 @@
 public class OperationMetrics {
 
     public Map<String, Metric> metrics = new HashMap<>();
+    private String queryId;
 
     private final ClientStatisticsHolder clientStatistics;
 
@@ -32,6 +32,10 @@ public Metric getMetric(ClientMetrics metric) {
         return metrics.get(metric.getKey());
     }
 
+    public String getQueryId() {
+        return queryId;
+    }
+
     public void operationComplete(ClickHouseResponseSummary serverStats) {
         for (Map.Entry<String, StopWatch> sw : clientStatistics.getStopWatches().entrySet()) {
             sw.getValue().stop();
@@ -44,12 +48,13 @@ public void operationComplete(ClickHouseResponseSummary serverStats) {
         metrics.put(ServerMetrics.NUM_BYTES_WRITTEN.getKey(), new Gauge(serverStats.getWrittenBytes()));
         metrics.put(ServerMetrics.RESULT_ROWS.getKey(), new Gauge(serverStats.getResultRows()));
         metrics.put(ServerMetrics.ELAPSED_TIME.getKey(), new Gauge(serverStats.getElapsedTime()));
-        metrics.put(ServerMetrics.QUERY_ID.getKey(), new GenericMetric(serverStats.getQueryId()));
+        this.queryId = serverStats.getQueryId();
     }
 
     @Override
     public String toString() {
         return "OperationStatistics{" +
+                "\"queryId\"=\"" + queryId + "\", " +
                 "\"metrics\"=" + metrics +
                 '}';
     }

client-v2/src/main/java/com/clickhouse/client/api/metrics/OperationMetrics.java

@@ -41,12 +41,7 @@ public enum ServerMetrics {
     /**
      * Elapsed time in nanoseconds.
      */
-    ELAPSED_TIME("server.elapsedTime"),
-
-    /**
-     * Query id of the request
-     */
-    QUERY_ID("server.queryId");
+    ELAPSED_TIME("server.elapsedTime");
 
     private final String key;
 

client-v2/src/main/java/com/clickhouse/client/api/metrics/ServerMetrics.java

@@ -154,10 +154,10 @@ public long getResultRows() {
     }
 
     /**
-     * Alias for {@link ServerMetrics#QUERY_ID}
+     * Alias for {@link OperationMetrics#getQueryId()}
      * @return query id of the request
      */
     public String getQueryId() {
-        return operationMetrics.getMetric(ServerMetrics.QUERY_ID).getString();
+        return operationMetrics.getQueryId();
     }
 }

client-v2/src/main/java/com/clickhouse/client/api/query/QueryResponse.java

@@ -948,7 +948,7 @@ public void testQueryMetrics() throws Exception {
         Assert.assertEquals(metrics.getMetric(ServerMetrics.RESULT_ROWS).getLong(), rowsToInsert);
         Assert.assertEquals(response.getReadRows(), rowsToInsert);
         Assert.assertTrue(metrics.getMetric(ClientMetrics.OP_DURATION).getLong() > 0);
-        Assert.assertEquals(metrics.getMetric(ServerMetrics.QUERY_ID).getString(), uuid);
+        Assert.assertEquals(metrics.getQueryId(), uuid);
         Assert.assertEquals(response.getQueryId(), uuid);
 
     }