Support for jsonpath .datetime() method

back to CI dashboard

1 patchset tracked - current t40681_22

v22t40681_22posted Sep 27, 2019successwon't retryancient 7ypg 13
base7881bb14f Sep 25, 2019 - 2551 days / 17622 commits behind master (from history)
applyapplied Aug 18, 16:24
rebaselast tried Aug 18, 16:24 on 195e8e427
Applying: Refactor jsonpath's compareDatime()
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/jsonpath_exec.c
M	src/test/regress/expected/jsonb_jsonpath.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/jsonb_jsonpath.out
CONFLICT (content): Merge conflict in src/test/regress/expected/jsonb_jsonpath.out
Auto-merging src/backend/utils/adt/jsonpath_exec.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/jsonpath_exec.c
Patch failed at 0001 Refactor jsonpath's compareDatime()

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/test/regress/expected/jsonb_jsonpath.out, src/backend/utils/adt/jsonpath_exec.c
pushAug 18, 16:24 -> d8728152fbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success113543 / 5431m 31s / 2m 41sdocker run ... :t40681Aug 18, 16:31
run 32160150804
executed 543 - ccache 108 hit / 4033 miss - head d8728152f - digest sha256:283ef0bd2dbd7e... - run 32160150804