[FEAT MERGE]ODPS patch to master

Co-authored-by: dontknow9179 <545187809@qq.com>
2024-08-27 14:09:55 +00:00
parent ee76b4deb8
commit c11ef76f19
77 changed files with 6933 additions and 696 deletions
--- a/unittest/sql/test_sql_utils.h
+++ b/unittest/sql/test_sql_utils.h
@ -135,7 +135,7 @@ public:
  ObSchemaGetterGuard &get_schema_guard() { return schema_guard_; }
 public:
  //table id
-  hash::ObHashMap<uint64_t,uint64_t> next_user_table_id_map_;
+  oceanbase::common::hash::ObHashMap<uint64_t,uint64_t> next_user_table_id_map_;
  //user_id
  uint64_t sys_user_id_;
  uint64_t next_user_id_;