Skip to content

Commit

Permalink
Revert to v3 for space (#203)
Browse files Browse the repository at this point in the history
1: action(flow): remove temp files
2: remove vector fold, we will use officail vector data type impl.
---------
Co-authored-by: shannon data ai <[email protected]>
  • Loading branch information
RingsC authored Jul 9, 2024
1 parent ae1b1ed commit ec46128
Show file tree
Hide file tree
Showing 18 changed files with 45 additions and 1,189 deletions.
10 changes: 6 additions & 4 deletions .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 All @@ -53,12 +54,13 @@ 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 /tmp/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: |
mkdir /home/ShannonBase && cd /home/ShannonBase
mkdir cmake_build && cd cmake_build
git config --global --add safe.directory /__w/ShannonBase/ShannonBase
git config --global --add safe.directory /home/ShannonBase/ShannonBase
git fetch --tags -f
cmake ../ \
-DWITH_BOOST=/usr/local/boost/include \
Expand All @@ -84,12 +86,12 @@ jobs:
sudo make install
- name: clean_up_shannonbase_build
run: |
sudo rm /__w/ShannonBase/ -rf
sudo rm /home/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 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)
28 changes: 7 additions & 21 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,6 +58,7 @@ jobs:
[ -s /tmp/.clang-format-diff ] && exit 1 || true
build:
needs: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -89,12 +74,13 @@ 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 /tmp/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: |
mkdir /home/ShannonBase && cd /home/ShannonBase
mkdir cmake_build && cd cmake_build
git config --global --add safe.directory /__w/ShannonBase/ShannonBase
git config --global --add safe.directory /home/ShannonBase
git fetch --tags -f
cmake ../ \
-DWITH_BOOST=/usr/local/boost/include \
Expand All @@ -120,12 +106,12 @@ jobs:
sudo make install
- name: clean_up_shannonbase_build
run: |
sudo rm /__w/ShannonBase/ -rf
sudo rm /home/ShannonBase/ -rf
- name: run_mtr_test
run: |
mkdir -p /home/shannon-bin/log
sudo mkdir -p /home/shannon-bin/log
sudo chown -R $USER:$USER /home/shannon-bin/
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)
10 changes: 6 additions & 4 deletions .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 All @@ -54,12 +55,13 @@ 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 /tmp/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: |
mkdir /home/ShannonBase && cd /home/ShannonBase
mkdir cmake_build && cd cmake_build
git config --global --add safe.directory /__w/ShannonBase/ShannonBase
git config --global --add safe.directory /home/ShannonBase/ShannonBase
git fetch --tags -f
cmake ../ \
-DWITH_BOOST=/usr/local/boost/include \
Expand All @@ -85,12 +87,12 @@ jobs:
sudo make install
- name: clean_up_shannonbase_build
run: |
sudo rm /__w/ShannonBase/ -rf
sudo rm /home/ShannonBase/ -rf && cd .. && sudo rm ./cmake_build -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 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 ec46128

Please sign in to comment.