diff --git a/concourse/scripts/dss_server.ini b/concourse/scripts/dss_server.ini
index 0d6a119394c..abce768f4a8 100644
--- a/concourse/scripts/dss_server.ini
+++ b/concourse/scripts/dss_server.ini
@@ -6,8 +6,8 @@ event_dispatcher_num=1
 #auto_redirect=true
 
 [store]
-rocksdb_cloud_bucket_prefix=dss-
-rocksdb_cloud_bucket_name=eloqsql-mtr-test
-rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
-aws_access_key_id=XXXXXXXXXXXXXXXXX
-aws_secret_key=XXXXXXXXXXXXXXXXXXXXXXXX
+eloq_store_open_files_limit=256
+eloq_store_cloud_endpoint=http://127.0.0.1:9900
+eloq_store_cloud_store_path=dss-eloqsql-mtr-test/eloqstore
+eloq_store_cloud_access_key=XXXXXX
+eloq_store_cloud_secret_key=XXXXXX
diff --git a/concourse/scripts/main.ent.bash b/concourse/scripts/main.ent.bash
index 83a2e1d7bde..53063d314df 100755
--- a/concourse/scripts/main.ent.bash
+++ b/concourse/scripts/main.ent.bash
@@ -52,20 +52,20 @@ update_config_template() {
         echo "Warning: Config file $config_file does not exist"
         return 1
     fi
-    
+
     # ak/sk
     sed -i "s/aws_access_key_id.*=.\+/aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" "$config_file"
     sed -i "s/aws_secret_key.*=.\+/aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" "$config_file"
-    # OSS settings
-    sed -i "s|rocksdb_cloud_s3_endpoint_url.*=.\+|rocksdb_cloud_s3_endpoint_url=${MINIO_ENDPOINT_URL}|g" "$config_file"
-    sed -i "s|txlog_rocksdb_cloud_s3_endpoint_url.*=.\+|txlog_rocksdb_cloud_s3_endpoint_url=${MINIO_ENDPOINT_URL}|g" "$config_file"
-    sed -i "s/rocksdb_cloud_bucket_name.*=.\+/rocksdb_cloud_bucket_name=${bucket_name}/g" "$config_file"
-    sed -i "s/txlog_rocksdb_cloud_bucket_name.*=.\+/txlog_rocksdb_cloud_bucket_name=${bucket_name}/g" "$config_file"
-    sed -i "s/rocksdb_cloud_region.*=.\+/rocksdb_cloud_region=${ELOQ_AWS_REGION}/g" "$config_file"
+    sed -i "s/eloq_store_cloud_access_key.*=.\+/eloq_store_cloud_access_key=${ELOQ_AWS_ACCESS_KEY_ID}/g" "$config_file"
+    sed -i "s/eloq_store_cloud_secret_key.*=.\+/eloq_store_cloud_secret_key=${ELOQ_AWS_SECRET_KEY}/g" "$config_file"
+
+    # txlog
     sed -i "s/txlog_rocksdb_cloud_region.*=.\+/txlog_rocksdb_cloud_region=${ELOQ_AWS_REGION}/g" "$config_file"
-    sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g" "$config_file"
-    sed -i "s/txlog_rocksdb_cloud_bucket_prefix.*=.\+/txlog_rocksdb_cloud_bucket_prefix=txlog-/g" "$config_file"
-    sed -i "s|eloq_dss_config_file_path.*=.\+|eloq_dss_config_file_path=${WORKSPACE}/eloqsql_src/concourse/scripts/dss_config.example.ini|g" "$config_file"
+    sed -i "s|txlog_rocksdb_cloud_object_store_service_url.*=.\+|txlog_rocksdb_cloud_object_store_service_url=${MINIO_ENDPOINT_URL}/txlog-${bucket_name}/txlog|g" "$config_file"
+
+    # eloqstore
+    sed -i "s|eloq_store_cloud_endpoint.*=.\+|eloq_store_cloud_endpoint=${MINIO_ENDPOINT_URL}|g" "$config_file"
+    sed -i "s|eloq_store_cloud_store_path.*=.\+|eloq_store_cloud_store_path=dss-${bucket_name}/eloqstore|g" "$config_file"
 }
 
 # config data_substrate.cnf
@@ -100,11 +100,10 @@ cat $WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap_ds.cnf
 sed -i "s/ip.*=.\+/ip=localhost/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
 sed -i "s/port.*=.\+/port=9100/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
 sed -i "s/data_path.*=.\+/data_path=dss_data/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
-sed -i "s/aws_access_key_id.*=.\+/aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
-sed -i "s/aws_secret_key.*=.\+/aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
-sed -i "s|rocksdb_cloud_s3_endpoint_url.*=.\+|rocksdb_cloud_s3_endpoint_url=${MINIO_ENDPOINT_URL}|g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
-sed -i "s/rocksdb_cloud_bucket_name.*=.\+/rocksdb_cloud_bucket_name=${bucket_name}/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
-sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
+sed -i "s/eloq_store_cloud_access_key.*=.\+/eloq_store_cloud_access_key =${ELOQ_AWS_ACCESS_KEY_ID}/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
+sed -i "s/eloq_store_cloud_secret_key.*=.\+/eloq_store_cloud_secret_key=${ELOQ_AWS_SECRET_KEY}/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
+sed -i "s|eloq_store_cloud_endpoint.*=.\+|eloq_store_cloud_endpoint=${MINIO_ENDPOINT_URL}|g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
+sed -i "s|eloq_store_cloud_store_path.*=.\+|eloq_store_cloud_store_path=dss-${bucket_name}/eloqstore|g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
 
 echo "dss_server.ini"
 cat $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
@@ -129,7 +128,7 @@ if [ ! -f "Makefile" ]; then
           -DEXT_TX_PROC_ENABLED=ON \
           -DMARIA_WITH_GLOG=ON \
           -DSTATISTICS=ON \
-          -DWITH_DATA_STORE=ELOQDSS_ROCKSDB_CLOUD_S3 \
+          -DWITH_DATA_STORE=ELOQDSS_ELOQSTORE \
           -DOPEN_LOG_SERVICE=OFF \
           -DFORK_HM_PROCESS=ON \
 	  -DWITH_LOG_STATE=ROCKSDB_CLOUD_S3 \
@@ -148,7 +147,7 @@ cmake --install . --config Debug
 echo "building dss_server"
 cd /home/$current_user/workspace/eloqsql/data_substrate/store_handler/eloq_data_store_service
 mkdir bld && cd bld
-cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_DATA_STORE=ELOQDSS_ROCKSDB_CLOUD_S3 ../
+cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_DATA_STORE=ELOQDSS_ELOQSTORE ../
 cmake --build . --config Debug -j8
 echo "installing dss_server"
 cp dss_server /home/$current_user/workspace/eloqsql/install/bin/
diff --git a/concourse/scripts/mtr_bootstrap.cnf b/concourse/scripts/mtr_bootstrap.cnf
index e1263982d64..756dd04ea5d 100644
--- a/concourse/scripts/mtr_bootstrap.cnf
+++ b/concourse/scripts/mtr_bootstrap.cnf
@@ -5,4 +5,4 @@ thread_pool_size=1
 thread_pool_oversubscribe=10
 thread_pool_dedicated_listener=1
 
-eloq_config=
\ No newline at end of file
+eloq_config=
diff --git a/concourse/scripts/mtr_bootstrap_ds.cnf b/concourse/scripts/mtr_bootstrap_ds.cnf
index 89f3c9f69f1..c25d4f8b726 100644
--- a/concourse/scripts/mtr_bootstrap_ds.cnf
+++ b/concourse/scripts/mtr_bootstrap_ds.cnf
@@ -5,22 +5,20 @@ txlog_rocksdb_scan_threads=3
 hm_bin_path=../../bld/data_substrate/host_manager
 tx_ip=127.0.0.1
 tx_port=8000
-txlog_rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
-txlog_rocksdb_cloud_bucket_name = eloqsql-mtr-test
-txlog_rocksdb_cloud_bucket_prefix = txlog-
-txlog_rocksdb_cloud_region = ap-northeast-1
+txlog_rocksdb_cloud_region=ap-northeast-1
+txlog_rocksdb_cloud_object_store_service_url=http://127.0.0.1:9900/txlog-eloqsql-mtr-test/txlog
 
 [cluster]
 tx_ip_port_list=127.0.0.1:8000
 
 [store]
-dynamodb_endpoint=http://127.0.0.1:8000
-bigtable_project_id=XXXXXXXX
-bigtable_instance_id=XXXXXXXX
-aws_access_key_id=XXXXXXXXXX
-aws_secret_key=XXXXXXXXXXXXXXXXXXXXX
-rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
-rocksdb_cloud_bucket_name = eloqsql-mtr-test
-rocksdb_cloud_bucket_prefix = dss-
-rocksdb_cloud_region = ap-northeast-1
-eloq_dss_config_file_path =
\ No newline at end of file
+aws_access_key_id=XXXXXX
+aws_secret_key=XXXXXX
+
+eloq_store_open_files_limit=256
+eloq_store_buffer_pool_size=500MB
+eloq_store_cloud_endpoint=http://127.0.0.1:9900
+eloq_store_cloud_store_path=dss-eloqsql-mtr-test/eloqstore
+eloq_store_cloud_access_key=XXXXXX
+eloq_store_cloud_secret_key=XXXXXX
+eloq_store_reuse_local_files=true
diff --git a/concourse/scripts/mtr_multi_bootstrap.cnf b/concourse/scripts/mtr_multi_bootstrap.cnf
index e1263982d64..756dd04ea5d 100644
--- a/concourse/scripts/mtr_multi_bootstrap.cnf
+++ b/concourse/scripts/mtr_multi_bootstrap.cnf
@@ -5,4 +5,4 @@ thread_pool_size=1
 thread_pool_oversubscribe=10
 thread_pool_dedicated_listener=1
 
-eloq_config=
\ No newline at end of file
+eloq_config=
diff --git a/concourse/scripts/mtr_multi_bootstrap_ds.cnf b/concourse/scripts/mtr_multi_bootstrap_ds.cnf
index e2b2bb4c59b..2d3bfa26533 100644
--- a/concourse/scripts/mtr_multi_bootstrap_ds.cnf
+++ b/concourse/scripts/mtr_multi_bootstrap_ds.cnf
@@ -5,24 +5,16 @@ txlog_rocksdb_scan_threads=3
 hm_bin_path=../../bld/data_substrate/host_manager
 tx_ip=127.0.0.1
 tx_port=8000
-txlog_rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
-txlog_rocksdb_cloud_bucket_name = eloqsql-mtr-test
-txlog_rocksdb_cloud_bucket_prefix = txlog-
-txlog_rocksdb_cloud_region = ap-northeast-1
+txlog_rocksdb_cloud_region=ap-northeast-1
+txlog_rocksdb_cloud_object_store_service_url=http://127.0.0.1:9900/txlog-eloqsql-mtr-test/txlog
 
 [cluster]
 tx_ip_port_list=127.0.0.1:8000,127.0.0.1:8010,127.0.0.1:8020
 
 [store]
-dynamodb_endpoint=http://127.0.0.1:8000
-bigtable_project_id=XXXXXXXX
-bigtable_instance_id=XXXXXXXX
-aws_access_key_id=XXXXXXXXXX
-aws_secret_key=XXXXXXXXXXXXXXXXXXXXX
-rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
-rocksdb_cloud_bucket_name = eloqsql-mtr-test
-rocksdb_cloud_bucket_prefix = dss-
-rocksdb_cloud_region = ap-northeast-1
-eloq_dss_config_file_path =
-eloq_dss_peer_node = localhost:9100
+aws_access_key_id=XXXXXX
+aws_secret_key=XXXXXX
+
+eloq_dss_config_file_path=
+eloq_dss_peer_node=localhost:9100
 
