[incubator-doris] branch master updated: [ODBC SCAN NODE] 2/4 Add Thrift Interface of odbc_scan_node (#4389)

[mo...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 984006a  [ODBC SCAN NODE] 2/4 Add Thrift Interface of odbc_scan_node (#4389)
984006a is described below

commit 984006adf93c39ff124495e922304e8c66fbad50
Author: HappenLee <ha...@hotmail.com>
AuthorDate: Fri Aug 21 21:26:48 2020 +0800

    [ODBC SCAN NODE] 2/4 Add Thrift Interface of odbc_scan_node (#4389)
    
    issue:#4376
---
 gensrc/thrift/Descriptors.thrift | 12 ++++++++++++
 gensrc/thrift/PlanNodes.thrift   | 12 ++++++++++++
 gensrc/thrift/Types.thrift       | 12 +++++++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/gensrc/thrift/Descriptors.thrift b/gensrc/thrift/Descriptors.thrift
index 6232840..ba5de78 100644
--- a/gensrc/thrift/Descriptors.thrift
+++ b/gensrc/thrift/Descriptors.thrift
@@ -215,6 +215,17 @@ struct TMySQLTable {
   6: required string table
 }
 
+struct TOdbcTable {
+  1: optional string host
+  2: optional string port
+  3: optional string user
+  4: optional string passwd
+  5: optional string db
+  6: optional string table
+  7: optional string driver
+  8: optional Types.TOdbcTableType type
+}
+
 struct TEsTable {
 }
 
@@ -242,6 +253,7 @@ struct TTableDescriptor {
   12: optional TSchemaTable schemaTable
   14: optional TBrokerTable BrokerTable
   15: optional TEsTable esTable
+  16: optional TOdbcTable odbcTable
 }
 
 struct TDescriptorTable {
diff --git a/gensrc/thrift/PlanNodes.thrift b/gensrc/thrift/PlanNodes.thrift
index 3ebff28..0fa426a 100644
--- a/gensrc/thrift/PlanNodes.thrift
+++ b/gensrc/thrift/PlanNodes.thrift
@@ -26,6 +26,7 @@ include "Partitions.thrift"
 enum TPlanNodeType {
   OLAP_SCAN_NODE,
   MYSQL_SCAN_NODE,
+  ODBC_SCAN_NODE,
   CSV_SCAN_NODE,
   SCHEMA_SCAN_NODE,
   HASH_JOIN_NODE,
@@ -198,6 +199,16 @@ struct TMySQLScanNode {
   4: required list<string> filters
 }
 
+struct TOdbcScanNode {
+  1: optional Types.TTupleId tuple_id
+  2: optional string table_name
+  3: optional string driver
+  4: optional Types.TOdbcTableType type
+  5: optional list<string> columns
+  6: optional list<string> filters
+}
+
+
 struct TBrokerScanNode {
     1: required Types.TTupleId tuple_id
 
@@ -680,6 +691,7 @@ struct TPlanNode {
   32: optional TAssertNumRowsNode assert_num_rows_node
   33: optional TIntersectNode intersect_node
   34: optional TExceptNode except_node
+  35: optional TOdbcScanNode odbc_scan_node
 }
 
 // A flattened representation of a tree of PlanNodes, obtained by depth-first
diff --git a/gensrc/thrift/Types.thrift b/gensrc/thrift/Types.thrift
index 8376164..459179f 100644
--- a/gensrc/thrift/Types.thrift
+++ b/gensrc/thrift/Types.thrift
@@ -317,7 +317,8 @@ enum TEtlState {
 }
 
 enum TTableType {
-    MYSQL_TABLE,
+    MYSQL_TABLE, // Deprecated
+    ODBC_TABLE, 
     OLAP_TABLE,
     SCHEMA_TABLE,
     KUDU_TABLE, // Deprecated
@@ -325,6 +326,15 @@ enum TTableType {
     ES_TABLE
 }
 
+enum TOdbcTableType {
+    MYSQL,
+    ORACLE,
+    POSTGRESQL,
+    SQLSERVER,
+    REDIS,
+    MONGODB
+}
+
 enum TKeysType {
     PRIMARY_KEYS,
     DUP_KEYS,


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org