feat(tianmu):delta store,Modify the handler layer and modify the base…

… class to support the delta layer
stoneatom · Mar 7, 2023 · e04f9f3 · e04f9f3
1 parent 8beb08f
commit e04f9f3
Show file tree

Hide file tree

Showing 15 changed files with 194 additions and 257 deletions.
diff --git a/scripts/stonedb_build.sh b/scripts/stonedb_build.sh
@@ -86,4 +86,4 @@ cmake ../../ \
 # step 5. make & make install
 make VERBOSE=1 -j`nproc`                                             2>&1 | tee -a ${build_log}
 make install                                                         2>&1 | tee -a ${build_log}
-echo "current dir is `pwd`"                                                              2>&1 | tee -a ${build_log}
+echo "current dir is `pwd`"                                          2>&1 | tee -a ${build_log}
diff --git a/storage/tianmu/core/engine.cpp b/storage/tianmu/core/engine.cpp
@@ -919,10 +919,10 @@ AttributeTypeInfo Engine::GetAttrTypeInfo(const Field &field) {
 }
 
 void Engine::CommitTx(THD *thd, bool all) {
-  if (all || !thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) {
+  if (all || !thd_test_options(thd, OPTION_NOT_AUTOCOMMIT)) {
     GetTx(thd)->Commit(thd);
-    ClearTx(thd);
   }
+  ClearTx(thd);
 }
 
 void Engine::Rollback(THD *thd, bool all, bool force_error_message) {

diff --git a/storage/tianmu/handler/ha_my_tianmu.cpp b/storage/tianmu/handler/ha_my_tianmu.cpp
@@ -23,7 +23,7 @@
 #include "vc/virtual_column.h"
 
 namespace Tianmu {
-namespace handler {
+namespace DBHandler {
 
 enum class TianmuEngineReturnValues {
   kLoadSuccessed = 0,
@@ -156,5 +156,5 @@ bool ha_my_tianmu_load(THD *thd, sql_exchange *ex, TABLE_LIST *table_list, void
   return false;
 }
 
-}  // namespace handler
+}  // namespace DBHandler
 }  // namespace Tianmu
diff --git a/storage/tianmu/handler/ha_my_tianmu.h b/storage/tianmu/handler/ha_my_tianmu.h
@@ -20,7 +20,7 @@
 
 // mysql <--> tianmu interface functions
 namespace Tianmu {
-namespace handler {
+namespace DBHandler {
 
 enum class QueryRouteTo {
   kToMySQL = 0,
@@ -42,6 +42,6 @@ bool ha_my_tianmu_set_statement_allowed(THD *thd, LEX *lex);
 // processing the load operation.
 bool ha_my_tianmu_load(THD *thd, sql_exchange *ex, TABLE_LIST *table_list, void *arg);
 
-}  // namespace handler
+}  // namespace DBHandler
 }  //  namespace Tianmu
 #endif  // TIANMU_HANDLER_HA_RCENGINE_H_