diff --git a/concourse/scripts/pr.ent.bash b/concourse/scripts/pr.ent.bash
index 8297ace31b6..3a436a889de 100755
--- a/concourse/scripts/pr.ent.bash
+++ b/concourse/scripts/pr.ent.bash
@@ -73,20 +73,20 @@ update_config_template() {
         echo "Warning: Config file $config_file does not exist"
         return 1
     fi
-    
+
     # ak/sk
     sed -i "s/aws_access_key_id.*=.\+/aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" "$config_file"
     sed -i "s/aws_secret_key.*=.\+/aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" "$config_file"
-    # OSS settings
-    sed -i "s|rocksdb_cloud_s3_endpoint_url.*=.\+|rocksdb_cloud_s3_endpoint_url=${MINIO_ENDPOINT_URL}|g" "$config_file"
-    sed -i "s|txlog_rocksdb_cloud_s3_endpoint_url.*=.\+|txlog_rocksdb_cloud_s3_endpoint_url=${MINIO_ENDPOINT_URL}|g" "$config_file"
-    sed -i "s/rocksdb_cloud_bucket_name.*=.\+/rocksdb_cloud_bucket_name=${bucket_name}/g" "$config_file"
-    sed -i "s/txlog_rocksdb_cloud_bucket_name.*=.\+/txlog_rocksdb_cloud_bucket_name=${bucket_name}/g" "$config_file"
-    sed -i "s/rocksdb_cloud_region.*=.\+/rocksdb_cloud_region=${ELOQ_AWS_REGION}/g" "$config_file"
+    sed -i "s/eloq_store_cloud_access_key.*=.\+/eloq_store_cloud_access_key=${ELOQ_AWS_ACCESS_KEY_ID}/g" "$config_file"
+    sed -i "s/eloq_store_cloud_secret_key.*=.\+/eloq_store_cloud_secret_key=${ELOQ_AWS_SECRET_KEY}/g" "$config_file"
+
+    # txlog
     sed -i "s/txlog_rocksdb_cloud_region.*=.\+/txlog_rocksdb_cloud_region=${ELOQ_AWS_REGION}/g" "$config_file"
-    sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g" "$config_file"
-    sed -i "s/txlog_rocksdb_cloud_bucket_prefix.*=.\+/txlog_rocksdb_cloud_bucket_prefix=txlog-/g" "$config_file"
-    sed -i "s|eloq_dss_config_file_path.*=.\+|eloq_dss_config_file_path=${WORKSPACE}/eloqsql_pr/concourse/scripts/dss_config.example.ini|g" "$config_file"
+    sed -i "s|txlog_rocksdb_cloud_object_store_service_url.*=.\+|txlog_rocksdb_cloud_object_store_service_url=${MINIO_ENDPOINT_URL}/txlog-${bucket_name}/txlog|g" "$config_file"
+
+    # eloqstore
+    sed -i "s|eloq_store_cloud_endpoint.*=.\+|eloq_store_cloud_endpoint=${MINIO_ENDPOINT_URL}|g" "$config_file"
+    sed -i "s|eloq_store_cloud_store_path.*=.\+|eloq_store_cloud_store_path=dss-${bucket_name}/eloqstore|g" "$config_file"
 }
 
 # config data_substrate.cnf
@@ -103,29 +103,29 @@ cat $WORKSPACE/eloqsql_pr/storage/eloq/mysql-test/mono_multi/data_substrate2.cnf
 cat $WORKSPACE/eloqsql_pr/storage/eloq/mysql-test/mono_multi/data_substrate3.cnf
 
 # config mtr_bootstrap.cnf
-update_config_template "$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap_ds.cnf"
-sed -i "s|eloq_config=.*|eloq_config=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap_ds.cnf|g" $WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap.cnf
-sed -i "s|hm_bin_path=.*|hm_bin_path=$WORKSPACE/eloqsql_pr/bld/data_substrate/host_manager|g" $WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap_ds.cnf
+update_config_template "$WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap_ds.cnf"
+sed -i "s|eloq_config=.*|eloq_config=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap_ds.cnf|g" $WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap.cnf
+sed -i "s|hm_bin_path=.*|hm_bin_path=$WORKSPACE/eloqsql_src/bld/data_substrate/host_manager|g" $WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap_ds.cnf
 echo "mtr_bootstrap_ds.cnf"
-cat $WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap_ds.cnf
+cat $WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap_ds.cnf
 
 #config mtr_multi_bootstrap.cnf
-update_config_template "$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_multi_bootstrap_ds.cnf"
-sed -i "s|eloq_config=.*|eloq_config=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_multi_bootstrap_ds.cnf|g" $WORKSPACE/eloqsql_pr/concourse/scripts/mtr_multi_bootstrap.cnf
-sed -i "s|hm_bin_path=.*|hm_bin_path=$WORKSPACE/eloqsql_pr/bld/data_substrate/host_manager|g" $WORKSPACE/eloqsql_pr/concourse/scripts/mtr_multi_bootstrap_ds.cnf
+update_config_template "$WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap_ds.cnf"
+sed -i "s|eloq_config=.*|eloq_config=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap_ds.cnf|g" $WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap.cnf
+sed -i "s|hm_bin_path=.*|hm_bin_path=$WORKSPACE/eloqsql_src/bld/data_substrate/host_manager|g" $WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap_ds.cnf
 echo "mtr_multi_bootstrap_ds.cnf"
-cat $WORKSPACE/eloqsql_pr/concourse/scripts/mtr_multi_bootstrap_ds.cnf
+cat $WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap_ds.cnf
 
 #config dss_server.ini
 # ak/sk
-sed -i "s/ip.*=.\+/ip=localhost/g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
-sed -i "s/port.*=.\+/port=9100/g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
-sed -i "s/data_path.*=.\+/data_path=dss_data/g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
-sed -i "s/aws_access_key_id.*=.\+/aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
-sed -i "s/aws_secret_key.*=.\+/aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
-sed -i "s|rocksdb_cloud_s3_endpoint_url.*=.\+|rocksdb_cloud_s3_endpoint_url=${MINIO_ENDPOINT_URL}|g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
-sed -i "s/rocksdb_cloud_bucket_name.*=.\+/rocksdb_cloud_bucket_name=${bucket_name}/g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
-sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
+sed -i "s/ip.*=.\+/ip=localhost/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
+sed -i "s/port.*=.\+/port=9100/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
+sed -i "s/data_path.*=.\+/data_path=dss_data/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
+sed -i "s/eloq_store_cloud_access_key.*=.\+/eloq_store_cloud_access_key =${ELOQ_AWS_ACCESS_KEY_ID}/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
+sed -i "s/eloq_store_cloud_secret_key.*=.\+/eloq_store_cloud_secret_key=${ELOQ_AWS_SECRET_KEY}/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
+sed -i "s|eloq_store_cloud_endpoint.*=.\+|eloq_store_cloud_endpoint=${MINIO_ENDPOINT_URL}|g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
+sed -i "s|eloq_store_cloud_store_path.*=.\+|eloq_store_cloud_store_path=dss-${bucket_name}/eloqstore|g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
+
 
 echo "dss_server.ini"
 cat $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
@@ -150,7 +150,7 @@ if [ ! -f "Makefile" ]; then
           -DEXT_TX_PROC_ENABLED=ON \
           -DMARIA_WITH_GLOG=ON \
           -DSTATISTICS=ON \
-          -DWITH_DATA_STORE=ELOQDSS_ROCKSDB_CLOUD_S3 \
+          -DWITH_DATA_STORE=ELOQDSS_ELOQSTORE \
           -DOPEN_LOG_SERVICE=OFF \
           -DFORK_HM_PROCESS=ON \
 	  -DWITH_LOG_STATE=ROCKSDB_CLOUD_S3 \
