This is an automated email from the ASF dual-hosted git repository.
fjy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push:
new 80173b5 SQL: Set INFORMATION_SCHEMA catalog name to "druid". (#6595)
80173b5 is described below
commit 80173b5d2904233ce93e0d5693f8b5024faab8f5
Author: Gian Merlino <[email protected]>
AuthorDate: Tue Nov 13 14:32:40 2018 -0800
SQL: Set INFORMATION_SCHEMA catalog name to "druid". (#6595)
* SQL: Set INFORMATION_SCHEMA catalog name to "druid".
Some third party tools ignore catalogs with empty names. So using
the name "druid" for the catalog makes integration easier.
* Update tests.
---
.../apache/druid/sql/calcite/schema/InformationSchema.java | 10 +++++-----
.../apache/druid/sql/avatica/DruidAvaticaHandlerTest.java | 14 +++++++-------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java
b/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java
index b8bb9f4..d79b23a 100644
---
a/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java
+++
b/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java
@@ -63,7 +63,7 @@ public class InformationSchema extends AbstractSchema
{
public static final String NAME = "INFORMATION_SCHEMA";
- private static final String EMPTY_CATALOG = "";
+ private static final String CATALOG_NAME = "druid";
private static final String SCHEMATA_TABLE = "SCHEMATA";
private static final String TABLES_TABLE = "TABLES";
private static final String COLUMNS_TABLE = "COLUMNS";
@@ -149,7 +149,7 @@ public class InformationSchema extends AbstractSchema
{
final SchemaPlus subSchema =
rootSchema.getSubSchema(schemaName);
return new Object[]{
- EMPTY_CATALOG, // CATALOG_NAME
+ CATALOG_NAME, // CATALOG_NAME
subSchema.getName(), // SCHEMA_NAME
null, // SCHEMA_OWNER
null, // DEFAULT_CHARACTER_SET_CATALOG
@@ -220,7 +220,7 @@ public class InformationSchema extends AbstractSchema
public Object[] apply(final String tableName)
{
return new Object[]{
- EMPTY_CATALOG, // TABLE_CATALOG
+ CATALOG_NAME, // TABLE_CATALOG
schemaName, // TABLE_SCHEMA
tableName, // TABLE_NAME
subSchema.getTable(tableName).getJdbcTableType().toString() // TABLE_TYPE
@@ -236,7 +236,7 @@ public class InformationSchema extends AbstractSchema
{
if (getView(subSchema, functionName) !=
null) {
return new Object[]{
- EMPTY_CATALOG, // TABLE_CATALOG
+ CATALOG_NAME, // TABLE_CATALOG
schemaName, // TABLE_SCHEMA
functionName, // TABLE_NAME
"VIEW" // TABLE_TYPE
@@ -397,7 +397,7 @@ public class InformationSchema extends AbstractSchema
boolean isCharacter =
SqlTypeName.CHAR_TYPES.contains(type.getSqlTypeName());
boolean isDateTime =
SqlTypeName.DATETIME_TYPES.contains(type.getSqlTypeName());
return new Object[]{
- EMPTY_CATALOG, // TABLE_CATALOG
+ CATALOG_NAME, // TABLE_CATALOG
schemaName, // TABLE_SCHEMA
tableName, // TABLE_NAME
field.getName(), // COLUMN_NAME
diff --git
a/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java
b/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java
index 1b92d0d..0d82a2f 100644
---
a/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java
+++
b/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java
@@ -346,7 +346,7 @@ public class DruidAvaticaHandlerTest extends CalciteTestBase
final DatabaseMetaData metaData = client.getMetaData();
Assert.assertEquals(
ImmutableList.of(
- ROW(Pair.of("TABLE_CAT", ""))
+ ROW(Pair.of("TABLE_CAT", "druid"))
),
getRows(metaData.getCatalogs())
);
@@ -358,7 +358,7 @@ public class DruidAvaticaHandlerTest extends CalciteTestBase
final DatabaseMetaData metaData = client.getMetaData();
Assert.assertEquals(
ImmutableList.of(
- ROW(Pair.of("TABLE_CATALOG", ""), Pair.of("TABLE_SCHEM", "druid"))
+ ROW(Pair.of("TABLE_CATALOG", "druid"), Pair.of("TABLE_SCHEM",
"druid"))
),
getRows(metaData.getSchemas(null, "druid"))
);
@@ -371,13 +371,13 @@ public class DruidAvaticaHandlerTest extends
CalciteTestBase
Assert.assertEquals(
ImmutableList.of(
ROW(
- Pair.of("TABLE_CAT", ""),
+ Pair.of("TABLE_CAT", "druid"),
Pair.of("TABLE_NAME", "foo"),
Pair.of("TABLE_SCHEM", "druid"),
Pair.of("TABLE_TYPE", "TABLE")
),
ROW(
- Pair.of("TABLE_CAT", ""),
+ Pair.of("TABLE_CAT", "druid"),
Pair.of("TABLE_NAME", "foo2"),
Pair.of("TABLE_SCHEM", "druid"),
Pair.of("TABLE_TYPE", "TABLE")
@@ -397,19 +397,19 @@ public class DruidAvaticaHandlerTest extends
CalciteTestBase
Assert.assertEquals(
ImmutableList.of(
ROW(
- Pair.of("TABLE_CAT", ""),
+ Pair.of("TABLE_CAT", "druid"),
Pair.of("TABLE_NAME", CalciteTests.DATASOURCE1),
Pair.of("TABLE_SCHEM", "druid"),
Pair.of("TABLE_TYPE", "TABLE")
),
ROW(
- Pair.of("TABLE_CAT", ""),
+ Pair.of("TABLE_CAT", "druid"),
Pair.of("TABLE_NAME", CalciteTests.DATASOURCE2),
Pair.of("TABLE_SCHEM", "druid"),
Pair.of("TABLE_TYPE", "TABLE")
),
ROW(
- Pair.of("TABLE_CAT", ""),
+ Pair.of("TABLE_CAT", "druid"),
Pair.of("TABLE_NAME", CalciteTests.FORBIDDEN_DATASOURCE),
Pair.of("TABLE_SCHEM", "druid"),
Pair.of("TABLE_TYPE", "TABLE")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
