This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/dev-1.1.2 by this push:
new 71a0a36e7f [cherry-pick][fix](SchemaTable) Compatible with datagrip
mysql #11617
71a0a36e7f is described below
commit 71a0a36e7f7397b3d33917ee7fe3be95c69a07d3
Author: Stalary <stal...@163.com>
AuthorDate: Tue Aug 9 14:03:22 2022 +0800
[cherry-pick][fix](SchemaTable) Compatible with datagrip mysql #11617
---
.../java/org/apache/doris/catalog/SchemaTable.java | 64 ++++++++++++++++++++++
.../java/org/apache/doris/qe/SessionVariable.java | 7 +++
2 files changed, 71 insertions(+)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
index 2d634fb559..c06a76c512 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
@@ -337,6 +337,8 @@ public class SchemaTable extends Table {
.column("NULLABLE",
ScalarType.createVarchar(3))
.column("INDEX_TYPE",
ScalarType.createVarchar(16))
.column("COMMENT",
ScalarType.createVarchar(16))
+ // for datagrip
+ .column("INDEX_COMMENT",
ScalarType.createVarchar(1024))
.build()))
.put("files",
new SchemaTable(
@@ -417,6 +419,68 @@ public class SchemaTable extends Table {
.column("NODEGROUP",
ScalarType.createVarchar(256))
.column("TABLESPACE_NAME",
ScalarType.createVarchar(268))
.build()))
+ // Compatible with Datagrip
+ .put("column_privileges",
+ new SchemaTable(SystemIdGenerator.getNextId(),
"column_privileges", TableType.SCHEMA,
+ builder().column("GRANTEE",
ScalarType.createVarchar(128))
+ .column("TABLE_CATALOG",
ScalarType.createVarchar(512))
+ .column("TABLE_SCHEMA",
ScalarType.createVarchar(64))
+ .column("TABLE_NAME",
ScalarType.createVarchar(64))
+ .column("COLUMN_NAME",
ScalarType.createVarchar(64))
+ .column("PRIVILEGE_TYPE",
ScalarType.createVarchar(64))
+ .column("IS_GRANTABLE",
ScalarType.createVarchar(3)).build()))
+ // Compatible with Datagrip
+ .put("triggers",
+ new SchemaTable(SystemIdGenerator.getNextId(),
"triggers", TableType.SCHEMA,
+ builder().column("TRIGGER_CATALOG",
ScalarType.createVarchar(512))
+ .column("TRIGGER_SCHEMA",
ScalarType.createVarchar(64))
+ .column("TRIGGER_NAME",
ScalarType.createVarchar(64))
+ .column("EVENT_MANIPULATION",
ScalarType.createVarchar(6))
+ .column("EVENT_OBJECT_CATALOG",
ScalarType.createVarchar(512))
+ .column("EVENT_OBJECT_SCHEMA",
ScalarType.createVarchar(64))
+ .column("EVENT_OBJECT_TABLE",
ScalarType.createVarchar(64))
+ .column("ACTION_ORDER",
ScalarType.createVarchar(4))
+ .column("ACTION_CONDITION",
ScalarType.createVarchar(512))
+ .column("ACTION_STATEMENT",
ScalarType.createVarchar(512))
+ .column("ACTION_ORIENTATION",
ScalarType.createVarchar(9))
+ .column("ACTION_TIMING",
ScalarType.createVarchar(6))
+
.column("ACTION_REFERENCE_OLD_TABLE", ScalarType.createVarchar(64))
+
.column("ACTION_REFERENCE_NEW_TABLE", ScalarType.createVarchar(64))
+
.column("ACTION_REFERENCE_OLD_ROW", ScalarType.createVarchar(3))
+
.column("ACTION_REFERENCE_NEW_ROW", ScalarType.createVarchar(3))
+ .column("CREATED",
ScalarType.createType(PrimitiveType.DATETIME))
+ .column("SQL_MODE",
ScalarType.createVarchar(8192))
+ .column("DEFINER",
ScalarType.createVarchar(77))
+ .column("CHARACTER_SET_CLIENT",
ScalarType.createVarchar(32))
+ .column("COLLATION_CONNECTION",
ScalarType.createVarchar(32))
+ .column("DATABASE_COLLATION",
ScalarType.createVarchar(32)).build()))
+ // Compatible with Datagrip
+ .put("events",
+ new SchemaTable(SystemIdGenerator.getNextId(),
"events", TableType.SCHEMA,
+ builder().column("EVENT_CATALOG",
ScalarType.createVarchar(64))
+ .column("EVENT_SCHEMA",
ScalarType.createVarchar(64))
+ .column("EVENT_NAME",
ScalarType.createVarchar(64))
+ .column("DEFINER",
ScalarType.createVarchar(77))
+ .column("TIME_ZONE",
ScalarType.createVarchar(64))
+ .column("EVENT_BODY",
ScalarType.createVarchar(8))
+ .column("EVENT_DEFINITION",
ScalarType.createVarchar(512))
+ .column("EVENT_TYPE",
ScalarType.createVarchar(9))
+ .column("EXECUTE_AT",
ScalarType.createType(PrimitiveType.DATETIME))
+ .column("INTERVAL_VALUE",
ScalarType.createVarchar(256))
+ .column("INTERVAL_FIELD",
ScalarType.createVarchar(18))
+ .column("SQL_MODE",
ScalarType.createVarchar(8192))
+ .column("STARTS",
ScalarType.createType(PrimitiveType.DATETIME))
+ .column("ENDS",
ScalarType.createType(PrimitiveType.DATETIME))
+ .column("STATUS",
ScalarType.createVarchar(18))
+ .column("ON_COMPLETION",
ScalarType.createVarchar(12))
+ .column("CREATED",
ScalarType.createType(PrimitiveType.DATETIME))
+ .column("LAST_ALTERED",
ScalarType.createType(PrimitiveType.DATETIME))
+ .column("LAST_EXECUTED",
ScalarType.createType(PrimitiveType.DATETIME))
+ .column("EVENT_COMMENT",
ScalarType.createVarchar(64))
+ .column("ORIGINATOR",
ScalarType.createType(PrimitiveType.INT))
+ .column("CHARACTER_SET_CLIENT",
ScalarType.createVarchar(32))
+ .column("COLLATION_CONNECTION",
ScalarType.createVarchar(32))
+ .column("DATABASE_COLLATION",
ScalarType.createVarchar(32)).build()))
.build();
// statistics is table provides information about table indexes in mysql:
5.7
// views column is from show create table views in mysql: 5.5.6
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
index ef85b2dfe5..1a8c2c082b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -112,6 +112,9 @@ public class SessionVariable implements Serializable,
Writable {
public static final String REWRITE_COUNT_DISTINCT_TO_BITMAP_HLL =
"rewrite_count_distinct_to_bitmap_hll";
public static final String EVENT_SCHEDULER = "event_scheduler";
public static final String STORAGE_ENGINE = "storage_engine";
+ // Compatible with datagrip mysql
+ public static final String DEFAULT_STORAGE_ENGINE =
"default_storage_engine";
+ public static final String DEFAULT_TMP_STORAGE_ENGINE =
"default_tmp_storage_engine";
public static final String DIV_PRECISION_INCREMENT =
"div_precision_increment";
// see comment of `doris_max_scan_key_num` and
`max_pushdown_conditions_per_column` in BE config
@@ -366,6 +369,10 @@ public class SessionVariable implements Serializable,
Writable {
public String eventScheduler = "OFF";
@VariableMgr.VarAttr(name = STORAGE_ENGINE)
public String storageEngine = "olap";
+ @VariableMgr.VarAttr(name = DEFAULT_STORAGE_ENGINE)
+ public String defaultStorageEngine = "olap";
+ @VariableMgr.VarAttr(name = DEFAULT_TMP_STORAGE_ENGINE)
+ public String defaultTmpStorageEngine = "olap";
@VariableMgr.VarAttr(name = DIV_PRECISION_INCREMENT)
public int divPrecisionIncrement = 4;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
