Skip to content

Commit

Permalink
Cherry pick to v3.0.0(0110) (#3669)
Browse files Browse the repository at this point in the history
* Fix typos (#3615)

Co-authored-by: kyle.cao <kyle.cao@vesoft.com>

* fix fetch edges tostring (#3613)

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>
Co-authored-by: Yichen Wang <18348405+Aiee@users.noreply.github.com>

* fix create space assign offline host (#3583)

* fix create space

* fix test case

Co-authored-by: Harris.Chu <1726587+HarrisChu@users.noreply.github.com>

* Disable ARM version docker image since related third party not ready (#3618)

* Unify raft error code (#3620)

* Meta upgrader v3 (#3540)

* Replace group when create space

* Support white list

* fix test case

* support zone operations

* fix

* Support meta upgrade v3

* add more check about parse host result (#3628)

* Ut fix (#3611)

* Enable ut and fix chaindelete

* Add mock server default worker

* fix service crash (#3616)

* Cleanup branch param in package script (#3622)

* fix crash when the expression exceed the depth (#3606)

* Enhance login password check (#3629)

* fix_batch_insert_problem (#3627)

* filter data before batch insert

* add test cases

* add more testcase

* add notifyStop() for metaClient (#3621)

* add notifyStop() for metaClient

* do clean

* Fix removeSession() (#3651)

Co-authored-by: Yee <2520865+yixinglu@users.noreply.github.com>

* Issue3373 storage exit crash (#3553)

* use rcu replace thread local

fix storage exit crash

format

address some comment

* fix bug

* fix bug

* Fix coalesce bug (#3653)

* fix coalesce

* fix test

* add test

* add tck

* fix

* fix

* fix

* delete double check agg in where clause (#3647)

Co-authored-by: Yee <2520865+yixinglu@users.noreply.github.com>
Co-authored-by: cpw <13495049+CPWstatic@users.noreply.github.com>

* fix meta crash after create space (#3660)

Co-authored-by: Yichen Wang <18348405+Aiee@users.noreply.github.com>

Co-authored-by: Yichen Wang <18348405+Aiee@users.noreply.github.com>
Co-authored-by: kyle.cao <kyle.cao@vesoft.com>
Co-authored-by: jimingquan <mingquan.ji@vesoft.com>
Co-authored-by: yaphet <4414314+darionyaphet@users.noreply.github.com>
Co-authored-by: Harris.Chu <1726587+HarrisChu@users.noreply.github.com>
Co-authored-by: Yee <2520865+yixinglu@users.noreply.github.com>
Co-authored-by: Doodle <13706157+critical27@users.noreply.github.com>
Co-authored-by: Alex Xing <90179377+SuperYoko@users.noreply.github.com>
Co-authored-by: endy.li <25311962+heroicNeZha@users.noreply.github.com>
Co-authored-by: lionel.liu@vesoft.com <52276794+liuyu85cn@users.noreply.github.com>
Co-authored-by: hs.zhang <22708345+cangfengzhs@users.noreply.github.com>
Co-authored-by: jakevin <30525741+jackwener@users.noreply.github.com>
Co-authored-by: cpw <13495049+CPWstatic@users.noreply.github.com>
  • Loading branch information
14 people authored Jan 10, 2022
1 parent ce15bca commit a9d4713
Show file tree
Hide file tree
Showing 105 changed files with 2,502 additions and 914 deletions.
8 changes: 4 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Thanks for your contributing!
Thanks for your contribution!
In order to review PR more efficiently, please add information according to the template.
-->

Expand All @@ -8,13 +8,13 @@ In order to review PR more efficiently, please add information according to the
- [ ] feature
- [ ] enhancement

#### What problem does this PR slove?
#### What problem(s) does this PR solve?
Issue(s) number:

Description:


#### How do you slove it?
#### How do you solve it?



Expand All @@ -26,7 +26,7 @@ Description:
Tests:
- [ ] Unit test(positive and negative cases)
- [ ] Function test
- [ ] Perfomance test
- [ ] Performance test
- [ ] N/A

Affects:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ jobs:
with:
context: .
file: ./docker/Dockerfile.${{ matrix.service }}
platforms: linux/amd64,linux/arm64
# platforms: linux/amd64,linux/arm64
platforms: linux/amd64
tags: |
vesoft/nebula-${{ matrix.service }}:nightly
push: true
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- uses: ./.github/actions/tagname-action
id: tag
- name: package
run: ./package/package.sh -b ${{ steps.tag.outputs.tag }} -t RelWithDebInfo -r OFF -p ON -s TRUE
run: ./package/package.sh -v ${{ steps.tag.outputs.tag }} -t RelWithDebInfo -r OFF -p ON -s TRUE
- name: output some vars
run: |
tar zcf ${{ env.CPACK_DIR }}/nebula-${{ steps.tag.outputs.tagnum }}.tar.gz --exclude=${{ env.BUILD_DIR }} ./*
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
id: tagname
- id: docker
run: |
majorver=$(git tag -l --sort=v:refname | tail -n1 | cut -f1 -d'.')
majorver=$(git tag -l --sort=v:refname | tail -n1 | cut -f1 -d".")
tag=""
if [[ $majorver == ${{ steps.tagname.outputs.majorver }} ]]; then
tag="${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-${{ matrix.service }}:latest"
Expand All @@ -99,7 +99,8 @@ jobs:
with:
context: .
file: ./docker/Dockerfile.${{ matrix.service }}
platforms: linux/amd64,linux/arm64
# platforms: linux/amd64,linux/arm64
platforms: linux/amd64
tags: |
${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-${{ matrix.service }}:${{ steps.tagname.outputs.tag }}
${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-${{ matrix.service }}:${{ steps.tagname.outputs.majorver }}
Expand Down
19 changes: 7 additions & 12 deletions package/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,27 @@
# -v: The version of package, the version should be match tag name, default value is null
# -n: Package to one or multi-packages, `ON` means one package, `OFF` means multi packages, default value is `ON`
# -s: Whether to strip the package, default value is `FALSE`
# -b: Branch, default master
# -d: Whether to enable sanitizer, default OFF
# -t: Build type, default Release
# -j: Number of threads, default $(nproc)
# -r: Whether enable compressed debug info, default ON
# -p: Whether dump the symbols from binary by dump_syms
#
# usage: ./package.sh -v <version> -n <ON/OFF> -s <TRUE/FALSE> -b <BRANCH>
# usage: ./package.sh -v <version> -n <ON/OFF> -s <TRUE/FALSE>
#

set -e

version=""
package_one=ON
strip_enable="FALSE"
usage="Usage: ${0} -v <version> -n <ON/OFF> -s <TRUE/FALSE> -b <BRANCH> -g <ON/OFF> -j <jobs> -t <BUILD TYPE>"
usage="Usage: ${0} -v <version> -n <ON/OFF> -s <TRUE/FALSE> -g <ON/OFF> -j <jobs> -t <BUILD TYPE>"
project_dir="$(cd "$(dirname "$0")" && pwd)/.."
build_dir=${project_dir}/pkg-build
enablesanitizer="OFF"
static_sanitizer="OFF"
build_type="Release"
branch="master"
branch=$(git rev-parse --abbrev-ref HEAD)
jobs=$(nproc)
enable_compressed_debug_info=ON
dump_symbols=OFF
Expand All @@ -47,9 +46,6 @@ do
s)
strip_enable=$OPTARG
;;
b)
branch=$OPTARG
;;
d)
enablesanitizer="ON"
if [ "$OPTARG" == "static" ]; then
Expand Down Expand Up @@ -135,9 +131,8 @@ function build {
san=$2
ssan=$3
build_type=$4
branch=$5
package_tar=$6
install_prefix=$7
package_tar=$5
install_prefix=$6

mkdir -p ${build_dir}

Expand Down Expand Up @@ -210,13 +205,13 @@ function dump_syms {
}

# The main
build $version $enablesanitizer $static_sanitizer $build_type $branch "OFF" "/usr/local/nebula"
build $version $enablesanitizer $static_sanitizer $build_type "OFF" "/usr/local/nebula"
package $strip_enable
if [[ $dump_symbols == ON ]]; then
echo ">>> start dump symbols <<<"
dump_syms
fi

# tar package
build $version $enablesanitizer $static_sanitizer $build_type $branch "ON" "/"
build $version $enablesanitizer $static_sanitizer $build_type "ON" "/"
package $strip_enable
Loading

0 comments on commit a9d4713

Please sign in to comment.