This is an automated email from the ASF dual-hosted git repository. alsuliman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit fcf9e3387e0ba123ef3379fd0799f9c383d13770 Author: Ali Alsuliman <[email protected]> AuthorDate: Fri Sep 13 17:38:52 2024 -0700 [NO ISSUE][OTH] Fix warnings-limit and cache-residency tests - user model changes: no - storage format changes: no - interface changes: no Change-Id: If7a0731339f6dd0297f8674502612f1e7cb99161 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18903 Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Ali Alsuliman <[email protected]> --- .../api/cache-residency/cache-residency.002.regexjson | 4 ++-- .../warnings/warnings-limit/warnings-limit.03.regexadm | 18 ++---------------- .../warnings/warnings-limit/warnings-limit.04.regexadm | 18 ++---------------- .../warnings/warnings-limit/warnings-limit.05.regexadm | 18 ++---------------- .../warnings/warnings-limit/warnings-limit.07.regexadm | 18 ++---------------- .../warnings/warnings-limit/warnings-limit.08.regexadm | 18 ++---------------- 6 files changed, 12 insertions(+), 82 deletions(-) diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.002.regexjson b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.002.regexjson index 7c4f553d60..b3f8c7c75f 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.002.regexjson +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.002.regexjson @@ -4,7 +4,7 @@ "*": "*" }, "type": "application/x-adm", - "results": [ "{ \"$1\": 17 }" ], + "results": [ "R{.*}" ], "plans": "R{.*}", "status": "success", "metrics": { @@ -14,7 +14,7 @@ "queueWaitTime": "R{.*}", "resultCount": 1, "resultSize": "R{.*}", - "processedObjects": 17, + "processedObjects": "R{.*}", "bufferCacheHitRatio": "100.00%", "bufferCachePageReadCount": 1 } diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.03.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.03.regexadm index 0717e21b1b..69842dfe83 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.03.regexadm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.03.regexadm @@ -3,21 +3,7 @@ \s*\Q"signature": {\E \s*\Q"*": "*"\E \s*\Q},\E -\s*\Q"results": [ { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q]\E +\s*\Q"results": [ {"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null} ]\E \s*\Q,\E \s*\Q"plans":{},\E \s*\Q"warnings": [{\E\s* @@ -40,4 +26,4 @@ \s*\Q"bufferCachePageReadCount": \E[0-9]+\Q,\E \s*\Q"warningCount": 12\E \s*\Q}\E -\s*\Q}\E\s* \ No newline at end of file +\s*\Q}\E\s* diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.04.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.04.regexadm index 7c0d2e7727..245357d076 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.04.regexadm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.04.regexadm @@ -3,21 +3,7 @@ \s*\Q"signature": {\E \s*\Q"*": "*"\E \s*\Q},\E -\s*\Q"results": [ { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q]\E +\s*\Q"results": [ {"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null} ]\E \s*\Q,\E \s*\Q"plans":{},\E \s*\Q"status": "success",\E @@ -33,4 +19,4 @@ \s*\Q"bufferCachePageReadCount": \E[0-9]+\Q,\E \s*\Q"warningCount": 10\E \s*\Q}\E -\s*\Q}\E\s* \ No newline at end of file +\s*\Q}\E\s* diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.05.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.05.regexadm index 49d65fff11..28a9b78212 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.05.regexadm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.05.regexadm @@ -3,21 +3,7 @@ \s*\Q"signature": {\E \s*\Q"*": "*"\E \s*\Q},\E -\s*\Q"results": [ { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q]\E +\s*\Q"results": [ {"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null} ]\E \s*\Q,\E \s*\Q"plans":{},\E \s*\Q"status": "success",\E @@ -33,4 +19,4 @@ \s*\Q"bufferCachePageReadCount": \E[0-9]+\Q,\E \s*\Q"warningCount": 11\E \s*\Q}\E -\s*\Q}\E\s* \ No newline at end of file +\s*\Q}\E\s* diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.07.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.07.regexadm index 49d65fff11..28a9b78212 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.07.regexadm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.07.regexadm @@ -3,21 +3,7 @@ \s*\Q"signature": {\E \s*\Q"*": "*"\E \s*\Q},\E -\s*\Q"results": [ { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q]\E +\s*\Q"results": [ {"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null} ]\E \s*\Q,\E \s*\Q"plans":{},\E \s*\Q"status": "success",\E @@ -33,4 +19,4 @@ \s*\Q"bufferCachePageReadCount": \E[0-9]+\Q,\E \s*\Q"warningCount": 11\E \s*\Q}\E -\s*\Q}\E\s* \ No newline at end of file +\s*\Q}\E\s* diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.08.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.08.regexadm index 0717e21b1b..69842dfe83 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.08.regexadm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/warnings/warnings-limit/warnings-limit.08.regexadm @@ -3,21 +3,7 @@ \s*\Q"signature": {\E \s*\Q"*": "*"\E \s*\Q},\E -\s*\Q"results": [ { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": false }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q, { "F1": { "a": 1 }, "F2": null }\E -\s*\Q]\E +\s*\Q"results": [ {"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":false},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null},{"F1":{"a":1},"F2":null} ]\E \s*\Q,\E \s*\Q"plans":{},\E \s*\Q"warnings": [{\E\s* @@ -40,4 +26,4 @@ \s*\Q"bufferCachePageReadCount": \E[0-9]+\Q,\E \s*\Q"warningCount": 12\E \s*\Q}\E -\s*\Q}\E\s* \ No newline at end of file +\s*\Q}\E\s*
