Skip to content

Commit 9c4edff

Browse files
rafierafie
authored
Changed module filename stem to rejson-oss (RedisJSON#793)
1 parent 3699c86 commit 9c4edff

File tree

3 files changed

+111
-33
lines changed

3 files changed

+111
-33
lines changed

‎sbin/pack.sh

+30-9
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ HERE="$(cd "$(dirname "$PROGNAME")" &>/dev/null && pwd)"
77
ROOT=$(cd $HERE/.. && pwd)
88
export READIES=$ROOT/deps/readies
99
. $READIES/shibumi/defs
10+
1011
SBIN=$ROOT/sbin
1112

1213
export PYTHONWARNINGS=ignore
@@ -29,12 +30,12 @@ if [[ $1 == --help || $1 == help || $HELP == 1 ]]; then
2930
SYM=0|1 Build debug symbols file
3031
3132
BRANCH=name Branch name for snapshot packages
32-
VERSION=ver Version for release packages
3333
WITH_GITSHA=1 Append Git SHA to shapshot package names
3434
VARIANT=name Build variant (default: empty)
3535
3636
ARTDIR=dir Directory in which packages are created (default: bin/artifacts)
3737
38+
JUST_PRINT=1 Only print package names, do not generate
3839
VERBOSE=1 Print commands
3940
IGNERR=1 Do not abort on error
4041
@@ -56,6 +57,7 @@ ARTDIR=$(cd $ARTDIR && pwd)
5657

5758
ARCH=$($READIES/bin/platform --arch)
5859
[[ $ARCH == x64 ]] && ARCH=x86_64
60+
5961
OS=$($READIES/bin/platform --os)
6062
[[ $OS == linux ]] && OS=Linux
6163

@@ -68,11 +70,11 @@ OSNICK=$($READIES/bin/platform --osnick)
6870
[[ $OSNICK == centos8 ]] && OSNICK=rhel8
6971
[[ $OSNICK == rocky8 ]] && OSNICK=rhel8
7072

71-
export PRODUCT=rejson
72-
export PRODUCT_LIB=$PRODUCT.so
73+
export PRODUCT=rejson-oss
74+
export PRODUCT_LIB=rejson.so
7375
export DEPNAMES=""
7476

75-
export PACKAGE_NAME=${PACKAGE_NAME:-${PRODUCT}}
77+
export PACKAGE_NAME=rejson-oss
7678

7779
RAMP_CMD="python3 -m RAMP.ramp"
7880

@@ -105,7 +107,8 @@ pack_ramp() {
105107
-e NUMVER -e SEMVER \
106108
$ROOT/$rampfile > /tmp/ramp.yml
107109
rm -f /tmp/ramp.fname $packfile
108-
$RAMP_CMD pack -m /tmp/ramp.yml --packname-file /tmp/ramp.fname --verbose --debug -o $packfile $product_so >/tmp/ramp.err 2>&1 || true
110+
$RAMP_CMD pack -m /tmp/ramp.yml --packname-file /tmp/ramp.fname --verbose --debug \
111+
-o $packfile $product_so >/tmp/ramp.err 2>&1 || true
109112
if [[ ! -e $packfile ]]; then
110113
eprint "Error generating RAMP file:"
111114
>&2 cat /tmp/ramp.err
@@ -118,6 +121,8 @@ pack_ramp() {
118121
ln -sf ../$fq_package $snap_package
119122
fi
120123

124+
local packname=`cat /tmp/ramp.fname`
125+
echo "Created $packname"
121126
cd $ROOT
122127
}
123128

@@ -127,8 +132,8 @@ pack_deps() {
127132
local dep="$1"
128133

129134
local platform="$OS-$OSNICK-$ARCH"
135+
local stem=${PACKAGE_NAME}.${dep}.${platform}
130136
local verspec=${SEMVER}${VARIANT}
131-
local stem=${PACKAGE_NAME}-${dep}.${platform}
132137

133138
local depdir=$(cat $ARTDIR/$dep.dir)
134139

@@ -139,12 +144,12 @@ pack_deps() {
139144
{ cd $depdir ;\
140145
cat $ARTDIR/$dep.files | \
141146
xargs tar -c --sort=name --owner=root:0 --group=root:0 --mtime='UTC 1970-01-01' \
142-
--transform "s,^,$dep_prefix_dir," 2>> /tmp/pack.err | \
147+
--transform "s,^,$dep_prefix_dir," 2> /tmp/pack.err | \
143148
gzip -n - > $tar_path ; E=$?; } || true
144149
rm -f $ARTDIR/$dep.prefix $ARTDIR/$dep.files $ARTDIR/$dep.dir
145150

146151
cd $ROOT
147-
if [[ $E != 0 ]]; then
152+
if [[ $E != 0 || -s /tmp/pack.err ]]; then
148153
eprint "Error creating $tar_path:"
149154
cat /tmp/pack.err >&2
150155
exit 1
@@ -166,7 +171,7 @@ pack_deps() {
166171
prepare_symbols_dep() {
167172
echo "Preparing debug symbols dependencies ..."
168173
echo $(cd "$(dirname $MODULE)" && pwd) > $ARTDIR/debug.dir
169-
echo $PRODUCT.so.debug > $ARTDIR/debug.files
174+
echo $PRODUCT_LIB.debug > $ARTDIR/debug.files
170175
echo "" > $ARTDIR/debug.prefix
171176
pack_deps debug
172177
echo "Done."
@@ -197,6 +202,22 @@ if [[ $WITH_GITSHA == 1 ]]; then
197202
fi
198203
export BRANCH
199204

205+
#----------------------------------------------------------------------------------------------
206+
207+
if [[ $JUST_PRINT == 1 ]]; then
208+
if [[ $RAMP == 1 ]]; then
209+
echo "${PACKAGE_NAME}.${OS}-${OSNICK}-${ARCH}.${SEMVER}${VARIANT}.zip"
210+
fi
211+
if [[ $DEPS == 1 ]]; then
212+
for dep in $DEPNAMES; do
213+
echo "${PACKAGE_NAME}.${dep}.${OS}-${OSNICK}-${ARCH}.${SEMVER}${VARIANT}.tgz"
214+
done
215+
fi
216+
exit 0
217+
fi
218+
219+
#----------------------------------------------------------------------------------------------
220+
200221
if [[ $DEPS == 1 ]]; then
201222
echo "Building dependencies ..."
202223

‎sbin/upload-artifacts

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,4 +126,4 @@ if [[ $NOP != 1 ]]; then
126126
fi
127127
fi
128128

129-
s3_upload rejson rejson
129+
s3_upload rejson-oss rejson-oss

‎tests/pytest/tests.sh

+80-23
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# [[ $VERBOSE == 1 ]] && set -x
55

66
HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
7-
export ROOT=$(cd $HERE/../.. && pwd)
7+
ROOT=$(cd $HERE/../.. && pwd)
88
READIES=$ROOT/deps/readies
99
. $READIES/shibumi/defs
1010

@@ -14,12 +14,12 @@ cd $HERE
1414

1515
help() {
1616
cat <<-END
17-
Run Python tests
17+
Run Python tests using RLTest
1818
1919
[ARGVARS...] tests.sh [--help|help] [<module-so-path>]
2020
2121
Argument variables:
22-
MODULE=path Path to redisai.so
22+
MODULE=path Path to redisjson.so
2323
TEST=test Run specific test (e.g. test.py:test_name)
2424
REDIS=addr Use redis-server at addr
2525
@@ -32,6 +32,11 @@ help() {
3232
VALGRIND|VG=1 Run with Valgrind
3333
SAN=type Use LLVM sanitizer (type=address|memory|leak|thread)
3434
35+
EXT=1|run Test on existing env (1=running; run=start redis-server)
36+
EXT_HOST=addr Address if existing env (default: 127.0.0.1)
37+
EXT_PORT=n Port of existing env
38+
RLEC_PORT=n Port of RLEC database (default: 12000)
39+
3540
VERBOSE=1 Print commands
3641
IGNERR=1 Do not abort on error
3742
NOP=1 Dry run
@@ -40,6 +45,31 @@ help() {
4045
END
4146
}
4247

48+
#----------------------------------------------------------------------------------------------
49+
50+
setup_rltest() {
51+
if [[ $RLTEST == view ]]; then
52+
if [[ ! -d $ROOT/../RLTest ]]; then
53+
eprint "RLTest not found in view $ROOT"
54+
exit 1
55+
fi
56+
RLTEST=$(cd $ROOT/../RLTest; pwd)
57+
fi
58+
59+
if [[ -n $RLTEST ]]; then
60+
if [[ ! -d $RLTEST ]]; then
61+
eprint "Invalid RLTest location: $RLTEST"
62+
exit 1
63+
fi
64+
65+
# Specifically search for it in the specified location
66+
export PYTHONPATH="$PYTHONPATH:$RLTEST"
67+
if [[ $VERBOSE == 1 ]]; then
68+
echo "PYTHONPATH=$PYTHONPATH"
69+
fi
70+
fi
71+
}
72+
4373
#----------------------------------------------------------------------------------------------
4474

4575
install_git_lfs() {
@@ -131,7 +161,9 @@ run_tests() {
131161

132162
cd $ROOT/tests/pytest
133163

134-
[[ $SERDE_JSON == 1 ]] && MODARGS+=" JSON_BACKEND SERDE_JSON"
164+
if [[ $SERDE_JSON == 1 ]]; then
165+
MODARGS+=" JSON_BACKEND SERDE_JSON"
166+
fi
135167

136168
if [[ $EXISTING_ENV != 1 ]]; then
137169
rltest_config=$(mktemp "${TMPDIR:-/tmp}/rltest.XXXXXXX")
@@ -140,33 +172,46 @@ run_tests() {
140172
--module $MODULE
141173
--module-args '$MODARGS'
142174
$RLTEST_ARGS
175+
$RLTEST_PARALLEL_ARG
143176
$VALGRIND_ARGS
144177
$SAN_ARGS
145178
$COV_ARGS
146179
147180
EOF
148181

149182
else # existing env
150-
xredis_conf=$(mktemp "${TMPDIR:-/tmp}/xredis_conf.XXXXXXX")
151-
cat <<-EOF > $xredis_conf
152-
loadmodule $MODULE $MODARGS
153-
EOF
183+
if [[ $EXT == run ]]; then
184+
xredis_conf=$(mktemp "${TMPDIR:-/tmp}/xredis_conf.XXXXXXX")
185+
cat <<-EOF > $xredis_conf
186+
loadmodule $MODULE $MODARGS
187+
EOF
188+
189+
rltest_config=$(mktemp "${TMPDIR:-/tmp}/xredis_rltest.XXXXXXX")
190+
cat <<-EOF > $rltest_config
191+
--env existing-env
192+
$RLTEST_ARGS
193+
194+
EOF
195+
196+
if [[ $VERBOSE == 1 ]]; then
197+
echo "External redis-server configuration:"
198+
cat $xredis_conf
199+
fi
154200

155-
rltest_config=$(mktemp "${TMPDIR:-/tmp}/xredis_rltest.XXXXXXX")
156-
cat <<-EOF > $rltest_config
157-
--env existing-env
158-
$RLTEST_ARGS
201+
$REDIS_SERVER $xredis_conf &
202+
XREDIS_PID=$!
203+
echo "External redis-server pid: " $XREDIS_PID
159204

160-
EOF
205+
else # EXT=1
206+
rltest_config=$(mktemp "${TMPDIR:-/tmp}/xredis_rltest.XXXXXXX")
207+
rm -f $rltest_config
208+
cat <<-EOF > $rltest_config
209+
--env existing-env
210+
--existing-env-addr $EXT_HOST:$EXT_PORT
211+
$RLTEST_ARGS
161212
162-
if [[ $VERBOSE == 1 ]]; then
163-
echo "External redis-server configuration:"
164-
cat $xredis_conf
213+
EOF
165214
fi
166-
167-
$REDIS_SERVER $xredis_conf &
168-
XREDIS_PID=$!
169-
echo "External redis-server pid: " $XREDIS_PID
170215
fi
171216

172217
# Use configuration file in the current directory if it exists
@@ -202,10 +247,23 @@ run_tests() {
202247

203248
#----------------------------------------------------------------------------------------------
204249

205-
[[ $1 == --help || $1 == help ]] && { help; exit 0; }
250+
[[ $1 == --help || $1 == help || $HELP == 1 ]] && { help; exit 0; }
251+
252+
if [[ -n $1 && -z $MODULE ]]; then
253+
MODULE="$1"
254+
shift
255+
fi
256+
257+
[[ -z $MODULE || ! -f $MODULE ]] && { echo "Module not found at ${MODULE}. Aborting."; exit 1; }
258+
259+
[[ $EXT == 1 || $EXT == run ]] && EXISTING_ENV=1
260+
261+
setup_rltest
206262

207263
GDB=${GDB:-0}
208264

265+
#----------------------------------------------------------------------------------------------
266+
209267
OP=""
210268
[[ $NOP == 1 ]] && OP="echo"
211269

@@ -226,8 +284,7 @@ else
226284
CLUSTER=${CLUSTER:-1}
227285
fi
228286

229-
MODULE=${MODULE:-$1}
230-
[[ -z $MODULE || ! -f $MODULE ]] && { echo "Module not found at ${MODULE}. Aborting."; exit 1; }
287+
#----------------------------------------------------------------------------------------------
231288

232289
[[ $VALGRIND == 1 ]] && valgrind_config
233290

0 commit comments

Comments
 (0)