Refactor repo structure:

CMakeLists.txt

@@ -550,7 +550,8 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 
-INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme)
+# INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme)
+INSTALL_DOCUMENTATION(README.md COPYING THIRDPARTY COMPONENT Readme)
 
 # MDEV-6526 these files are not installed anymore
 #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC

README.md

@@ -195,7 +195,7 @@ sudo ${INSTALL_DIR}/bin/mysql -u root -S /tmp/mysqld3316.sock
 ### 9. Run mtr test locally
 Shutdown EloqSQL before running mtr tests.
 
-#### 1. mono_basic and mono_main:
+#### 1. eloq_basic and eloq_main:
 Edit eloqsql/concourse/scripts/mtr_bootstrap.cnf with the following example settings:
 ```ini
 [mariadb]
@@ -234,7 +234,7 @@ eloq_dss_rocksdb_cloud_sst_file_cache_size = 20GB
 
 ```
 
-Run mono_basic and mono_main test
+Run eloq_basic and eloq_main test
 ```bash
 pkill -9 dss_server
 rm -rf dss_data
@@ -245,11 +245,11 @@ mc alias set ${minio_server_alias} http://127.0.0.1:9000 minioadmin minioadmin
 mc rb ${minio_server_alias}/dss-eloqsql-mtr-test --force
 mc rb ${minio_server_alias}/txlog-eloqsql-mtr-test --force
 
-build/mysql-test/mtr --clean-txlog-bucket-restart --suite=mono_basic,mono_main --testcase-timeout=30 --bootstrap-defaults-file=concourse/scripts/mtr_bootstrap.cnf
+build/mysql-test/mtr --clean-txlog-bucket-restart --suite=eloq_basic,eloq_main --testcase-timeout=30 --bootstrap-defaults-file=concourse/scripts/mtr_bootstrap.cnf
 
 ```
 
-#### 2. mono_multi:
+#### 2. eloq_multi:
 
 Edit eloqsql/concourse/scripts/mtr_multi_bootstrap.cnf with the following example settings:
 ```ini
@@ -267,7 +267,7 @@ eloq_dss_rocksdb_cloud_endpoint_url=http://127.0.0.1:9000
 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_peer_node=localhost:9100 # add this line for mono_multi
+eloq_dss_peer_node=localhost:9100 # add this line for eloq_multi
 
 ...
 
@@ -304,12 +304,12 @@ eloq_dss_rocksdb_cloud_endpoint_url=http://127.0.0.1:9000
 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_peer_node = localhost:9100 # add this line for mono_multi
+eloq_dss_peer_node = localhost:9100 # add this line for eloq_multi
 eloq_dss_rocksdb_cloud_sst_file_cache_size = 20GB
 
 ```
 
-Run mono_multi test
+Run eloq_multi test
 ```bash
 pkill -9 dss_server
 rm -rf dss_data
@@ -322,7 +322,7 @@ mc rb ${minio_server_alias}/txlog-eloqsql-mtr-test --force
 
 nohup ${INSTALL_DIR}/bin/dss_server --config=concourse/scripts/dss_server.ini &
 
-build/mysql-test/mtr --clean-txlog-bucket-restart --suite=mono_multi --bootstrap-defaults-file=concourse/scripts/mtr_multi_bootstrap.cnf
+build/mysql-test/mtr --clean-txlog-bucket-restart --suite=eloq_multi --bootstrap-defaults-file=concourse/scripts/mtr_multi_bootstrap.cnf
 
 ```
 

cmake/mysql_add_executable.cmake

@@ -120,4 +120,34 @@ FUNCTION (MYSQL_ADD_EXECUTABLE)
       INSTALL(PROGRAMS $<TARGET_FILE_DIR:${target}>/${link} DESTINATION ${ARG_DESTINATION} COMPONENT ${COMP})
     ENDIF()
   ENDIF()
