Skip to content

Commit

Permalink
1: action(flow): remove temp files
Browse files Browse the repository at this point in the history
2: remove vector fold, we will use officail vector data type impl.
  • Loading branch information
ShannonBase committed Jul 9, 2024
1 parent a21e4d3 commit 55c4d67
Show file tree
Hide file tree
Showing 18 changed files with 41 additions and 1,188 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
[ -s /tmp/.clang-format-diff ] && exit 1 || true
build:
needs: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -92,4 +93,4 @@ jobs:
cd /home/shannon-bin/mysql-test/
sudo chmod -R u+rwx mysql-test-run.pl
./mysql-test-run.pl --suite=main,innodb,binlog,binlog_gtid,binlog_nogtid,secondary_engine,rpl,rpl_gtid,rpl_nogtid \
--mysqld=--user=$USER --mysqld=--default-storage-engine=innodb --nowarnings --force --nocheck-testcases --retry=0 --parallel=10
--mysqld=--user=$USER --mysqld=--default-storage-engine=innodb --nowarnings --force --nocheck-testcases --retry=0 --parallel=$(nproc)
37 changes: 11 additions & 26 deletions .github/workflows/pull-requests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,6 @@ defaults:
shell: bash

jobs:
check-runner-spec:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Print disk space usage
run: |
echo "Root directory (/):"
df -h /
echo "Home directory (/home/runner):"
df -h /home/runner
echo "Work directory (/home/runner/work):"
df -h /home/runner/work
echo "Temp directory (/tmp):"
df -h /tmp
lint:
name: lint
# if: ${{ contains(github.event.pull_request.labels.*.name, 'ready-for-testing') && github.event.pull_request.merged != true }}
Expand All @@ -74,7 +58,8 @@ jobs:
[ -s /tmp/.clang-format-diff ] && exit 1 || true
build:
runs-on: ubuntu-latest
needs: lint
runs-on: self-hosted
steps:
- uses: actions/checkout@v4
- name: install_lib
Expand All @@ -89,7 +74,7 @@ jobs:
run: |
cd /tmp && wget https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.gz && \
tar zxvf boost_1_77_0.tar.gz && cd boost_1_77_0 && ./bootstrap.sh --prefix=/usr/local/boost && ./b2 -j$(nproc) && sudo ./b2 install && \
sudo rm ../boost_1_77_0 -rf
sudo rm ../boost_1_77_0 -rf && sudo rm /tmp/boost_1_77_0.tar.gz
#sed -i '61s/^/#/' cmake_install.cmake to disable can not find openssl_executeable error. removes it when it fixed.
- name: build_shannon_and_install
run: |
Expand All @@ -99,10 +84,10 @@ jobs:
cmake ../ \
-DWITH_BOOST=/usr/local/boost/include \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/home/shannon-bin/ \
-DMYSQL_DATADIR=/home/shannon-bin/ \
-DSYSCONFDIR=/home/shannon-bin/ \
-DMYSQL_UNIX_ADDR=/home/shannon-bin/temp/mysql.sock \
-DCMAKE_INSTALL_PREFIX=/__w/shannon-bin/ \
-DMYSQL_DATADIR=/__w/shannon-bin/ \
-DSYSCONFDIR=/__w/shannon-bin/ \
-DMYSQL_UNIX_ADDR=/__w/shannon-bin/temp/mysql.sock \
-DWITH_EMBEDDED_SERVER=OFF \
-DWITH_MYISAM_STORAGE_ENGINE=1 \
-DWITH_INNOBASE_STORAGE_ENGINE=1 \
Expand All @@ -123,9 +108,9 @@ jobs:
sudo rm /__w/ShannonBase/ -rf
- name: run_mtr_test
run: |
mkdir -p /home/shannon-bin/log
sudo chown -R $USER:$USER /home/shannon-bin/
cd /home/shannon-bin/mysql-test/
sudo mkdir -p /__w/shannon-bin/log
sudo chown -R $USER:$USER /__w/shannon-bin/
cd /__w/shannon-bin/mysql-test/
sudo chmod -R u+rwx mysql-test-run.pl
./mysql-test-run.pl --suite=main,innodb,binlog,binlog_gtid,binlog_nogtid,secondary_engine,rpl,rpl_gtid,rpl_nogtid \
--mysqld=--user=$USER --mysqld=--default-storage-engine=innodb --nowarnings --force --nocheck-testcases --retry=0 --parallel=10
--mysqld=--user=$USER --mysqld=--default-storage-engine=innodb --nowarnings --force --nocheck-testcases --retry=0 --parallel=$(nproc)
3 changes: 2 additions & 1 deletion .github/workflows/weekly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
[ -s /tmp/.clang-format-diff ] && exit 1 || true
build:
needs: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -93,4 +94,4 @@ jobs:
cd /home/shannon-bin/mysql-test/
sudo chmod -R u+rwx mysql-test-run.pl
./mysql-test-run.pl --big-test --mysqld=--user=$USER --mysqld=--default-storage-engine=innodb --nowarnings --force \
--nocheck-testcases --retry=0 --parallel=10
--nocheck-testcases --retry=0 --parallel=$(nproc)
13 changes: 1 addition & 12 deletions sql/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -348,13 +348,6 @@ SET(SQL_GIS_SOURCES
item_geofunc_relchecks.cc
options_parser.cc
)
SET(SQL_VECTOR_SOURCES
vector/vector.cpp
vector/bitvector.cpp
vector/vector_comm.cpp
vector/bitvector.cpp
vector/halfutils.cpp
)

SET(SQL_SHARED_SOURCES
auth/auth_acls.cc
Expand Down Expand Up @@ -1010,10 +1003,6 @@ TARGET_INCLUDE_DIRECTORIES(sql_ml PUBLIC
TARGET_LINK_LIBRARIES(sql_ml _lightgbm)
SET_TARGET_PROPERTIES(sql_ml PROPERTIES LINK_INTERFACE_MULTIPLICITY 3)

ADD_LIBRARY(sql_vector STATIC ${SQL_VECTOR_SOURCES})
TARGET_LINK_LIBRARIES(sql_vector sql_dd sql_main)
SET_TARGET_PROPERTIES(sql_vector PROPERTIES LINK_INTERFACE_MULTIPLICITY 3)

#
# On Windows platform we compile in the client-side Windows Native Authentication
# plugin which is used by the client connection code included in the server.
Expand Down Expand Up @@ -1279,7 +1268,7 @@ ENDIF()
SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE)
TARGET_LINK_LIBRARIES(mysqld
sql_main sql_gis binlog rpl rpl_source rpl_replica sql_dd mysys
minchassis binlogevents_static sql_ml sql_vector ext::icu)
minchassis binlogevents_static sql_ml ext::icu)

# Add dependency on ldap library, to ensure it is not unloaded
# when we shutdown the authentication plugin.
Expand Down
7 changes: 4 additions & 3 deletions sql/sql_union.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1789,13 +1789,14 @@ bool Query_expression::ExecuteIteratorQuery(THD *thd) {
else if (thd->killed) // Aborted by user
{
thd->send_kill_message();
return true;
execute_error = true;
}

if (execute_error) break;
++*send_records_ptr;

if (query_result->send_data(thd, *fields)) {
return true;
execute_error = true;
break;
}
thd->get_stmt_da()->inc_current_row_for_condition();
}
Expand Down
88 changes: 0 additions & 88 deletions sql/vector/bitvector.cpp

This file was deleted.

50 changes: 0 additions & 50 deletions sql/vector/bitvector.h

This file was deleted.

Loading

0 comments on commit 55c4d67

Please sign in to comment.