fix mtr compatible issue

Author: liunyl

data_substrate

@@ -1,15 +0,0 @@
-[mysqld]
-eloq_aws_access_key_id=XXXXXXXXXXXXXXX
-eloq_aws_secret_key=XXXXXXXXXXXXXXXXXXXXXXXXX
-eloq_txlog_rocksdb_cloud_endpoint_url=http://127.0.0.1:9900
-eloq_txlog_rocksdb_cloud_bucket_name = eloqsql-mtr-test
-eloq_txlog_rocksdb_cloud_bucket_prefix = txlog-
-eloq_txlog_rocksdb_cloud_region = ap-northeast-1
-eloq_dss_rocksdb_cloud_endpoint_url=http://127.0.0.1:9900
-eloq_dss_rocksdb_cloud_bucket_name = eloqsql-mtr-test
-eloq_dss_rocksdb_cloud_bucket_prefix = dss-
-eloq_dss_rocksdb_cloud_region = ap-northeast-1
-eloq_dss_config_file_path =
-eloq_dss_peer_node =
-eloq_dss_rocksdb_cloud_sst_file_cache_size = 20GB
-eloq_dss_rocksdb_cloud_purger_periodicity_secs = 30

mysql-test/include/eloq_kv_dss.cnf

@@ -2,7 +2,3 @@
 
 [mysqld]
 eloq_random_scan_sort=on
-eloq_keyspace_name=mono_test
-eloq_dynamodb_endpoint=http://127.0.0.1:9100
-eloq_bigtable_project_id=XXXXXXXX
-eloq_bigtable_instance_id=XXXXXXXX

mysql-test/include/eloq_kv_keyspace.cnf

@@ -1,2 +1 @@
-[mysqld]
-eloq_kv_storage=eloqds
+

mysql-test/include/eloq_kv_storage.cnf

@@ -540,28 +540,11 @@ fi
 mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}"
 mysqld_install_cmd_line()
 {
-  # Create temporary config file for bootstrap
-  local temp_config=$(mktemp)
-  
-  cat > "$temp_config" << EOF
-[mysqld]
-basedir=$basedir
-datadir=$ldata
-plugin-dir=$plugindir
-log-warnings=0
-enforce-storage-engine=
-max-allowed-packet=8M
-net-buffer-length=16K
-EOF
-
-  # Call mysqld with config file and bootstrap flag
-  "$mysqld_bootstrap" --eloqsql_config="$temp_config" --bootstrap  $args
-  local exit_code=$?
-  
-  # Clean up temp file
-  rm -f "$temp_config"
-  
-  return $exit_code
+  "$mysqld_bootstrap" $defaults $defaults_group_suffix "$mysqld_opt" --bootstrap $silent_startup\
+  "--basedir=$basedir" "--datadir=$ldata" --log-warnings=0 --enforce-storage-engine="" \
+  "--plugin-dir=${plugindir}" \
+  $args --max_allowed_packet=8M \
+  --net_buffer_length=16K
 }
 
 # Use $auth_root_socket_user if explicitly specified.

scripts/mysql_install_db.sh

@@ -43,7 +43,16 @@ int main(int argc, char **argv)
     "Data substrate flags can be passed on command line.\n"
     "Use --help to see all available flags.");
 
+#ifdef MYSQLD_LIBRARY_MODE
+  // When compiled as library mode, only accept flags that are defined in the data substrate
   gflags::ParseCommandLineFlags(&argc, &argv, true);
+#else
+  // When compiled as standalone mode, allow unrecognized flags to be passed through to MySQL
+  gflags::AllowCommandLineReparsing();
+  // Allow all MySQL-specific flags to pass through without error
+  gflags::SetCommandLineOption("undefok", "*");
+  gflags::ParseCommandLineNonHelpFlags(&argc, &argv, false);
+#endif
 
 #ifdef WITH_GLOG
   InitGoogleLogging(argv);

sql/main.cc

