[incubator-pinot] branch master updated: Add DateTime columns to JDBC Connection Response Metdata (#6196)

[kishoreg]

This is an automated email from the ASF dual-hosted git repository.

kishoreg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git


The following commit(s) were added to refs/heads/master by this push:
     new 637b0f1  Add DateTime columns to JDBC Connection Response Metdata 
(#6196)
637b0f1 is described below

commit 637b0f100b6e2886ca31205e206442216c480f7f
Author: Kartik Khare <kharekar...@gmail.com>
AuthorDate: Sun Nov 1 20:10:57 2020 +0530

    Add DateTime columns to JDBC Connection Response Metdata (#6196)
    
    * Fix merge conflicts
    
    * Use default tenant in case a tenant is not available
    
    * Add date time columns in response
    
    * nit: remove new lines and unused variable
---
 .../main/java/org/apache/pinot/client/PinotConnectionMetaData.java  | 6 ++++++
 .../org/apache/pinot/client/controller/response/SchemaResponse.java | 3 +++
 2 files changed, 9 insertions(+)

diff --git 
a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotConnectionMetaData.java
 
b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotConnectionMetaData.java
index af206aa..5df5947 100644
--- 
a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotConnectionMetaData.java
+++ 
b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotConnectionMetaData.java
@@ -42,6 +42,7 @@ public class PinotConnectionMetaData extends 
AbstractBaseConnectionMetaData {
   private static final Logger LOGGER = 
LoggerFactory.getLogger(PinotConnectionMetaData.class);
 
   private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
   private final PinotConnection _connection;
   private final PinotControllerTransport _controllerTransport;
   private final String _controllerURL;
@@ -169,6 +170,11 @@ public class PinotConnectionMetaData extends 
AbstractBaseConnectionMetaData {
       ordinalPosition++;
     }
 
+    for (JsonNode columns : schemaResponse.getDateTimeFieldSpecs()) {
+      appendColumnMeta(pinotMeta, tableName, ordinalPosition, columns);
+      ordinalPosition++;
+    }
+
     JsonNode resultTable = OBJECT_MAPPER.valueToTree(pinotMeta);
     return PinotResultSet.fromResultTable(new 
ResultTableResultSet(resultTable));
   }
diff --git 
a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/controller/response/SchemaResponse.java
 
b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/controller/response/SchemaResponse.java
index ac29348..7428bec 100644
--- 
a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/controller/response/SchemaResponse.java
+++ 
b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/controller/response/SchemaResponse.java
@@ -34,6 +34,7 @@ public class SchemaResponse {
   private String _schemaName;
   private JsonNode _dimensions;
   private JsonNode _metrics;
+  private JsonNode _dateTimeFieldSpecs;
 
   private SchemaResponse() {
   }
@@ -42,6 +43,7 @@ public class SchemaResponse {
     _schemaName = schemaResponse.get("schemaName").textValue();
     _dimensions = schemaResponse.get("dimensionFieldSpecs");
     _metrics = schemaResponse.get("metricFieldSpecs");
+    _dateTimeFieldSpecs = schemaResponse.get("dateTimeFieldSpecs");
   }
 
   public static SchemaResponse fromJson(JsonNode schemaResponse) {
@@ -64,6 +66,7 @@ public class SchemaResponse {
     return _metrics;
   }
 
+  public JsonNode getDateTimeFieldSpecs() { return  _dateTimeFieldSpecs; }
 
   public static class SchemaResponseFuture extends 
ControllerResponseFuture<SchemaResponse> {
     private final ObjectReader OBJECT_READER = new ObjectMapper().reader();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org