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

yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git

commit fd0bc720e9ae5a1260a2a4c52746d875a322f9f0
Author: zy-kkk <[email protected]>
AuthorDate: Thu Mar 21 14:47:53 2024 +0800

    [opt](information_schema) Add DEFAULT_ENCRYPTION column to schemata table 
(#32501)
---
 be/src/exec/schema_scanner/schema_schemata_scanner.cpp        | 11 +++++++++++
 .../src/main/java/org/apache/doris/catalog/SchemaTable.java   |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/be/src/exec/schema_scanner/schema_schemata_scanner.cpp 
b/be/src/exec/schema_scanner/schema_schemata_scanner.cpp
index d6e82f611e8..e09817ca310 100644
--- a/be/src/exec/schema_scanner/schema_schemata_scanner.cpp
+++ b/be/src/exec/schema_scanner/schema_schemata_scanner.cpp
@@ -40,6 +40,7 @@ std::vector<SchemaScanner::ColumnDesc> 
SchemaSchemataScanner::_s_columns = {
         {"DEFAULT_CHARACTER_SET_NAME", TYPE_VARCHAR, sizeof(StringRef), false},
         {"DEFAULT_COLLATION_NAME", TYPE_VARCHAR, sizeof(StringRef), false},
         {"SQL_PATH", TYPE_VARCHAR, sizeof(StringRef), true},
+        {"DEFAULT_ENCRYPTION", TYPE_VARCHAR, sizeof(StringRef), true},
 };
 
 SchemaSchemataScanner::SchemaSchemataScanner()
@@ -145,6 +146,16 @@ Status 
SchemaSchemataScanner::_fill_block_impl(vectorized::Block* block) {
     }
     // SQL_PATH
     { RETURN_IF_ERROR(fill_dest_column_for_range(block, 4, null_datas)); }
+
+    // DEFAULT_ENCRYPTION
+    {
+        std::string src = "NO";
+        StringRef str = StringRef(src.c_str(), src.size());
+        for (int i = 0; i < dbs_num; ++i) {
+            datas[i] = &str;
+        }
+        RETURN_IF_ERROR(fill_dest_column_for_range(block, 5, datas));
+    }
     return Status::OK();
 }
 
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 b89b7e1ea6b..5654805619f 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
@@ -147,7 +147,8 @@ public class SchemaTable extends Table {
                             .column("SCHEMA_NAME", 
ScalarType.createVarchar(32))
                             .column("DEFAULT_CHARACTER_SET_NAME", 
ScalarType.createVarchar(32))
                             .column("DEFAULT_COLLATION_NAME", 
ScalarType.createVarchar(32))
-                            .column("SQL_PATH", 
ScalarType.createVarchar(512)).build()))
+                            .column("SQL_PATH", ScalarType.createVarchar(512))
+                            .column("DEFAULT_ENCRYPTION", 
ScalarType.createVarchar(3)).build()))
             .put("session_variables",
                     new SchemaTable(SystemIdGenerator.getNextId(), 
"session_variables", TableType.SCHEMA,
                             builder().column("VARIABLE_NAME", 
ScalarType.createVarchar(64))


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to