+
+  # create ELOQSQL named "links"
+  GET_ELOQSQL_SYMLINK(${target} link)
+  IF(link)
+    IF(UNIX)
+      ADD_CUSTOM_COMMAND(TARGET ${target} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E create_symlink
+         ${target} ${link}
+        COMMENT "Creating ${link} link"
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
+      INSTALL(PROGRAMS
+         ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${link}
+         DESTINATION
+         ${ARG_DESTINATION}
+         COMPONENT ${COMP})
+    ELSE()
+      # Windows note:
+      # Here, hardlinks are used, because cmake can't install symlinks.
+      # In packages, there are won't be links, just copies.
+      SET(link ${link}.exe)
+      ADD_CUSTOM_COMMAND(TARGET ${target} POST_BUILD
+        COMMAND cmake -E remove -f ${link}
+        COMMAND mklink /H ${link} $<TARGET_FILE_NAME:${target}>
+        COMMENT "Creating ${link} link"
+        WORKING_DIRECTORY $<TARGET_FILE_DIR:${target}>)
+      INSTALL(PROGRAMS $<TARGET_FILE_DIR:${target}>/${link} DESTINATION ${ARG_DESTINATION} COMPONENT ${COMP})
+    ENDIF()
+  ENDIF()
+
+
 ENDFUNCTION()

cmake/symlinks.cmake

@@ -52,3 +52,30 @@ MACRO(GET_SYMLINK name out)
     list(GET MARIADB_SYMLINK_TOS ${_index} ${out})
   endif()
 ENDMACRO()
+
+
+if(COMMAND REGISTER_ELOQSQL_SYMLINK)
+  return()
+endif()
+
+macro(REGISTER_ELOQSQL_SYMLINK from to)
+  list(APPEND ELOQSQL_SYMLINK_FROMS ${from})
+  list(APPEND ELOQSQL_SYMLINK_TOS ${to})
+endmacro()
+
+REGISTER_ELOQSQL_SYMLINK("mariadbd" "eloqsql")
+REGISTER_ELOQSQL_SYMLINK("mariadb" "eloqsql-cli")
+REGISTER_ELOQSQL_SYMLINK("mariadbd-safe" "eloqsql-safe")
+REGISTER_ELOQSQL_SYMLINK("mariadbd-safe-helper" "eloqsql-safe-helper")
+REGISTER_ELOQSQL_SYMLINK("mariadb-install-db" "eloqsql-install-db")
+
+
+
+
+MACRO(GET_ELOQSQL_SYMLINK name out)
+  set(${out})
+  list(FIND ELOQSQL_SYMLINK_FROMS ${name} _index)
+  if (${_index} GREATER -1)
+    list(GET ELOQSQL_SYMLINK_TOS ${_index} ${out})
+  endif()
+ENDMACRO()

concourse/scripts/main.bash

@@ -211,8 +211,8 @@ mc rb minio_server/dss-${bucket_name} --force; \
 mc rb minio_server/txlog-${bucket_name} --force
 set -e
 
-echo "running mono_main,mono_basic"
-./mtr --suite=mono_main,mono_basic --testcase-timeout=30 --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap.cnf
+echo "running eloq_main,eloq_basic"
+./mtr --suite=eloq_main,eloq_basic --testcase-timeout=30 --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap.cnf
 
 # Clean up minio buckets
 echo "cleaning minio buckets"
@@ -235,8 +235,8 @@ echo "starting dss_server"
 nohup /home/$current_user/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 &
 sleep 5
 
-echo "running mono_multi"
-./mtr --suite=mono_multi --force --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap.cnf
+echo "running eloq_multi"
+./mtr --suite=eloq_multi --force --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap.cnf
 
 # Clean up minio bucket
 # If mtr test failed, it would not be run.

concourse/scripts/main.ent.bash

@@ -222,8 +222,8 @@ mc rb ${minio_server_alias}/dss-${bucket_name} --force; \
 mc rb ${minio_server_alias}/txlog-${bucket_name} --force
 set -e
 
-echo "running mono_main,mono_basic"
-./mtr --clean-txlog-bucket-restart --suite=mono_main,mono_basic --testcase-timeout=30 --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap.cnf
+echo "running eloq_main,eloq_basic"
+./mtr --clean-txlog-bucket-restart --suite=eloq_main,eloq_basic --testcase-timeout=30 --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap.cnf
 
 # Clean up minio buckets
 echo "cleaning minio buckets"
@@ -246,8 +246,8 @@ echo "starting dss_server"
 nohup /home/$current_user/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 &
 sleep 5
 
-echo "running mono_multi"
-./mtr --clean-txlog-bucket-restart --suite=mono_multi --force --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap.cnf
+echo "running eloq_multi"
+./mtr --clean-txlog-bucket-restart --suite=eloq_multi --force --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap.cnf
 
 # Clean up minio bucket
 # If mtr test failed, it would not be run.

concourse/scripts/pr.ent.bash

@@ -243,8 +243,8 @@ mc rb ${minio_server_alias}/dss-${bucket_name} --force; \
 mc rb ${minio_server_alias}/txlog-${bucket_name} --force
 set -e
 
-echo "running mono_main,mono_basic"
-./mtr --clean-txlog-bucket-restart --suite=mono_main,mono_basic --testcase-timeout=30 --bootstrap-defaults-file=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap.cnf
+echo "running eloq_main,eloq_basic"
+./mtr --clean-txlog-bucket-restart --suite=eloq_main,eloq_basic --testcase-timeout=30 --bootstrap-defaults-file=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap.cnf
 
 # Clean up minio buckets
 echo "cleaning minio buckets"
@@ -267,8 +267,8 @@ echo "starting dss_server"
 nohup /home/$current_user/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini > dss_server.log 2>&1 &
 sleep 5
 
-echo "running mono_multi"
-./mtr --suite=mono_multi --clean-txlog-bucket-restart --force --bootstrap-defaults-file=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_multi_bootstrap.cnf
+echo "running eloq_multi"
+./mtr --suite=eloq_multi --clean-txlog-bucket-restart --force --bootstrap-defaults-file=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_multi_bootstrap.cnf
 
 # Clean up minio bucket
 # If mtr test failed, it would not be run.

scripts/CMakeLists.txt

@@ -224,6 +224,7 @@ IF(UNIX AND NOT WITHOUT_SERVER)
     COMPONENT Server)
 
   INSTALL_LINK(mariadb-install-db mysql_install_db ${INSTALL_SCRIPTDIR} Server)
+  INSTALL_LINK(mariadb-install-db eloqsql-install-db ${INSTALL_SCRIPTDIR} Server)
 ENDIF()
 
 SET(prefix "${CMAKE_INSTALL_PREFIX}")