@@ -169,7 +169,7 @@ cmake --install . --config Debug
 echo "building dss_server"
 cd /home/$current_user/workspace/eloqsql/data_substrate/store_handler/eloq_data_store_service
 mkdir bld && cd bld
-cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_DATA_STORE=ELOQDSS_ROCKSDB_CLOUD_S3 ../
+cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_DATA_STORE=ELOQDSS_ELOQSTORE ../
 cmake --build . --config Debug -j8
 echo "installing dss_server"
 cp dss_server /home/$current_user/workspace/eloqsql/install/bin/
diff --git a/data_substrate b/data_substrate
index 25dd6a39ced..c2b1c26101b 160000
--- a/data_substrate
+++ b/data_substrate
@@ -1 +1 @@
-Subproject commit 25dd6a39cedb036e8ce849509245769fbcea48c7
+Subproject commit c2b1c26101ba4bace22b14fe348a6d5d454f5d6d
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index e136da08044..8ca6b3f0419 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -542,8 +542,8 @@ Sys_binlog_cache_size(
 static Sys_var_on_access_global<Sys_var_ulonglong,
                                 PRIV_SET_SYSTEM_GLOBAL_VAR_BINLOG_FILE_CACHE_SIZE>
 Sys_binlog_file_cache_size(
-       "binlog_file_cache_size", 
-       "The size of file cache for the binary log", 
+       "binlog_file_cache_size",
+       "The size of file cache for the binary log",
        GLOBAL_VAR(binlog_file_cache_size),
        CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(IO_SIZE*2, SIZE_T_MAX), DEFAULT(IO_SIZE*4), BLOCK_SIZE(IO_SIZE));
@@ -1126,7 +1126,7 @@ static bool event_scheduler_update(sys_var *self, THD *thd, enum_var_type type)
     opt_event_scheduler_value= Events::opt_event_scheduler=
       Events::startup_state;
   }