@@ -5263,7 +5263,7 @@ static int init_server_components()
       We need to eat any 'loose' arguments first before we conclude
       that there are unprocessed options.
     */
-    my_getopt_skip_unknown= 0;
+    my_getopt_skip_unknown= TRUE;
 #ifdef WITH_WSREP
     if (wsrep_recovery)
       my_getopt_skip_unknown= TRUE;
@@ -5281,12 +5281,12 @@ static int init_server_components()
     if (!wsrep_recovery)
     {
 #endif
-      if (remaining_argc > 1)
-      {
-        fprintf(stderr, "%s: Too many arguments (first extra is '%s').\n",
-                my_progname, remaining_argv[1]);
-        unireg_abort(1);
-      }
+      // if (remaining_argc > 1)
+      // {
+      //   fprintf(stderr, "%s: Too many arguments (first extra is '%s').\n",
+      //           my_progname, remaining_argv[1]);
+      //   unireg_abort(1);
+      // }
 #ifdef WITH_WSREP
     }
 #endif

sql/mysqld.cc

@@ -587,26 +587,22 @@ static int load_view_fetch_func()
   std::string schema_image;
   bool ok= storage_hd->FetchTable(VIEW_TABLE_NAME, schema_image, exists,
                                   version_ts);
-  LOG(INFO) << "load_view_fetch_func " << ok << " exists: " << exists << " version_ts: " << version_ts;
   if (ok)
   {
     if (exists)
     {
       eloq_fetch_view_impl= eloq_fetch_view_normal;
-      LOG(INFO) << "eloq_fetch_view_impl= eloq_fetch_view_normal";
       ret= 0;
     }
     else
     {
       eloq_fetch_view_impl= eloq_fetch_view_bootstrap;
-      LOG(INFO) << "eloq_fetch_view_impl= eloq_fetch_view_bootstrap";
       ret= HA_ERR_KEY_NOT_FOUND;
     }
   }
   else
   {
     eloq_fetch_view_impl= eloq_fetch_view_error;
-    LOG(INFO) << "eloq_fetch_view_impl= eloq_fetch_view_error";
     ret= HA_ERR_INTERNAL_ERROR;
   }
   return ret;
@@ -616,7 +612,6 @@ static int eloq_fetch_view_bootstrap(THD *thd, LEX_CSTRING db,
                                      LEX_CSTRING view, LEX_CSTRING &frm_binary)
 {
   DBUG_ENTER_FUNC();
-  LOG(INFO) << "eloq_fetch_view_bootstrap " << db.str << " " << view.str << ", opt bootstrap: " << opt_bootstrap;
   int err= load_view_fetch_func();
   if (err == 0)
   {
@@ -636,7 +631,6 @@ static int eloq_fetch_view_normal(THD *thd, LEX_CSTRING db, LEX_CSTRING view,
                                   LEX_CSTRING &frm_binary)
 {
   DBUG_ENTER_FUNC();
-  LOG(INFO) << "eloq_fetch_view_normal " << db.str << " " << view.str;
 
   int ret= 0;
 

storage/eloq/eloq_db.cpp

@@ -44,7 +44,14 @@ class MariaSystemHandler : public txservice::SystemHandler
 
 private:
   MariaSystemHandler();
-  ~MariaSystemHandler()= default;
+  ~MariaSystemHandler()
+  {
+    Shutdown();
+    if (thd_.joinable())
+    {
+      thd_.join();
+    }
+  }
 
   void SubmitWork(std::packaged_task<bool()> work);
 

storage/eloq/eloq_system_handler.h

@@ -435,7 +435,9 @@ MysqlTableSchema::MysqlTableSchema(const txservice::TableName &table_name,
   }
 
   size_t offset= 0;
-  kv_info_= storage_hd->DeserializeKVCatalogInfo(kv_info, offset);
+  kv_info_= DataSubstrate::GetGlobal()
+                ->GetStoreHandler()
+                ->DeserializeKVCatalogInfo(kv_info, offset);
   record_schema_= EloqRecordSchema(&mysql_table_share_);
 }