Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(tianmu): merge to Stonedb 5.7 stable #1915

Merged
merged 124 commits into from
Jun 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
0a2f9be
docs(downlaod):update the docs of download(#1453)
Nliver Mar 20, 2023
dd8247b
fix(mtr):Resolve the nightly run error problem(#1458)
konghaiya Mar 21, 2023
e06793e
fix(workflow): fix can not run lcov in workflow
RingsC Mar 16, 2023
4193cf6
feat(tianmu):New configuration parameters: "tianmu_mandatory" and "ti…
konghaiya Mar 22, 2023
3dcc3fd
feat(tianmu):Discard "MANDATORY_TIANMU" and "NO_KEY_ERROR" in (sql_mode)
konghaiya Mar 22, 2023
ef58f6c
feat(tianmu):Resolve the issue of warning messages when setting new p…
konghaiya Mar 22, 2023
05db04d
fix(tianmu):(Primary/Secondary)Error 1032 occasionally occurs during …
konghaiya Mar 22, 2023
1fa5661
test(mtr): add integer/unsigned/in subquery/create temporary testcase…
davidshiz Mar 23, 2023
fd653e1
docs(v1.0.3): update the docs for v1.0.3
Nliver Mar 30, 2023
37beb82
fix(dcoker): FixDocker deployment commands(#1499)
Nliver Mar 30, 2023
45874be
feat: add Baidu statistics script(#1498)
Nliver Mar 30, 2023
d29544b
fix(website): fix Baidu statistics script(#1502)
Nliver Mar 30, 2023
9c87c73
test(mtr): Optimize parallel scheduling to execute more innodb engine…
davidshiz Mar 30, 2023
4bd09ac
fix crash when the aggregated element was decimal (#1402)
adofsauron Mar 31, 2023
ee41be0
build(deps): bump nth-check and unist-util-select in /website
dependabot[bot] Mar 31, 2023
b90030f
docs(deploy): Update the document and fix the link
Nliver Mar 31, 2023
3ac5796
update the copyright
Nliver Mar 31, 2023
e7de186
update the readme(#1324)
Nliver Mar 31, 2023
a4c5f7c
Create FUNDING.yml
stoneatomadmin Apr 3, 2023
7484c58
Update FUNDING.yml
stoneatomadmin Apr 3, 2023
e7bbe88
remove dup lines in git workflow
zzzz-vincent Apr 5, 2023
82b249a
feat(tianmu): mv func from public to protected(#1501)
zzzz-vincent Apr 4, 2023
7b03c28
style change
zzzz-vincent Apr 4, 2023
e049e3b
strip spaces
zzzz-vincent Apr 4, 2023
1675216
remove dup lines
zzzz-vincent Apr 4, 2023
59e9174
change to uint
zzzz-vincent Apr 4, 2023
d49df15
fix(tianmu):Resolve DDL and insert inot select Possible space inflati…
konghaiya Mar 20, 2023
1de9a91
feat(tianmu):Reconstruct direct insert into parallel execution, impro…
konghaiya Mar 28, 2023
bcc42ad
feat(tianmu):Add code comments for easy understanding
konghaiya Mar 28, 2023
9d45726
fix(tianmu):The myloader cann't work if the autocommit is closed. (#1…
konghaiya Apr 4, 2023
03f5df2
fix(core): fix bug: The instance occasionally crashes if both fields …
wisehead Apr 4, 2023
65e7c25
fix: page hover font style
Agility6 Apr 7, 2023
166f87a
feat(mtr): To fix the mtr usage
RingsC Apr 10, 2023
56cd1f3
fix(tianmu):The mysqld is crashed when you are starting replication.(…
konghaiya Apr 4, 2023
44d6ff8
feat(tianmu):Add delta layer mtr
konghaiya Apr 11, 2023
758bce8
bug 1538:The instance occasionally crashes when the parallel degree i…
wisehead Apr 10, 2023
8146e9b
feat(tianmu): To support vocalno framwork
RingsC Apr 10, 2023
16d2c01
docs(quickstart): add stonedb-8.0 compiling guide #1449
Double0101 Apr 3, 2023
8a4b65b
fix(website): fix website error #1449
Double0101 Apr 11, 2023
d0665f9
feat(tianmu): support volcano framewrok (#1546)
RingsC Apr 12, 2023
8e197ae
fix(tianmu): revert code, mv ret value from try block back to catch b…
Dysprosium0626 Apr 13, 2023
45e75ee
feat(tiamnu): hard code in defs.h (#1481)
zzzz-vincent Apr 6, 2023
f8cf62b
docs:update the compile guides #1562
Apr 14, 2023
09f0e40
test(mtr): add more innodb testcases and tianmu range testcase(#1196)
davidshiz Apr 16, 2023
99c5e80
fix(tianmu):Remove excess log printing and add some code comments(#1545)
konghaiya Apr 11, 2023
4b7c64b
fix(tianmu): fix mysqld crash when exec query with AggregateRough, as…
adofsauron Apr 19, 2023
e510ad3
fix(website): fix the download link of 5.7(#1518)
Nliver Apr 19, 2023
f79002e
feat(website): update the latest content(#1587)
Nliver Apr 19, 2023
6e56cef
feat(tianmu): support volcano framework (#1554)
RingsC Apr 19, 2023
875be6f
fix: max-width navbar search style
Agility6 Apr 20, 2023
c8c37fd
feat(website): upgrade the docusaurus version(#1604)
Nliver Apr 20, 2023
6b56366
fix(website): fix Roadmap module location(#1597)
Nliver Apr 20, 2023
2f6ae10
website(community): update the content
Nliver Apr 20, 2023
ba8cead
feat(website): update the logo of XinChuang(#1590)
Nliver Apr 20, 2023
0b1c15a
fix(tianmu):The instance occasionally crashes when the memory leak. (…
konghaiya Apr 17, 2023
feb4b53
fix(tianmu):Modify merge_ The assignment method of ID, delaying the a…
konghaiya Apr 18, 2023
6703037
fix(tianmu):Fix bug in delta layer initialization
konghaiya Apr 18, 2023
2e4dbdc
fix(tianmu):Resolve the issue of assertion failure caused by memory a…
konghaiya Apr 19, 2023
31919be
fix(tianmu):Code format adjustment
konghaiya Apr 20, 2023
561f653
fix(website): fix the wrong QR code(#1624)
Nliver Apr 26, 2023
29000c9
feat(tianmu):Add delta layer information output and table name output
konghaiya Apr 26, 2023
32cb03c
fix(tianmu):Perfect atomic operations for delta_table
konghaiya Apr 26, 2023
cc8a96b
feat(tianmu):Optimize delta layer merge operations to remove useless …
konghaiya Apr 26, 2023
f1a7259
fix(tianmu):assert failed on ptr == buff.get() + data_.sum_len at pac…
konghaiya Apr 26, 2023
4a41514
fix(tianmu):assert failed on oldv <= dpn_->max_i at pack_int.cpp:337 …
konghaiya Apr 26, 2023
70f15f1
feat(tianmu):Increase assertion printing information and optimize cod…
konghaiya Apr 26, 2023
587d276
fix(tianmu): fix mysqld crash when query where JOIN::propagate_de…
adofsauron Apr 27, 2023
4a35d96
fix(tianmu): fix MySQL server has gone away when exec query (#164…
adofsauron Apr 28, 2023
57e3497
fix(tianmu):Support insert ignore syntax (#1637)
konghaiya Apr 28, 2023
1ba5663
fix(tianmu): fix query input variables wrong result (#1647)
adofsauron May 5, 2023
70bdb91
fix(tianmu): fix result of the query using the subquery derived t…
adofsauron May 6, 2023
b728610
fix(tianmu): fix results of two queries using a derived table and…
adofsauron May 6, 2023
c95d263
feat(tianmu): Test cases that supplement custom variables (#1703)
adofsauron May 6, 2023
2daac7c
fix(tianmu): fix mysqld crash when assigning return values using …
adofsauron May 8, 2023
74b5b05
fix(tianmu): Insert ignore can insert duplicate values.(#1699)
konghaiya May 8, 2023
a33ba87
fix(tianmu): fix error occurred in the union all query result (#1…
adofsauron May 8, 2023
6ed8fb1
remove unused code block
zzzz-vincent May 1, 2023
8d438e1
fix bug and change test case exptected result
zzzz-vincent May 7, 2023
b16bfaa
add stonedb-8.0 compiling guide for CentOS 7.x
Xinqiangxu May 9, 2023
c4d2d2f
docs(quickstart): add stonedb-8.0 compiling guide(Chinese) for CentOS…
Xinqiangxu May 10, 2023
304df8e
fix(tianmu):Even if a primary key is defined, duplicate data may be i…
konghaiya May 10, 2023
2c96b13
add delete/drop into tianmu log stat
duanjr May 8, 2023
d9b4126
open log for all cmds
duanjr May 9, 2023
141918d
fit format
duanjr May 10, 2023
c3931fe
fix(tianmu): fix Error result set of the IN subquery with semi jo…
adofsauron May 11, 2023
65585be
doc(develop-guide): modify method for complie stonedb using docker
Dysprosium0626 May 10, 2023
20abfc7
docs:add docker compile guide of stonedb8.0.(#1780)
May 16, 2023
9b50843
feature: remove DBUG_OFF and repalce DEBUG_ASSERT with assert
duanjr May 8, 2023
72a160c
automatically formatting
duanjr May 9, 2023
9805e07
fix: fix storage of DT type
duanjr May 9, 2023
6c11356
fix incorrect result of TIME type by distinguishing the processing of…
duanjr May 11, 2023
69a49bd
fix(tinmu): fix tianmu crash when set varchar to num when order by
May 19, 2023
d99c9d5
docs(website): update the documentation for Compile StoneDB 8.0 in Do…
davidshiz May 25, 2023
2579bd4
fix(tianmu): fix up the incompatible type
RingsC May 25, 2023
0b853cd
fix(tianmu): Fix up the unknown exception after instance killed rando…
RingsC May 31, 2023
e28183b
fix(tianmu): fix up the incorrect meta-info leads unexpected behavior…
RingsC May 31, 2023
988cf1d
fix(workflow): nightly build failed #1830
hustjieke May 29, 2023
6cba6d7
feat(tianmu): revert assert() --> debug_assert() #1551
hustjieke May 31, 2023
1f43e44
feat(tianmu): fixup the default delimeter for load data (#1843)
RingsC May 31, 2023
12fa952
fix(tianmu): revert PR #1841. (#1850)
RingsC Jun 3, 2023
1b51907
fix(tianmu): fix up mtr test case for delim of load data command (#1854)
RingsC Jun 5, 2023
bde212a
fix(tianmu): fix up the `group_concat` function in tianmu (#1852)
RingsC Jun 6, 2023
1a7fe0f
fix(tianmu): To fixup the instance crashed if the result of aggregate…
RingsC Jun 6, 2023
9404338
docs(developer-guide): update the compiling guide of stonedb 8.0 for …
Xinqiangxu May 26, 2023
6b369e5
fix(tianmu): Fixup the mem leakage of aggregation function
RingsC Jun 8, 2023
f180323
fix(tianmu): fix UNION of non-matching columns (column no 0)
adofsauron Jun 14, 2023
798ca7a
test(tianmu): add order by sentence in the mtr case various_join.test
Xinqiangxu Jun 15, 2023
288262f
test(mtr): add more test cases for tianmu(#1196)
davidshiz Jun 15, 2023
c990b5f
test(mtr): add order by sentence in the mtr case various_join.test
Xinqiangxu Jun 16, 2023
9939611
ci(codecov): update the config
Nliver Jun 20, 2023
d7584f1
fix(tianmu): To suuport ignore option for update statement
RingsC Jun 14, 2023
5606c87
ci(codecov): update the codecov congfig
Nliver Jun 20, 2023
105b730
docs(intro): update the support for 8.0
Nliver Jun 20, 2023
186f694
wokflow(codecov): Filter out excess code files
Nliver Jun 25, 2023
7d03695
workflow(coverage): Update the lcov running logic
Nliver Jun 26, 2023
73dcfec
fix(tianmu): default value of the field take unaffect in load #1865
Double0101 Jun 19, 2023
a4600c4
fix(tianmu): To support union(all) the statement which is without fro…
RingsC Jun 15, 2023
6a560a0
fix(tianmu): To remove unnessary optimization in tianmu
RingsC Jun 27, 2023
60a8cf7
fix(tianmu): hotfix corruption in ValueOrNull under multi-thread
RingsC Jun 9, 2023
6349898
fix(tianmu): incorrect result when using where expr and args > bigint…
hustjieke Jun 9, 2023
34b73a1
fix(tianmu): add TIME_to_ulonglong_time_round process and fix up prec…
Xinqiangxu Jun 19, 2023
deb0600
fix(tianmu): fix format using clang-format #792
hustjieke Oct 24, 2022
25b767b
feat: rm files after rebase leftover #1217
hustjieke Jan 14, 2023
422bd73
Merge branch 'stonedb-5.7-stable' of github.com:RingsC/stonedb into HEAD
RingsC Jun 29, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 13 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: stonedb
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
39 changes: 19 additions & 20 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ jobs:
-DDOWNLOAD_BOOST=0 \
-DWITH_BOOST=/usr/local/stonedb-boost/ \
-DDOWNLOAD_ROCKSDB=0 \
-DWITH_ROCKSDB=/usr/local/stonedb-gcc-rocksdb/ \
-DWITH_MARISA=/usr/local/stonedb-marisa/ \
-DDOWNLOAD_ROCKSDB=0 \
-DWITH_ROCKSDB=/usr/local/stonedb-gcc-rocksdb && make -j`nproc` && make -j`nproc` install

tar -zcPvf ../pkg_outdir/stonedb57_nightly-`date +%y%m%d%H%M`.tar.gz /stonedb57/
Expand All @@ -68,21 +66,22 @@ jobs:
cd /stonedb57/install/mysql-test
./mysql-test-run.pl --suite=tianmu --nowarnings --force --nocheck-testcases --retry=0

- name: output some vars
id: vars
env:
SHA_EXT: sha256sum.txt
run: |
find pkg_outdir -type f \( -iname \*.deb -o -iname \*.rpm -o -iname \*.tar.gz \) -exec bash -c "sha256sum {} > {}.sha256sum.txt" \;
subdir=$(date -u +%Y.%m.%d)
echo "::set-output name=subdir::$subdir"

- name: copy file via ssh password
uses: appleboy/scp-action@master
with:
host: ${{ secrets.FILE_SERVER_HOST }}
username: ${{ secrets.FILE_SERVER_USERNAME }}
password: ${{ secrets.FILE_SERVER_PASSWORD }}
port: ${{ secrets.FILE_SERVER_PORT }}
source: "pkg_outdir/*"
target: "${{ secrets.FILE_SERVER_DIR }}"
# TODO(): physical machine has been removed, we restart this funcion again in the future.
#- name: output some vars
# id: vars
# env:
# SHA_EXT: sha256sum.txt
# run: |
# find pkg_outdir -type f \( -iname \*.deb -o -iname \*.rpm -o -iname \*.tar.gz \) -exec bash -c "sha256sum {} > {}.sha256sum.txt" \;
# subdir=$(date -u +%Y.%m.%d)
# echo "::set-output name=subdir::$subdir"
#
#- name: copy file via ssh password
# uses: appleboy/scp-action@master
# with:
# host: ${{ secrets.FILE_SERVER_HOST }}
# username: ${{ secrets.FILE_SERVER_USERNAME }}
# password: ${{ secrets.FILE_SERVER_PASSWORD }}
# port: ${{ secrets.FILE_SERVER_PORT }}
# source: "pkg_outdir/*"
# target: "${{ secrets.FILE_SERVER_DIR }}"
24 changes: 12 additions & 12 deletions .github/workflows/pull_requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,21 +82,21 @@ jobs:
image: stoneatom/stonedb_buildenv:${{ matrix.os }}
steps:
- uses: actions/checkout@v3
with:
ssh-strict: 'false'
- name: compile stonedb
id: compile
run: |
- run: |
case ${{ matrix.os }} in
debian10_1.0.3)
apt-get update && apt-get install curl lcov bc libssl-dev -y
apt-get --allow-releaseinfo-change update && apt-get install curl lcov bc libssl-dev -y
;;
centos7_1.0.3)
yum install curl lcov.noarch bc.x86_64 -y
rm -rf /usr/bin/gcc && ln -s /opt/rh/devtoolset-9/root/bin/gcc /usr/bin/gcc
;;
esac

#with:
# ssh-strict: 'false'
- name: compile stonedb
id: compile
run: |
mkdir build && cd build
git config --global --add safe.directory /__w/stonedb/stonedb
git fetch --tags
Expand All @@ -119,9 +119,7 @@ jobs:
-DDOWNLOAD_BOOST=0 \
-DWITH_BOOST=/usr/local/stonedb-boost/ \
-DDOWNLOAD_ROCKSDB=0 \
-DWITH_ROCKSDB=/usr/local/stonedb-gcc-rocksdb/ \
-DWITH_MARISA=/usr/local/stonedb-marisa/ \
-DDOWNLOAD_ROCKSDB=0 \
-DWITH_ROCKSDB=/usr/local/stonedb-gcc-rocksdb -DENABLE_GCOV=1 && make -j`nproc` && make -j`nproc` install

- name: mtr test
Expand All @@ -130,13 +128,15 @@ jobs:
groupadd mysql && useradd -g mysql mysql
chown -R mysql:mysql /stonedb57 && chown -R mysql:mysql ./build
cd /stonedb57/install/mysql-test
./mysql-test-run.pl --suite=innodb --nowarnings --force --nocheck-testcases --retry=0 --defaults-file=/stonedb57/install/mysql-test/suite/innodb/include/my_innodb.cnf --do-test-list=/stonedb57/install/mysql-test/suite/innodb/include/innodb_testlist
./mysql-test-run.pl --suite=innodb,main --mysqld=--default-storage-engine=innodb --nowarnings --force --nocheck-testcases --retry=0 --do-test-list=./suite/innodb/include/innodb_testlist --parallel=15
./mysql-test-run.pl --suite=tianmu --nowarnings --force --nocheck-testcases --retry=0 --parallel=10

- name: create coverage.info
run: |
cat codecov.yml | curl --data-binary @- https://codecov.io/validate
cd build
lcov --capture --directory . --output-file coverage.info --test-name coverage
lcov --capture --directory . --output-file coverage.info --test-name coverage

- name: Codecov
uses: codecov/[email protected]
uses: codecov/[email protected]

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Check if  `git` has been installed. If not, install it first.
1. Issue report: Open a regular [StoneDB issue](https://github.com/stoneatom/stonedb/issues/new/choose) to bind your pull request.<br />For more details about creating github issue concepts, see: [create an github issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/creating-an-issue)
2. Fork [StoneDB repo](https://github.com/stoneatom/stonedb) to your own account.
3. After add you own code, add unit test
4. Do *make mtr test*
4. Do *make mtr test* [How to add mtr test](https://stonedb.io/docs/getting-started/quick-add-mtr-test/)
5. After all test passed, use *clang-format* to formate your code according to [google c++ styleguide](https://google.github.io/styleguide/cppguide.html)
6. Submit a [Draft Pull Requests](https://github.blog/2019-02-14-introducing-draft-pull-requests/) and  [write your PR description](https://github.com/stoneatom/stonedb/blob/stonedb-5.7/.github/pull_request_template.md)<br />For more details about pr concepts, see [creating-a-pull-request-from-a-fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork)<br />For more detail about draft pr concepts,  see [draft-pull-request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests)
7. After all CI tests are passed, change the status to “Ready for review”.
Expand Down
103 changes: 103 additions & 0 deletions Docs/02-getting-started/quick-add-mtr-test.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
---
id: quick-add-mtr-test
sidebar_position: 3.6
---

# Qucik Add MTR Test

## Add and Run a MTR test

When you contribute your code into StoneDB, test your code in the meantime.

Test cases are in the path \${StoneDB-Source-DIR}/mysql-test/suite/tianmu/.

:::info
`${StoneDB-Source-DIR}` is your StoneDB source code directory.

`${TEST-PATH}=${StoneDB-Source-DIR}/mysql-test/suite/tianmu/` in the following context.
:::

### Step 1. Write your test file and result file

Put your test file in the `${TEST-PATH}/t/` and result file in the `${TEST-PATH}/r/`.

You can write your test cases like this.

issue736.test
```sql
--source include/have_tianmu.inc
use test;
CREATE TABLE t1(col1 INT, col2 CHAR(5))ENGINE=tianmu;
INSERT INTO t1 VALUES(NULL,''),(1,'a'),(1,'b'),(1,'c'),(2,'dd'),(3,'eee');
INSERT INTO t1 VALUES(8,UNHEX('CEB2'));
SELECT COUNT(DISTINCT col2) FROM t1;
SELECT COUNT(DISTINCT col1) FROM t1;
DROP TABLE t1;
```

Issue736.result
```sql
use test;
CREATE TABLE t1(col1 INT, col2 CHAR(5))ENGINE=tianmu;
INSERT INTO t1 VALUES(NULL,''),(1,'a'),(1,'b'),(1,'c'),(2,'dd'),(3,'eee');
INSERT INTO t1 VALUES(8,UNHEX('CEB2'));
SELECT COUNT(DISTINCT col2) FROM t1;
COUNT(DISTINCT col2)
7
SELECT COUNT(DISTINCT col1) FROM t1;
COUNT(DISTINCT col1)
4
DROP TABLE t1;

```

### Step 2. Compile your StoneDB.

In this example, I compile my StoneDB in `${StoneDB-Source-DIR}/build/mysql8/` and install in `${StoneDB-Source-DIR}/build/install8/`

```shell
cd stonedb/build
mkdir mysql8 install8
# build your stonedb
.........
```

### Step 3. Run your test.

After installation, test cases will be moved into your installation directory.In this example, the path is `${StoneDB-Source-DIR}/build/install8/mysql-test`

``` shell
cd install8/mysql-test
# run your test case. issue736 is my testcase.
# run one case.
./mtr --suite=tianmu testcase
# run all cases.
./mysql-test-run.pl --suite=tianmu --nowarnings --force --nocheck-testcases --parallel=10

### Execute the test in this example.
root@htap-dev-64-2:/stonedb/build/install8/mysql-test# ./mtr --suite=tianmu issue736
Logging: ./mtr --suite=tianmu issue736
MySQL Version 8.0.30
Checking supported features
- Binaries are debug compiled
Collecting tests
Checking leftover processes
Removing old var directory
Creating var directory '/stonedb/build/install8/mysql-test/var'
Installing system database
Using parallel: 1

==============================================================================
TEST NAME RESULT TIME (ms) COMMENT
------------------------------------------------------------------------------
worker[1] mysql-test-run: WARNING: running this script as _root_ will cause some tests to be skipped
[ 50%] tianmu.issue736 [ pass ] 78
[100%] shutdown_report [ pass ]
------------------------------------------------------------------------------
The servers were restarted 0 times
The servers were reinitialized 0 times
Spent 0.078 of 35 seconds executing testcases

Completed: All 2 tests were successful.

```
24 changes: 15 additions & 9 deletions Docs/02-getting-started/quick-deploy-in-docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,30 @@ sidebar_position: 3.2

# Quick Deployment in a Docker Container
## Prerequisites
The image of StoneDB is downloaded from Docker Hub.

The image of StoneDB is downloaded from Docker Hub. You can read the Dockerhub documentation, which must be up to date.
[Docker Hub](https://hub.docker.com/r/stoneatom/stonedb)

## Procedure
The username and password for login are **root** and **stonedb123**.
The username and password for login are **root**. The **password** is customized by yourself.

Make sure your CPU supports AVX

```bash
cat /proc/cpuinfo |grep avx
```
### 1. Pull the image
Run the following command:
```bash
docker pull stoneatom/stonedb:v1.0.2
docker pull stoneatom/stonedb:v1.0.3
```
### 2. Run the image
Run the following command:
```bash
docker run -p 13306:3306 -v $stonedb_volumn_dir/data/:/stonedb56/install/data/ -it -d stoneatom/stonedb:v0.1 /bin/bash
docker run -p 3306:3306 -itd -v $YOU_DATA_DIR:/opt -e MYSQL_ROOT_PASSWORD='$YOU_PASSWORD' stoneatom/stonedb:v1.0.3
```
Altenatively, run the following command:
```bash
docker run -p 13306:3306 -it -d stoneatom/stonedb:v0.1 /bin/bash
docker run -p 3306:3306 -itd -e MYSQL_ROOT_PASSWORD='$YOU_PASSWORD' stoneatom/stonedb:v1.0.3
```
Parameter description:

Expand All @@ -32,16 +37,17 @@ Parameter description:
- **-i**: the interaction.
- **-t**: the terminal.
- **-d**: Do not enter the container upon startup. If you want to enter the container upon startup, run the docker exec command.
### **3. Log in to StoneDB in the container**
### 3. Log in to StoneDB in the container
```bash
# Obtain the Docker container ID.
docker ps
# Use the "cocker ps" command to obtain the container ID and enter the Docker container.
docker exec -it <Container ID> bash
<Container ID>$ /stonedb56/install/bin/mysql -uroot -pstonedb123

<Container ID>$ /opt/stonedb57/install/bin/mysql -uroot -p$YOU_PASSWORD
```
### **4. Log in to StoneDB using a third-party tool**
You can log in to StoneDB by using third-party tools such as mysql, Navicat, and DBeaver. The following code uses mysql as an example.
```shell
mysql -h<Host IP address> -uroot -pstonedb123 -P<Mapped port of the host>
mysql -h<Host IP address> -uroot -p$YOU_PASSWORD -P<Mapped port of the host>
```
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ sidebar_position: 3.14
## Step 1. Install StoneDB
1. Download the StoneDB software package.
```sql
wget https://github.com/stoneatom/stonedb/releases/download/5.7-v1.0.2-GA/stonedb-ce-5.7_v1.0.2.ubuntu.amd64.deb
wget https://github.com/stoneatom/stonedb/releases/download/5.7-v1.0.3-GA/stonedb-ce-5.7_v1.0.3.ubuntu.amd64.deb
```

2. Use the DPKG command to install the DEB package.
```sql
dpkg -i stonedb-ce-5.7_v1.0.2.ubuntu.amd64.deb
dpkg -i stonedb-ce-5.7_v1.0.3.ubuntu.amd64.deb
```
:::info
If this step fails, run `ldd /opt/stonedb57/install/bin/mysqld | grep 'not found'` to check whether any dependent libraries are missing. If yes, run `source /opt/stonedb57/install/bin/sourceenv` and then retry this step.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ sidebar_position: 3.12

# Quick Deploy StoneDB-5.7
## 1. Download the installation package
Click [here](https://static.stoneatom.com/custom/stonedb-ce-5.7-v1.0.3.el7.x86_64.tar.gz) to download the latest installation package of StoneDB.

Click [Github](https://github.com/stoneatom/stonedb/releases/download/5.7-v1.0.3-GA/stonedb-ce-5.7-v1.0.3.el7.x86_64.tar.gz) or [Gitee](https://gitee.com/StoneDB/stonedb/releases/download/5.7-v1.0.3-GA/stonedb-ce-5.7-v1.0.3.el7.x86_64.tar.gz) to download the latest installation package of StoneDB.


:::info
To simplify deployment, the installation package provided here is pre-compiled to include all required dependencies.
:::
Expand All @@ -31,6 +34,8 @@ Users can start StoneDB in two ways: manual installation and automatic installat
```shell
groupadd mysql
useradd -g mysql mysql

# Here are the optional execution statements
passwd mysql
```
### 4.2 Manually install StoneDB
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
id: compile-using-centos7-foe-56
sidebar_position: 5.122
id: compile-using-centos7-for-56
sidebar_position: 5.123
---

# Compile StoneDB for MySQL5.6 on CentOS 7
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
id: compile-using-centos7-for-57
sidebar_position: 5.121
sidebar_position: 5.122
---

# Compile StoneDB for MySQL5.7 on CentOS 7
Expand Down
Loading