Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5134f8c

Browse files
oshadmirafieemmanuelkellergkorlandrrelledge
authored
Merge from master to 2.0 towards 2.0.8 (RedisJSON#698)
* Merge from master to 2.0 (towards 2.0.7) (RedisJSON#665) * Fixes in config.yml (RedisJSON#409) (cherry picked from commit 8adfd29) * Updated module version * json.get returns a top-level array (as bulk string) (RedisJSON#411) (RedisJSON#412) * json.get returns a top-level array (as bulk string) * Fix format and tests (cherry picked from commit cc6d225) * Updated modules version (2) * Added integration branch 2.0 * Updated module version * Updated modules version (2) * Added integration branch 2.0 * [2.0] Updated readies * [2.0] Updated readies (for docker cpuset) * update readies to master * Update version to 2.0.2 * Update Cargo.toml version to 2.0.2 * Update deps: jsonpath tag v2.0.2 * Multipath: handle default arguments (RedisJSON#503) * Multipath: arrlen - handle missing path * Multipath: handle/add tests for default args (strlen objkeys objlen resp get strappend arrpop) (cherry picked from commit 8733934) * QA automation update (RedisJSON#505) (cherry picked from commit 223316f) * system-setup: added binutils for macOS (objcopy) (RedisJSON#524) (cherry picked from commit e6da70b) * [2.0] Cherry-pick RedisJSON#524, updated readies * Update version to 2.0.3 * Update readies * Bump version to 2.0.4 * Update commands.json file (2) (RedisJSON#534) (cherry picked from commit 58ea6f1) * Updated RS_VERSIONS (RedisJSON#536) (cherry picked from commit d7ee051) * Doc 2.0 (RedisJSON#538) (RedisJSON#540) * Document new path, JSON.GET and JSON.MGET * Add examples and update results for all commands * Update complexity information * Update docs/commands.md Co-authored-by: Omer Shadmi <[email protected]> * Update docs/commands.md Co-authored-by: Omer Shadmi <[email protected]> * Add example to NUMINCRBY. Fix example in NUMMULTBY * Update docs/commands.md Co-authored-by: Omer Shadmi <[email protected]> * Update docs/commands.md Co-authored-by: Omer Shadmi <[email protected]> * Post review rephrasing * Update docs/commands.md Co-authored-by: Omer Shadmi <[email protected]> * Add indexing JSON documents * Post review * Update docs/indexing_JSON.md Co-authored-by: Omer Shadmi <[email protected]> Co-authored-by: Omer Shadmi <[email protected]> Co-authored-by: Omer Shadmi <[email protected]> * Add indexing json doc (RedisJSON#543) * Doc 2.0 (RedisJSON#538) * Document new path, JSON.GET and JSON.MGET * Add examples and update results for all commands * Update complexity information * Update docs/commands.md Co-authored-by: Omer Shadmi <[email protected]> * Update docs/commands.md Co-authored-by: Omer Shadmi <[email protected]> * Add example to NUMINCRBY. Fix example in NUMMULTBY * Update docs/commands.md Co-authored-by: Omer Shadmi <[email protected]> * Update docs/commands.md Co-authored-by: Omer Shadmi <[email protected]> * Post review rephrasing * Update docs/commands.md Co-authored-by: Omer Shadmi <[email protected]> * Add indexing JSON documents * Post review * Update docs/indexing_JSON.md Co-authored-by: Omer Shadmi <[email protected]> Co-authored-by: Omer Shadmi <[email protected]> * Add indexing json to the doc * update to latest readies Co-authored-by: Omer Shadmi <[email protected]> Co-authored-by: oshadmi <[email protected]> * Build system updates (esp. target into BINDIR) (RedisJSON#547) (cherry picked from commit 09c4618) * [2.0] Updated readies * [2.0] Dockerfile: updated REDISEARCH_VERSION * ARM support (RedisJSON#550) (cherry picked from commit c3ed883) * Bump version to 2.0.5 * Build ARM for bionic; test with Redis 6.0 (RedisJSON#556) (RedisJSON#557) (cherry picked from commit b1c8cb4) * initial ijson commit (RedisJSON#563) * initial ijson commit * Code arrangement * Return serde_json:Value support * Implement manager for IValue * Implement lasts unimplimented manager API for IValue * fmt fixes * return jsonpath library to point to generic_json_path * Made backend configurable on start using JSON_BACKEND module argument that can get either SERDE_JSON or IJSON, default is IJSON. * run tests on both backends * json_init -> json_init_config * fmt fixes * tests fixes * fmt fixes * disable memory test as its currently incorrect * review fixes * update redismodule-rs to 0.25 * fix 6.0 tests * Skip short read test on 6.0 (too slow) * Skip module keyspace notification test (introduced in redis 6.2) Co-authored-by: meir <[email protected]> Co-authored-by: oshadmi <[email protected]> (cherry picked from commit b6a070d) * path.md copyedit suggestions (cherry picked from commit 57e6a87) * indexing_JSON.md copyedit suggestions (cherry picked from commit 8cf0cd4) * Update Cargo.toml (RedisJSON#552) Co-authored-by: Rafi Einstein <[email protected]> (cherry picked from commit 42e6f32) * Update freebsd.yml (RedisJSON#565) * Update freebsd.yml (cherry picked from commit 58d6fbf) * JSON.SET full doc benchmark extensions (RedisJSON#568) * JSON.SET full doc benchmark extensions * [fix] Adjusted json_vs_hashes_json.set_key_simple to use a larger keyspace range * [fix] Fixed q5 JSON.SET test (cherry picked from commit 3ec45da) * Bump mkdocs from 1.1.2 to 1.2.3 in /docs (RedisJSON#572) Bumps [mkdocs](https://github.com/mkdocs/mkdocs) from 1.1.2 to 1.2.3. - [Release notes](https://github.com/mkdocs/mkdocs/releases) - [Commits](mkdocs/mkdocs@1.1.2...1.2.3) --- updated-dependencies: - dependency-name: mkdocs dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 91892dd) * Add docs fo JSON.CLEAR and JSON.TOGGLE (RedisJSON#474) (RedisJSON#607) * fix RedisJSON#465 Add docs for JSON.CLEAR and JSON.TOGGLE * Document adding a new child with JSON.SET (RedisJSON#622) (RedisJSON#626) * Document adding a new child with JSON.SET * Restoring previous edits * Restoring previous edits (2) (cherry picked from commit cd2458d) Co-authored-by: Rafi Einstein <[email protected]> Co-authored-by: Emmanuel Keller <[email protected]> Co-authored-by: Guy Korland <[email protected]> Co-authored-by: Rachel Elledge <[email protected]> Co-authored-by: filipe oliveira <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * revert bad merge (RedisJSON#668) * revert bad merge (2) (RedisJSON#669) * Add test to MOD2099 + update dep to latest generic_json_path (RedisJSON#671) * Fox JSON.CLEAR doc * Allow QA tests on a specific RS_VERSION (RedisJSON#682) * Build fixes, inc. Rocky Linux 8 (RedisJSON#685) * Build fixes, inc. Rocky Linux 8 * Use jsonpath lib with fix for issue RedisJSON#667 (RedisJSON#691) * Upgrade to latest jsonpath lib and add test for issue 667 * Fix comment * MOD-2785: Add benchmark for issue RedisJSON#674 (RedisJSON#693) * Add benchmark for issue RedisJSON#674 * Fix yml * Using memtier_benchmark for more granular control on json_recursive_descent_with_filter_uid_issue674 benchmark Co-authored-by: filipecosta90 <[email protected]> * Update release.json remove xenial - not supported add rhel8 * Enabled CI profilers (RedisJSON#692) * Enabled CI profilers * Enabled dwarf call graph mode and fail-fast on CI perf Co-authored-by: Rafi Einstein <[email protected]> Co-authored-by: Emmanuel Keller <[email protected]> Co-authored-by: Guy Korland <[email protected]> Co-authored-by: Rachel Elledge <[email protected]> Co-authored-by: filipe oliveira <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: tomerhekredis <[email protected]>
1 parent c718788 commit 5134f8c

File tree

17 files changed

+19630
-107
lines changed

17 files changed

+19630
-107
lines changed

‎.circleci/config.yml‎

Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,18 @@ commands:
260260
module_path:
261261
type: string
262262
default: bin/linux-x64-release/rejson.so
263+
profile_env:
264+
type: string
265+
default: "0"
266+
benchmark_glob:
267+
type: string
268+
default: "*.yml"
269+
triggering_env:
270+
type: string
271+
default: "circleci"
272+
allowed_envs:
273+
type: string
274+
default: "oss-standalone"
263275
steps:
264276
- run:
265277
name: Prepare automation
@@ -278,7 +290,9 @@ commands:
278290
export AWS_SECRET_ACCESS_KEY=$PERFORMANCE_EC2_SECRET_KEY
279291
export AWS_DEFAULT_REGION=$PERFORMANCE_EC2_REGION
280292
export EC2_PRIVATE_PEM=$PERFORMANCE_EC2_PRIVATE_PEM
281-
293+
export PROFILE=<< parameters.profile_env >>
294+
export BENCHMARK_GLOB=<< parameters.benchmark_glob >>
295+
export PERF_CALLGRAPH_MODE="dwarf"
282296
redisbench-admin run-remote \
283297
--required-module ReJSON \
284298
--module_path "$ROOT/<< parameters.module_path >>" \
@@ -288,8 +302,10 @@ commands:
288302
--github_sha $CIRCLE_SHA1 \
289303
--github_branch $CIRCLE_BRANCH \
290304
--upload_results_s3 \
291-
--triggering_env circleci \
292-
--push_results_redistimeseries
305+
--fail_fast \
306+
--triggering_env << parameters.triggering_env >> \
307+
--push_results_redistimeseries \
308+
--allowed-envs << parameters.allowed_envs >>
293309
294310
#----------------------------------------------------------------------------------------------------------------------------------
295311

@@ -442,12 +458,21 @@ jobs:
442458
name: Run QA Tests
443459
command: MODULE_VERSION=$CIRCLE_BRANCH VERBOSE=1 TEST=nightly QUICK=1 ./tests/qa/run
444460

445-
benchmarks:
461+
benchmark-json-oss-standalone:
446462
docker:
447463
- image: redisfab/rmbuilder:6.2.5-x64-bionic
448464
steps:
449465
- build-steps
450466
- benchmark-steps
467+
benchmark-json-oss-standalone-profiler:
468+
docker:
469+
- image: redisfab/rmbuilder:6.2.5-x64-bionic
470+
steps:
471+
- build-steps
472+
- benchmark-steps:
473+
profile_env: "1"
474+
triggering_env: "circleci.profilers" # results generated with profilers attached are not mixed with the ones without it
475+
451476

452477
#----------------------------------------------------------------------------------------------------------------------------------
453478

@@ -532,7 +557,7 @@ workflows:
532557
context: common
533558
matrix:
534559
parameters:
535-
platform: [focal, bionic, xenial, ol8, centos7, bullseye]
560+
platform: [focal, bionic, xenial, rocky8, centos7, bullseye]
536561
- build-arm-platforms:
537562
<<: *on-integ-and-version-tags
538563
context: common
@@ -550,9 +575,6 @@ workflows:
550575
matrix:
551576
parameters:
552577
san-type: [address] # [address, memory]
553-
- benchmarks:
554-
context: common
555-
<<: *on-integ-and-version-tags
556578
- upload-artifacts:
557579
name: upload-artifacts-to-staging-lab
558580
staging-lab: "1"
@@ -575,6 +597,13 @@ workflows:
575597
<<: *on-version-tags
576598
requires:
577599
- upload-release-artifacts
600+
- benchmark-json-oss-standalone:
601+
<<: *on-integ-and-version-tags
602+
context: common
603+
- benchmark-json-oss-standalone-profiler:
604+
<<: *on-integ-and-version-tags
605+
context: common
606+
578607

579608
nightly:
580609
triggers:
@@ -592,5 +621,7 @@ workflows:
592621
matrix:
593622
parameters:
594623
redis_version: ["6.0", "6.2"]
595-
- benchmarks:
624+
- benchmark-json-oss-standalone:
625+
context: common
626+
- benchmark-json-oss-standalone-profiler:
596627
context: common

‎Cargo.lock‎

Lines changed: 40 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cargo-features = ["edition2021"]
22

33
[package]
44
name = "redisjson"
5-
version = "2.0.7"
5+
version = "2.0.8"
66
authors = ["Guy Korland <[email protected]>", "Meir Shpilraien <[email protected]>", "Omer Shadmi <[email protected]>"]
77
edition = "2021"
88
description = "JSON data type for Redis"

‎Makefile‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,6 @@ coverage:
257257

258258
#----------------------------------------------------------------------------------------------
259259

260-
docker:
261-
$(SHOW)make -C build/platforms build
262-
263-
docker_push:
264-
$(SHOW)make -C build/platforms publish
265-
266-
.PHONY: docker docker_push
267-
268-
#----------------------------------------------------------------------------------------------
269-
270260
docker:
271261
$(SHOW)$(MAKE) -C build/docker
272262
ifeq ($(PUBLISH),1)

‎deps/readies‎

0 commit comments

Comments
 (0)