Improvement of ResultSet metadata

Author: prrvchr

client/trino-cli/src/test/java/io/trino/cli/TestAlignedTablePrinter.java

@@ -277,7 +277,7 @@ public void testAlignedPrintingWideCharacters()
 
     static Column column(String name, String type)
     {
-        return new Column(name, type, new ClientTypeSignature(type));
+        return new Column("", "", "", name, name, type, new ClientTypeSignature(type));
     }
 
     static List<?> row(Object... values)

client/trino-cli/src/test/java/io/trino/cli/TestAutoTablePrinter.java

@@ -98,7 +98,7 @@ public void testWidePrinting()
 
     static Column column(String name, String type)
     {
-        return new Column(name, type, new ClientTypeSignature(type));
+        return new Column("", "", "", name, name, type, new ClientTypeSignature(type));
     }
 
     static List<?> row(Object... values)

client/trino-cli/src/test/java/io/trino/cli/TestMarkdownTablePrinter.java

@@ -163,7 +163,7 @@ public void testMarkdownPrintingWideCharacters()
 
     static Column column(String name, String type)
     {
-        return new Column(name, type, new ClientTypeSignature(type));
+        return new Column("", "", "", name, name, type, new ClientTypeSignature(type));
     }
 
     static List<?> row(Object... values)

client/trino-cli/src/test/java/io/trino/cli/TestQueryRunner.java

@@ -123,7 +123,7 @@ static String createResults(MockWebServer server)
                 server.url("/query.html?20160128_214710_00012_rk68b").uri(),
                 null,
                 null,
-                ImmutableList.of(new Column("_col0", BIGINT, new ClientTypeSignature(BIGINT))),
+                ImmutableList.of(new Column("", "", "", "_col0", "_col0", BIGINT, new ClientTypeSignature(BIGINT))),
                 TypedQueryData.of(ImmutableList.of(ImmutableList.of(123))),
                 StatementStats.builder()
                         .setState("FINISHED")

client/trino-client/src/main/java/io/trino/client/Column.java

@@ -24,27 +24,63 @@
 @Immutable
 public class Column
 {
+    private final String catalog;
+    private final String schema;
+    private final String table;
     private final String name;
+    private final String label;
     private final String type;
     private final ClientTypeSignature typeSignature;
 
     @JsonCreator
     public Column(
+            @JsonProperty("catalog") String catalog,
+            @JsonProperty("schema") String schema,
+            @JsonProperty("table") String table,
             @JsonProperty("name") String name,
+            @JsonProperty("label") String label,
             @JsonProperty("type") String type,
             @JsonProperty("typeSignature") ClientTypeSignature typeSignature)
     {
+        this.catalog = requireNonNull(catalog, "catalog is null");
+        this.schema = requireNonNull(schema, "schema is null");
+        this.table = requireNonNull(table, "table is null");
         this.name = requireNonNull(name, "name is null");
+        this.label = requireNonNull(label, "label is null");
         this.type = requireNonNull(type, "type is null");
         this.typeSignature = typeSignature;
     }
 
+    @JsonProperty
+    public String getCatalog()
+    {
+        return catalog;
+    }
+
+    @JsonProperty
+    public String getSchema()
+    {
+        return schema;
+    }
+
+    @JsonProperty
+    public String getTable()
+    {
+        return table;
+    }
+
     @JsonProperty
     public String getName()
     {
         return name;
     }
 
+    @JsonProperty
+    public String getLabel()
+    {
+        return label;
+    }
+
     @JsonProperty
     public String getType()
     {

client/trino-client/src/test/java/io/trino/client/TestClientRedirect.java

@@ -153,8 +153,8 @@ private String newQueryResults(MockWebServer server)
                 server.url("/query.html?" + queryId).uri(),
                 null,
                 null,
-                Stream.of(new Column("id", INTEGER, new ClientTypeSignature("integer")),
-                                new Column("name", VARCHAR, new ClientTypeSignature("varchar")))
+                Stream.of(new Column("", "", "", "id", "id", INTEGER, new ClientTypeSignature("integer")),
+                                new Column("", "", "", "name", "name", VARCHAR, new ClientTypeSignature("varchar")))
                         .collect(toList()),
                 TypedQueryData.of(IntStream.range(0, numRecords)
                         .mapToObj(index -> Stream.of((Object) index, "a").collect(toList()))

client/trino-client/src/test/java/io/trino/client/TestQueryResults.java

@@ -29,7 +29,11 @@ public class TestQueryResults
             "  \"id\" : \"20160128_214710_00012_rk68b\",\n" +
             "  \"infoUri\" : \"http://localhost:54855/query.html?20160128_214710_00012_rk68b\",\n" +
             "  \"columns\" : [ {\n" +
+            "    \"catalog\" : \"_cat0\",\n" +
+            "    \"schema\" : \"_sch0\",\n" +
+            "    \"table\" : \"_tab0\",\n" +
             "    \"name\" : \"_col0\",\n" +
+            "    \"label\" : \"_lab0\",\n" +
             "    \"type\" : \"bigint\",\n" +
             "    \"typeSignature\" : {\n" +
             "      \"rawType\" : \"varchar\",\n" +

client/trino-client/src/test/java/io/trino/client/TestResultRowsDecoder.java

@@ -265,7 +265,7 @@ private static QueryResults fromQueryData(QueryData queryData)
                 URI.create("https://localhost"),
                 URI.create("https://localhost"),
                 URI.create("https://localhost"),
-                ImmutableList.of(new Column("id", "integer", new ClientTypeSignature("integer", ImmutableList.of()))),
+                ImmutableList.of(new Column("", "", "", "id", "id", "integer", new ClientTypeSignature("integer", ImmutableList.of()))),
                 queryData,
                 StatementStats.builder()
                         .setState("FINISHED")

client/trino-client/src/test/java/io/trino/client/TestRetry.java

@@ -154,8 +154,8 @@ private String newQueryResults(String state)
                 server.url("/query.html?" + queryId).uri(),
                 null,
                 state.equals("RUNNING") ? server.url(format("/v1/statement/%s/%s", queryId, "aa")).uri() : null,
-                Stream.of(new Column("id", INTEGER, new ClientTypeSignature("integer")),
-                                new Column("name", VARCHAR, new ClientTypeSignature("varchar")))
+                Stream.of(new Column("", "", "", "id", "id", INTEGER, new ClientTypeSignature("integer")),
+                                new Column("", "", "", "name", "name", VARCHAR, new ClientTypeSignature("varchar")))
                         .collect(toList()),
                 TypedQueryData.of(IntStream.range(0, numRecords)
                         .mapToObj(index -> Stream.of((Object) index, "a").collect(toList()))

client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractTrinoResultSet.java

@@ -1970,11 +1970,11 @@ private static List<ColumnInfo> getColumnInfo(List<Column> columns)
         ImmutableList.Builder<ColumnInfo> list = ImmutableList.builderWithExpectedSize(columns.size());
         for (Column column : columns) {
             ColumnInfo.Builder builder = new ColumnInfo.Builder()
-                    .setCatalogName("") // TODO
-                    .setSchemaName("") // TODO
-                    .setTableName("") // TODO
-                    .setColumnLabel(column.getName())
-                    .setColumnName(column.getName()) // TODO
+                    .setCatalogName(column.getCatalog())
+                    .setSchemaName(column.getSchema())
+                    .setTableName(column.getTable())
+                    .setColumnLabel(column.getLabel())
+                    .setColumnName(column.getName())
                     .setColumnTypeSignature(column.getTypeSignature())
                     .setNullable(Nullable.UNKNOWN)
                     .setCurrency(false);