From e5dbdc61a446cbf87f1564e8b9eebe4a8317b393 Mon Sep 17 00:00:00 2001
From: PatZhuang <pat_zhuang@outlook.com>
Date: Wed, 25 Sep 2024 07:35:46 +0000
Subject: [PATCH] add id placeholders for column level encrypt

---
 src/objit/include/objit/common/ob_item_type.h  | 2 ++
 src/share/schema/ob_priv_mgr.cpp               | 2 ++
 src/share/schema/ob_priv_type.h                | 6 +++++-
 src/sql/engine/expr/ob_expr_eval_functions.cpp | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/objit/include/objit/common/ob_item_type.h b/src/objit/include/objit/common/ob_item_type.h
index e6ac48b45..193418e02 100644
--- a/src/objit/include/objit/common/ob_item_type.h
+++ b/src/objit/include/objit/common/ob_item_type.h
@@ -508,6 +508,8 @@ typedef enum ObItemType
   T_FUN_SYS_SM3 = 776,
   T_FUN_SYS_SM4_ENCRYPT = 777,
   T_FUN_SYS_SM4_DECRYPT = 778,
+  T_FUN_SYS_ENHANCED_AES_ENCRYPT = 779,
+  T_FUN_SYS_ENHANCED_AES_DECRYPT = 780,
   ///< @note add new mysql only function type before this line
   T_MYSQL_ONLY_SYS_MAX_OP = 800,
 
diff --git a/src/share/schema/ob_priv_mgr.cpp b/src/share/schema/ob_priv_mgr.cpp
index bba599259..67fe79d6b 100644
--- a/src/share/schema/ob_priv_mgr.cpp
+++ b/src/share/schema/ob_priv_mgr.cpp
@@ -82,6 +82,8 @@ const char *ObPrivMgr::priv_names_[] = {
     "DROP ROLE",
     "TRIGGER",
     "LOCK TABLES",                // index 45
+    "ENCRYPT",                    // index 46
+    "DECRYPT",                    // index 47
 };
 
 ObPrivMgr::ObPrivMgr()
diff --git a/src/share/schema/ob_priv_type.h b/src/share/schema/ob_priv_type.h
index 0e03825e6..bf77b2bda 100644
--- a/src/share/schema/ob_priv_type.h
+++ b/src/share/schema/ob_priv_type.h
@@ -74,6 +74,8 @@ enum OB_PRIV_SHIFT
   OB_PRIV_DROP_ROLE_SHIFT,
   OB_PRIV_TRIGGER_SHIFT,
   OB_PRIV_LOCK_TABLE_SHIFT =            45,
+  OB_PRIV_ENCRYPT_SHIFT =               46,
+  OB_PRIV_DECRYPT_SHIFT =               47,
   OB_PRIV_MAX_SHIFT_PLUS_ONE,
   OB_PRIV_MAX_SHIFT_LIMIT =             65
 };
@@ -172,7 +174,9 @@ enum OB_PRIV_OTHERS_TYPE
   OB_PRIV_OTHERS_CREATE_ROLE = (1LL << 7),
   OB_PRIV_OTHERS_DROP_ROLE = (1LL << 8),
   OB_PRIV_OTHERS_TRIGGER = (1LL << 9),
-  OB_PRIV_OTHERS_LOCK_TABLE = (1LL << 10)
+  OB_PRIV_OTHERS_LOCK_TABLE = (1LL << 10),
+  OB_PRIV_OTHERS_ENCRYPT = (1LL << 11),
+  OB_PRIV_OTHERS_DECRYPT = (1LL << 12)
 };
 
 #endif //ifndef OCEABASE_SHARE_SCHEMA_OB_PRIV_TYPE_H_
diff --git a/src/sql/engine/expr/ob_expr_eval_functions.cpp b/src/sql/engine/expr/ob_expr_eval_functions.cpp
index 458bba4f7..ea28674a5 100644
--- a/src/sql/engine/expr/ob_expr_eval_functions.cpp
+++ b/src/sql/engine/expr/ob_expr_eval_functions.cpp
@@ -1263,6 +1263,8 @@ static ObExpr::EvalFunc g_expr_eval_functions[] = {
   NULL, // ObExprRbSelect::eval_rb_select,                            /* 756 */
   ObExprVectorNegativeIPDistance::calc_negative_inner_product,        /* 757 */
   NULL, // ObExprTokenize::eval_tokenize,                             /* 758 */
+  NULL, // ObExprEnhancedAesEncrypt::eval_aes_encrypt                 /* 759 */
+  NULL, // ObExprEnhancedAesEncrypt::eval_aes_decrypt                 /* 760 */
 };
 
 static ObExpr::EvalBatchFunc g_expr_eval_batch_functions[] = {