- 
+
   /*
     If the scheduler was not properly inited (because of wrong system tables),
     try to init it again. This is needed for mysql_upgrade to work properly if
@@ -2521,7 +2521,7 @@ static bool if_checking_enabled(sys_var *self, THD *thd,  set_var *var)
 {
   if (session_readonly(self, thd, var))
     return true;
-  
+
   if (!max_user_connections_checking)
   {
     my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--max-user-connections=0");
@@ -2757,7 +2757,7 @@ export const char *optimizer_switch_names[]=
   "rowid_filter",
   "condition_pushdown_from_having",
   "not_null_range_scan",
-  "default", 
+  "default",
   NullS
 };
 static bool fix_optimizer_switch(sys_var *self, THD *thd,
@@ -3094,7 +3094,7 @@ static Sys_var_enum Sys_thread_handling(
        "thread_handling",
        "Define threads usage for handling queries",
        READ_ONLY GLOBAL_VAR(thread_handling), CMD_LINE(REQUIRED_ARG),
-       thread_handling_names, 
+       thread_handling_names,
        DEFAULT(DEFAULT_THREAD_HANDLING)
  );
 
@@ -4008,7 +4008,7 @@ Sys_threadpool_size(
  "Number of thread groups in the pool. "
  "This parameter is roughly equivalent to maximum number of concurrently "
  "executing threads (threads in a waiting state do not count as executing).",
-  GLOBAL_VAR(threadpool_size), CMD_LINE(REQUIRED_ARG),
+  READ_ONLY GLOBAL_VAR(threadpool_size), CMD_LINE(REQUIRED_ARG),
   VALID_RANGE(1, MAX_THREAD_GROUPS), DEFAULT(8), BLOCK_SIZE(1),
   NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_threadpool_size),
   ON_UPDATE(fix_threadpool_size)
@@ -4023,7 +4023,7 @@ Sys_threadpool_stall_limit(
  "may be created to handle remaining clients.",
   GLOBAL_VAR(threadpool_stall_limit), CMD_LINE(REQUIRED_ARG),
   VALID_RANGE(1, UINT_MAX), DEFAULT(DEFAULT_THREADPOOL_STALL_LIMIT), BLOCK_SIZE(1),
-  NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), 
+  NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
   ON_UPDATE(fix_threadpool_stall_limit)
 );
 
@@ -4034,7 +4034,7 @@ Sys_threadpool_max_threads(
   "Maximum allowed number of worker threads in the thread pool",
    GLOBAL_VAR(threadpool_max_threads), CMD_LINE(REQUIRED_ARG),
    VALID_RANGE(1, 65536), DEFAULT(65536), BLOCK_SIZE(1),
-   NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), 
+   NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
    ON_UPDATE(fix_tp_max_threads)
 );
 
@@ -4457,7 +4457,7 @@ static Sys_var_bit Sys_log_off(
        ON_CHECK(check_has_super));
 
 /**
-  This function sets the session variable thd->variables.sql_log_bin 
+  This function sets the session variable thd->variables.sql_log_bin
   to reflect changes to @@session.sql_log_bin.
 
   @param[IN] self   A pointer to the sys_var, i.e. Sys_log_binlog.
@@ -4963,10 +4963,10 @@ static bool check_log_path(sys_var *self, THD *thd, set_var *var)
   if (!path_length)
     return true;
 
-  if (!is_filename_allowed(var->save_result.string_value.str, 
+  if (!is_filename_allowed(var->save_result.string_value.str,
                            var->save_result.string_value.length, TRUE))
   {
-     my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), 
+     my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0),
               self->name.str, var->save_result.string_value.str);
      return true;
   }
@@ -5307,7 +5307,7 @@ bool Sys_var_rpl_filter::global_update(THD *thd, set_var *var)
   {
     if (mi->rli.slave_running)
     {
-      my_error(ER_SLAVE_MUST_STOP, MYF(0), 
+      my_error(ER_SLAVE_MUST_STOP, MYF(0),
                (int) mi->connection_name.length,
                mi->connection_name.str);
       result= true;
@@ -5490,7 +5490,7 @@ get_master_info_ulonglong_value(THD *thd, ptrdiff_t offset) const
   mysql_mutex_lock(&LOCK_global_system_variables);
   return res;
 }
-  
+
 
 bool update_multi_source_variable(sys_var *self_var, THD *thd,
                                   enum_var_type type)
@@ -5721,7 +5721,7 @@ static bool update_locale(sys_var *self, THD* thd, enum_var_type type)
       global_system_variables.lc_messages->errmsgs->errmsgs;
   return false;
 }
-  
+
 static Sys_var_struct Sys_lc_messages(
        "lc_messages", "Set the language used for the error messages",
        SESSION_VAR(lc_messages), NO_CMD_LINE,
@@ -5757,10 +5757,10 @@ static Sys_var_charptr_fscs Sys_wsrep_provider(
 static Sys_var_charptr Sys_wsrep_provider_options(
        "wsrep_provider_options", "Semicolon (;) separated list of wsrep "
        "options (see wsrep_provider_options documentation).",
-       PREALLOCATED GLOBAL_VAR(wsrep_provider_options), 
+       PREALLOCATED GLOBAL_VAR(wsrep_provider_options),
        CMD_LINE(REQUIRED_ARG),
        DEFAULT(""), NO_MUTEX_GUARD, NOT_IN_BINLOG,
-       ON_CHECK(wsrep_provider_options_check), 
+       ON_CHECK(wsrep_provider_options_check),
        ON_UPDATE(wsrep_provider_options_update));
 
 static Sys_var_charptr_fscs Sys_wsrep_data_home_dir(
@@ -5778,11 +5778,11 @@ static Sys_var_charptr Sys_wsrep_cluster_name(
 
 static Sys_var_charptr Sys_wsrep_cluster_address (
        "wsrep_cluster_address", "Address to initially connect to cluster",
-       PREALLOCATED GLOBAL_VAR(wsrep_cluster_address), 
+       PREALLOCATED GLOBAL_VAR(wsrep_cluster_address),
        CMD_LINE(REQUIRED_ARG),
        DEFAULT(""),
        NO_MUTEX_GUARD, NOT_IN_BINLOG,
-       ON_CHECK(wsrep_cluster_address_check), 
+       ON_CHECK(wsrep_cluster_address_check),
        ON_UPDATE(wsrep_cluster_address_update));
 
 static Sys_var_charptr Sys_wsrep_node_name (
@@ -5833,7 +5833,7 @@ static Sys_var_enum Sys_wsrep_debug(
 static Sys_var_mybool Sys_wsrep_convert_LOCK_to_trx(
        "wsrep_convert_LOCK_to_trx", "To convert locking sessions "
        "into transactions",
-       GLOBAL_VAR(wsrep_convert_LOCK_to_trx), 
+       GLOBAL_VAR(wsrep_convert_LOCK_to_trx),
        CMD_LINE(OPT_ARG), DEFAULT(FALSE));
 
 static Sys_var_ulong Sys_wsrep_retry_autocommit(
@@ -5886,7 +5886,7 @@ static bool update_wsrep_auto_increment_control (sys_var *self, THD *thd, enum_v
 static Sys_var_mybool Sys_wsrep_auto_increment_control(
        "wsrep_auto_increment_control", "To automatically control the "
        "assignment of autoincrement variables",
-       GLOBAL_VAR(wsrep_auto_increment_control), 
+       GLOBAL_VAR(wsrep_auto_increment_control),
        CMD_LINE(OPT_ARG), DEFAULT(TRUE),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(update_wsrep_auto_increment_control));
@@ -5904,14 +5904,14 @@ static Sys_var_charptr sys_wsrep_sst_method(
        DEFAULT(WSREP_SST_DEFAULT), NO_MUTEX_GUARD, NOT_IN_BINLOG,
        ON_CHECK(wsrep_sst_method_check));
 
-static Sys_var_charptr Sys_wsrep_sst_receive_address( 
+static Sys_var_charptr Sys_wsrep_sst_receive_address(
        "wsrep_sst_receive_address", "Address where node is waiting for "
-       "SST contact", 
+       "SST contact",
        GLOBAL_VAR(wsrep_sst_receive_address),CMD_LINE(REQUIRED_ARG),
        DEFAULT(WSREP_SST_ADDRESS_AUTO), NO_MUTEX_GUARD,
        NOT_IN_BINLOG,
        ON_CHECK(wsrep_sst_receive_address_check),
-       ON_UPDATE(wsrep_sst_receive_address_update)); 
+       ON_UPDATE(wsrep_sst_receive_address_update));
 
 static Sys_var_charptr Sys_wsrep_sst_auth(
        "wsrep_sst_auth", "Authentication for SST connection",
@@ -5919,24 +5919,24 @@ static Sys_var_charptr Sys_wsrep_sst_auth(
        DEFAULT(NULL), NO_MUTEX_GUARD,
        NOT_IN_BINLOG,
        ON_CHECK(wsrep_sst_auth_check),
-       ON_UPDATE(wsrep_sst_auth_update)); 
+       ON_UPDATE(wsrep_sst_auth_update));
 
 static Sys_var_charptr Sys_wsrep_sst_donor(
        "wsrep_sst_donor", "preferred donor node for the SST",
        GLOBAL_VAR(wsrep_sst_donor),CMD_LINE(REQUIRED_ARG),
        DEFAULT(""), NO_MUTEX_GUARD, NOT_IN_BINLOG,
        ON_CHECK(wsrep_sst_donor_check),
-       ON_UPDATE(wsrep_sst_donor_update)); 
+       ON_UPDATE(wsrep_sst_donor_update));
 
 static Sys_var_mybool Sys_wsrep_sst_donor_rejects_queries(
        "wsrep_sst_donor_rejects_queries", "Reject client queries "
-       "when donating state snapshot transfer", 
-       GLOBAL_VAR(wsrep_sst_donor_rejects_queries), 
+       "when donating state snapshot transfer",
+       GLOBAL_VAR(wsrep_sst_donor_rejects_queries),
        CMD_LINE(OPT_ARG), DEFAULT(FALSE));
 
 static Sys_var_mybool Sys_wsrep_on (
        "wsrep_on", "To enable wsrep replication ",
-       SESSION_VAR(wsrep_on), 
+       SESSION_VAR(wsrep_on),
        CMD_LINE(OPT_ARG), DEFAULT(FALSE),
        NO_MUTEX_GUARD, NOT_IN_BINLOG,
        ON_CHECK(wsrep_on_check),
@@ -5944,11 +5944,11 @@ static Sys_var_mybool Sys_wsrep_on (
 
 static Sys_var_charptr Sys_wsrep_start_position (
        "wsrep_start_position", "global transaction position to start from ",
-       PREALLOCATED GLOBAL_VAR(wsrep_start_position), 
+       PREALLOCATED GLOBAL_VAR(wsrep_start_position),
        CMD_LINE(REQUIRED_ARG),
        DEFAULT(WSREP_START_POSITION_ZERO),
        NO_MUTEX_GUARD, NOT_IN_BINLOG,
-       ON_CHECK(wsrep_start_position_check), 
+       ON_CHECK(wsrep_start_position_check),
        ON_UPDATE(wsrep_start_position_update));
 
 static Sys_var_ulong Sys_wsrep_max_ws_size (
@@ -5970,7 +5970,7 @@ static Sys_var_charptr Sys_wsrep_notify_cmd(
 
 static Sys_var_mybool Sys_wsrep_certify_nonPK(
        "wsrep_certify_nonPK", "Certify tables with no primary key",
-       GLOBAL_VAR(wsrep_certify_nonPK), 
+       GLOBAL_VAR(wsrep_certify_nonPK),
        CMD_LINE(OPT_ARG), DEFAULT(TRUE));
 
 static const char *wsrep_certification_rules_names[]= { "strict", "optimized", NullS };
@@ -6089,20 +6089,20 @@ static Sys_var_ulong Sys_wsrep_mysql_replication_bundle(
 static Sys_var_mybool Sys_wsrep_load_data_splitting(
        "wsrep_load_data_splitting", "To commit LOAD DATA "
        "transaction after every 10K rows inserted (deprecated)",
-       GLOBAL_VAR(wsrep_load_data_splitting), 
+       GLOBAL_VAR(wsrep_load_data_splitting),
        CMD_LINE(OPT_ARG), DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
        ON_CHECK(0), ON_UPDATE(0), DEPRECATED("")); // since 10.4.3
 
 static Sys_var_mybool Sys_wsrep_slave_FK_checks(
        "wsrep_slave_FK_checks", "Should slave thread do "
        "foreign key constraint checks",
-       GLOBAL_VAR(wsrep_slave_FK_checks), 
+       GLOBAL_VAR(wsrep_slave_FK_checks),
        CMD_LINE(OPT_ARG), DEFAULT(TRUE));
 
 static Sys_var_mybool Sys_wsrep_slave_UK_checks(
        "wsrep_slave_UK_checks", "Should slave thread do "
        "secondary index uniqueness checks",
-       GLOBAL_VAR(wsrep_slave_UK_checks), 
+       GLOBAL_VAR(wsrep_slave_UK_checks),
        CMD_LINE(OPT_ARG), DEFAULT(FALSE));
 
 static Sys_var_mybool Sys_wsrep_restart_slave(
@@ -6250,7 +6250,7 @@ static Sys_var_charptr_fscs Sys_ignore_db_dirs(
        "Specifies a directory to add to the ignore list when collecting "
        "database names from the datadir. Put a blank argument to reset "
        "the list accumulated so far.",
-       READ_ONLY GLOBAL_VAR(opt_ignore_db_dirs), 
+       READ_ONLY GLOBAL_VAR(opt_ignore_db_dirs),
        CMD_LINE(REQUIRED_ARG, OPT_IGNORE_DB_DIRECTORY),
        DEFAULT(0));
 
@@ -6327,7 +6327,7 @@ static Sys_var_keycache Sys_key_cache_segments(
        BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(repartition_keycache));
 
-static const char *log_slow_filter_names[]= 
+static const char *log_slow_filter_names[]=
 {
   "admin", "filesort", "filesort_on_disk", "filesort_priority_queue",
   "full_join", "full_scan", "not_using_index", "query_cache",
@@ -6370,7 +6370,7 @@ static Sys_var_set Sys_log_disabled_statements(
 #define PCRE2_EXTENDED_MORE NOT_SUPPORTED_YET
 #endif
 
-static const char *default_regex_flags_names[]= 
+static const char *default_regex_flags_names[]=
 {
   "DOTALL",    // (?s)  . matches anything including NL
   "DUPNAMES",  // (?J)  Allow duplicate names for subpatterns
@@ -6429,7 +6429,7 @@ static Sys_var_ulong Sys_log_slow_rate_limit(
        SESSION_VAR(log_slow_rate_limit), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(1, UINT_MAX), DEFAULT(1), BLOCK_SIZE(1));
 
-static const char *log_slow_verbosity_names[]= { "innodb", "query_plan", 
+static const char *log_slow_verbosity_names[]= { "innodb", "query_plan",
                                                  "explain", 0 };
 static Sys_var_set Sys_log_slow_verbosity(
        "log_slow_verbosity",
diff --git a/storage/eloq/eloq_system_handler.cpp b/storage/eloq/eloq_system_handler.cpp
index cb7093d27f8..80c8584a978 100644
--- a/storage/eloq/eloq_system_handler.cpp
+++ b/storage/eloq/eloq_system_handler.cpp
@@ -24,6 +24,8 @@
 #include "sql_class.h"
 #include "sql_servers.h"
 
+#include <glog/logging.h>
+
 extern my_bool opt_bootstrap;
 extern my_bool plugins_are_initialized;
 
@@ -33,7 +35,18 @@ MariaSystemHandler::MariaSystemHandler()
 {
   thd_= std::thread([this]() {
     // Set up thread local variables. Constructor of THD depends them.
-    my_thread_init();
+    if (my_thread_init())
+    {
+      DLOG(INFO) << "System handler thread initialized mysys thread variables";
+    }
+    else
+    {
+      LOG(ERROR) << "System handler thread failed to initialize mysys thread "
+                    "variables";
+      shutdown_.store(true, std::memory_order_release);
+      cv_.notify_one();
+      return;
+    }
 
     while (shutdown_.load(std::memory_order_acquire) == false)
     {
@@ -83,17 +96,23 @@ void MariaSystemHandler::ReloadCache(std::function<void(bool)> done)
     return ok;
   });
 
+  DLOG(INFO) << "Submitting reload cache work to system handler thread";
   SubmitWork(std::move(work));
 }
 
 void MariaSystemHandler::Shutdown()
 {
-  std::unique_lock<std::mutex> lk(mux_);
-  if (!shutdown_.load(std::memory_order_acquire))
   {
-    shutdown_.store(true, std::memory_order_release);
-    cv_.notify_one();
-    lk.unlock();
+    std::unique_lock<std::mutex> lk(mux_);
+    if (!shutdown_.load(std::memory_order_acquire))
+    {
+      shutdown_.store(true, std::memory_order_release);
+      cv_.notify_one();
+    }
+  }
+
+  if (thd_.joinable())
+  {
     thd_.join();
   }
 }
diff --git a/storage/eloq/mysql-test/mono_basic/data_substrate.cnf b/storage/eloq/mysql-test/mono_basic/data_substrate.cnf
index 6d598fe2be8..6338029ebc6 100644
--- a/storage/eloq/mysql-test/mono_basic/data_substrate.cnf
+++ b/storage/eloq/mysql-test/mono_basic/data_substrate.cnf
@@ -6,19 +6,16 @@ txlog_rocksdb_scan_threads=3
 tx_ip=127.0.0.1
 tx_port=8000
 hm_bin_path=../../../../data_substrate/host_manager
-txlog_rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
-txlog_rocksdb_cloud_bucket_name = eloqsql-mtr-test
-txlog_rocksdb_cloud_bucket_prefix = txlog-
-txlog_rocksdb_cloud_region = ap-northeast-1
+txlog_rocksdb_cloud_region=ap-northeast-1
+txlog_rocksdb_cloud_object_store_service_url=http://127.0.0.1:9900/txlog-eloqsql-mtr-test/txlog
+
 [store]
-aws_secret_key=XXXXXXXXXX
-aws_access_key_id=XXXXXXXXXXXXXXXXXXXXX
+aws_access_key_id=XXXXXX
+aws_secret_key=XXXXXX
 
-dynamodb_endpoint=http://127.0.0.1:8000
-bigtable_project_id=XXXXXXXX
-bigtable_instance_id=XXXXXXXX
-rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
-rocksdb_cloud_bucket_name = eloqsql-mtr-test
-rocksdb_cloud_bucket_prefix = dss-
-rocksdb_cloud_region = ap-northeast-1
-eloq_dss_config_file_path =
\ No newline at end of file
+eloq_store_open_files_limit=256
+eloq_store_cloud_endpoint=http://127.0.0.1:9900
+eloq_store_cloud_store_path=dss-eloqsql-mtr-test/eloqstore
+eloq_store_cloud_access_key=XXXXXX
+eloq_store_cloud_secret_key=XXXXXX
+eloq_store_reuse_local_files=true
diff --git a/storage/eloq/mysql-test/mono_basic/my.cnf b/storage/eloq/mysql-test/mono_basic/my.cnf
index 937f86997d9..05ff3c62ace 100644
--- a/storage/eloq/mysql-test/mono_basic/my.cnf
+++ b/storage/eloq/mysql-test/mono_basic/my.cnf
@@ -18,11 +18,11 @@ table_open_cache_instances=20
 skip-log-bin
 eloq_cc_protocol=OCC
 use_stat_tables=complementary
-eloq_config = @ENV.MYSQLTEST_VARDIR/../../../storage/eloq/mysql-test/mono_basic/data_substrate.cnf
+eloq_config=@ENV.MYSQLTEST_VARDIR/../../../storage/eloq/mysql-test/mono_basic/data_substrate.cnf
 
 [mysqld.1]
 
 
 [ENV]
 MONO1_PORT=              @mysqld.1.port
-MONO1_SOCK=              @mysqld.1.socket
\ No newline at end of file
+MONO1_SOCK=              @mysqld.1.socket
diff --git a/storage/eloq/mysql-test/mono_main/data_substrate.cnf b/storage/eloq/mysql-test/mono_main/data_substrate.cnf
index 91265982658..8b2bdbffbb0 100644
--- a/storage/eloq/mysql-test/mono_main/data_substrate.cnf
+++ b/storage/eloq/mysql-test/mono_main/data_substrate.cnf
@@ -6,19 +6,16 @@ txlog_rocksdb_scan_threads=3
 hm_bin_path=../../../../data_substrate/host_manager
 tx_ip=127.0.0.1
 tx_port=8000
-txlog_rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
-txlog_rocksdb_cloud_bucket_name = eloqsql-mtr-test
-txlog_rocksdb_cloud_bucket_prefix = txlog-
-txlog_rocksdb_cloud_region = ap-northeast-1
+txlog_rocksdb_cloud_region=ap-northeast-1
+txlog_rocksdb_cloud_object_store_service_url=http://127.0.0.1:9900/txlog-eloqsql-mtr-test/txlog
+
 [store]
-aws_secret_key=XXXXXXXXXX
-aws_access_key_id=XXXXXXXXXXXXXXXXXXXXX
+aws_access_key_id=XXXXXX
+aws_secret_key=XXXXXX
 
-dynamodb_endpoint=http://127.0.0.1:8000
-bigtable_project_id=XXXXXXXX
-bigtable_instance_id=XXXXXXXX
-rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
-rocksdb_cloud_bucket_name = eloqsql-mtr-test
-rocksdb_cloud_bucket_prefix = dss-
-rocksdb_cloud_region = ap-northeast-1
-eloq_dss_config_file_path =
\ No newline at end of file
+eloq_store_open_files_limit=256
+eloq_store_cloud_endpoint=http://127.0.0.1:9900
+eloq_store_cloud_store_path=dss-eloqsql-mtr-test/eloqstore
+eloq_store_cloud_access_key=XXXXXX
+eloq_store_cloud_secret_key=XXXXXX
+eloq_store_reuse_local_files=true
diff --git a/storage/eloq/mysql-test/mono_main/disabled.def b/storage/eloq/mysql-test/mono_main/disabled.def
index 20d1dfcd0a0..f95b6e55123 100644
--- a/storage/eloq/mysql-test/mono_main/disabled.def
+++ b/storage/eloq/mysql-test/mono_main/disabled.def
@@ -398,7 +398,7 @@ grant_repair                         : deleted no support xxx.mai file
 #group_by                             : 0 pass | lock tables | unique | analyze
 group_by_innodb                      : deleted
 #group_by_null                        : 0 pass
-group_min_max                        : 0 pass | analyze | optimize table | unique | timeout with eloq_ddl_skip_kv=off 
+group_min_max                        : 0 pass | analyze | optimize table | unique | timeout with eloq_ddl_skip_kv=off
 group_min_max_innodb                 : deleted
 #handler_read_last                    : 1 pass
 #handlersocket                        : 1 skipped handlersocket plugin is not built
@@ -537,7 +537,7 @@ lowercase_table_qcache               : known limitation #220
 #lowercase_utf8                       : 2 pass
 lowercase_view                       : known limitation #220
 #max_password_errors                  : 1 pass
-#mdev-21101                           : pass | thread-handlinge
+mdev-21101                           : pass | thread-handlinge
 mdev13607                            : current_record_count | INNER JOIN | NATURAL JOIN
 mdev19198                            : no support LOCK TABLE
 mdev316                              : no support charset collate
diff --git a/storage/eloq/mysql-test/mono_main/my.cnf b/storage/eloq/mysql-test/mono_main/my.cnf
index 0e79f14a136..120c7a61837 100644
--- a/storage/eloq/mysql-test/mono_main/my.cnf
+++ b/storage/eloq/mysql-test/mono_main/my.cnf
@@ -19,7 +19,7 @@ collation-server=latin1_bin
 # NOTE: the value of this variable should be consistent with the value in bootstrap.test
 eloq_cc_protocol=OCC
 use_stat_tables=complementary
-eloq_config = @ENV.MYSQLTEST_VARDIR/../../../storage/eloq/mysql-test/mono_main/data_substrate.cnf
+eloq_config=@ENV.MYSQLTEST_VARDIR/../../../storage/eloq/mysql-test/mono_main/data_substrate.cnf
 
 [mysqld.1]
 
diff --git a/storage/eloq/mysql-test/mono_multi/data_substrate1.cnf b/storage/eloq/mysql-test/mono_multi/data_substrate1.cnf
index ad848b19cde..b9f1b43b045 100644
--- a/storage/eloq/mysql-test/mono_multi/data_substrate1.cnf
+++ b/storage/eloq/mysql-test/mono_multi/data_substrate1.cnf
@@ -5,15 +5,15 @@ txlog_rocksdb_scan_threads=3
 hm_bin_path=../../../../data_substrate/host_manager
 tx_ip=127.0.0.1
 tx_port=8000
-txlog_rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
-txlog_rocksdb_cloud_bucket_name = eloqsql-mtr-test
-txlog_rocksdb_cloud_bucket_prefix = txlog-
-txlog_rocksdb_cloud_region = ap-northeast-1
+txlog_rocksdb_cloud_region=ap-northeast-1
+txlog_rocksdb_cloud_object_store_service_url=http://127.0.0.1:9900/txlog-eloqsql-mtr-test/txlog
 
 [cluster]
 tx_ip_port_list=127.0.0.1:8000,127.0.0.1:8010,127.0.0.1:8020
 
 [store]
+aws_access_key_id=XXXXXX
+aws_secret_key=XXXXXX
+
+eloq_dss_config_file_path=
 eloq_dss_peer_node=127.0.0.1:9100
-aws_secret_key=XXXXXXXXXX
-aws_access_key_id=XXXXXXXXXXXXXXXXXXXXX
\ No newline at end of file
diff --git a/storage/eloq/mysql-test/mono_multi/data_substrate2.cnf b/storage/eloq/mysql-test/mono_multi/data_substrate2.cnf
index 584e80c5e8e..48972faf362 100644
--- a/storage/eloq/mysql-test/mono_multi/data_substrate2.cnf
+++ b/storage/eloq/mysql-test/mono_multi/data_substrate2.cnf
@@ -5,15 +5,15 @@ txlog_rocksdb_scan_threads=3
 hm_bin_path=../../../../data_substrate/host_manager
 tx_ip=127.0.0.1
 tx_port=8010
-txlog_rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
-txlog_rocksdb_cloud_bucket_name = eloqsql-mtr-test
-txlog_rocksdb_cloud_bucket_prefix = txlog-
-txlog_rocksdb_cloud_region = ap-northeast-1
+txlog_rocksdb_cloud_region=ap-northeast-1
+txlog_rocksdb_cloud_object_store_service_url=http://127.0.0.1:9900/txlog-eloqsql-mtr-test/txlog
 
 [cluster]
 tx_ip_port_list=127.0.0.1:8000,127.0.0.1:8010,127.0.0.1:8020
 
 [store]
+aws_access_key_id=XXXXXX
+aws_secret_key=XXXXXX
+
+eloq_dss_config_file_path=
 eloq_dss_peer_node=127.0.0.1:9100
-aws_secret_key=XXXXXXXXXX
-aws_access_key_id=XXXXXXXXXXXXXXXXXXXXX
\ No newline at end of file
diff --git a/storage/eloq/mysql-test/mono_multi/data_substrate3.cnf b/storage/eloq/mysql-test/mono_multi/data_substrate3.cnf
index c3651b9e08d..da20d7410e0 100644
--- a/storage/eloq/mysql-test/mono_multi/data_substrate3.cnf
+++ b/storage/eloq/mysql-test/mono_multi/data_substrate3.cnf
@@ -5,14 +5,15 @@ txlog_rocksdb_scan_threads=3
 hm_bin_path=../../../../data_substrate/host_manager
 tx_ip=127.0.0.1
 tx_port=8020
-txlog_rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
-txlog_rocksdb_cloud_bucket_name = eloqsql-mtr-test
-txlog_rocksdb_cloud_bucket_prefix = txlog-
-txlog_rocksdb_cloud_region = ap-northeast-1
+txlog_rocksdb_cloud_region=ap-northeast-1
+txlog_rocksdb_cloud_object_store_service_url=http://127.0.0.1:9900/txlog-eloqsql-mtr-test/txlog
 
 [cluster]
 tx_ip_port_list=127.0.0.1:8000,127.0.0.1:8010,127.0.0.1:8020
+
 [store]
+aws_access_key_id=XXXXXX
+aws_secret_key=XXXXXX
+
+eloq_dss_config_file_path=
 eloq_dss_peer_node=127.0.0.1:9100
-aws_secret_key=XXXXXXXXXX
-aws_access_key_id=XXXXXXXXXXXXXXXXXXXXX
\ No newline at end of file
diff --git a/storage/eloq/mysql-test/mono_multi/my.cnf b/storage/eloq/mysql-test/mono_multi/my.cnf
index f9954465798..2ba434c77dc 100644
--- a/storage/eloq/mysql-test/mono_multi/my.cnf
+++ b/storage/eloq/mysql-test/mono_multi/my.cnf
@@ -20,13 +20,13 @@ eloq_cc_protocol=OCC
 use_stat_tables=complementary
 
 [mysqld.1]
-eloq_config = @ENV.MYSQLTEST_VARDIR/../../../storage/eloq/mysql-test/mono_multi/data_substrate1.cnf
+eloq_config=@ENV.MYSQLTEST_VARDIR/../../../storage/eloq/mysql-test/mono_multi/data_substrate1.cnf
 
 [mysqld.2]
-eloq_config = @ENV.MYSQLTEST_VARDIR/../../../storage/eloq/mysql-test/mono_multi/data_substrate2.cnf
+eloq_config=@ENV.MYSQLTEST_VARDIR/../../../storage/eloq/mysql-test/mono_multi/data_substrate2.cnf
 
 [mysqld.3]
-eloq_config = @ENV.MYSQLTEST_VARDIR/../../../storage/eloq/mysql-test/mono_multi/data_substrate3.cnf
+eloq_config=@ENV.MYSQLTEST_VARDIR/../../../storage/eloq/mysql-test/mono_multi/data_substrate3.cnf
 
 [ENV]
 MONO_PORT_1=              @mysqld.1.port