>From Ian Maxon <[email protected]>:
Ian Maxon has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20530?usp=email )
Change subject: Merge branch trinity into phoenix
......................................................................
Merge branch trinity into phoenix
* [ASTERIXDB-3658][RT]Remove operator descriptions from profile (MB-68975)
Ext-ref: MB-68975
Change-Id: I716c7c40531261eb3b719118b967d45df312a90b
---
M asterixdb/asterix-app/src/test/resources/runtimets/profiled.xml
M
asterixdb/asterix-app/src/test/resources/runtimets/results/profile/non-unary-subplan/non-unary-subplan.3.regexjson
M
asterixdb/asterix-app/src/test/resources/runtimets/results/profile/plansleep/sleep.3.regexjson
4 files changed, 13 insertions(+), 245 deletions(-)
Approvals:
Jenkins: Verified; Verified
Anon. E. Moose #1000171:
Ian Maxon: Looks good to me, approved
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/profiled.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/profiled.xml
index cd85aea..15c52dc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/profiled.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/profiled.xml
@@ -59,13 +59,14 @@
</compilation-unit>
</test-case>
<test-case FilePath="profile">
-<<<<<<< HEAD (69b31a [ASTERIXDB-3652][STO] Fixed column assembler issues)
<compilation-unit name="subplan">
<parameter name="profile" value="timings" type="string"/>
<parameter name="optimized-logical-plan" value="true" type="string"/>
<parameter name="plan-format" value="json" type="string"/>
<output-dir compare="Text">subplan</output-dir>
-=======
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="profile">
<compilation-unit name="long-description">
<output-dir compare="Text">long-description</output-dir>
</compilation-unit>
@@ -80,8 +81,7 @@
<compilation-unit name="long-description">
<parameter name="profile" value="timings" type="string"/>
<output-dir compare="Text">long-description</output-dir>
->>>>>>> BRANCH (3f9198 [ASTERIXDB-3658][RT]Remove operator descriptions from
profil)
</compilation-unit>
</test-case>
</test-group>
-</test-suite>
\ No newline at end of file
+</test-suite>
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/profile/non-unary-subplan/non-unary-subplan.3.regexjson
b/asterixdb/asterix-app/src/test/resources/runtimets/results/profile/non-unary-subplan/non-unary-subplan.3.regexjson
index 2a153bd..946db29 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/profile/non-unary-subplan/non-unary-subplan.3.regexjson
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/profile/non-unary-subplan/non-unary-subplan.3.regexjson
@@ -11,7 +11,6 @@
"counters": [],
"tasks": [
{
-<<<<<<< HEAD (69b31a [ASTERIXDB-3652][STO] Fixed column assembler issues)
"activity-id": "R{[A-Z0-9.:]+}",
"partition": "R{[0-9]+}",
"attempt": "R{[0-9]+}",
@@ -270,237 +269,3 @@
}
]
}
-=======
- "node-id": "R{.+}",
- "counters": [],
- "tasks": [
- {
- "activity-id": "R{[A-Z0-9.:]+}",
- "partition": "R{[0-9]+}",
- "attempt": "R{[0-9]+}",
- "partition-send-profile": [],
- "counters": [
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}"
- }
- ]
- },
- {
- "activity-id": "R{[A-Z0-9.:]+}",
- "partition": "R{[0-9]+}",
- "attempt": "R{[0-9]+}",
- "partition-send-profile": [],
- "counters": [
- {
- "name": "R{ANID:ODID:[0-9]:0\\.1 - MicroOp
(?:.|\n)+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}"
- }
- ]
- },
- {
- "activity-id": "R{[A-Z0-9.:]+}",
- "partition": "R{[0-9]+}",
- "attempt": "R{[0-9]+}",
- "partition-send-profile": [
- {
- "partition-id": {
- "job-id": "R{[A-Z0-9.:]+}",
- "connector-id": "R{[A-Z0-9.:]+}",
- "sender-index": "R{[0-9]+}",
- "receiver-index": "R{[0-9]+}"
- },
- "open-time": "R{[0-9]+}",
- "close-time": "R{[0-9]+}",
- "offset": "R{[0-9]+}",
- "frame-times": [
- 0
- ],
- "resolution": 1
- }
- ],
- "counters": [
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}"
- },
- {
- "name": "R{.+}",
- "run-time": "R{[0-9.]+}",
- "runtime-id": "R{.+}",
- "cardinality-out": "R{[0-9.]+}",
- "avg-tuple-size": "R{[0-9.]+}",
- "min-tuple-size": "R{[0-9.]+}",
- "max-tuple-size": "R{[0-9.]+}"
- }
- ]
- }
- ]
- }]
-}
->>>>>>> BRANCH (3f9198 [ASTERIXDB-3658][RT]Remove operator descriptions from
profil)
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/profile/plansleep/sleep.3.regexjson
b/asterixdb/asterix-app/src/test/resources/runtimets/results/profile/plansleep/sleep.3.regexjson
index 28562e7..d6b31fa 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/profile/plansleep/sleep.3.regexjson
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/profile/plansleep/sleep.3.regexjson
@@ -87,13 +87,13 @@
"runtime-id": "R{.+}",
"activity-stats": [
{
- "name": "Sort (Run Generation)",
+ "name": "R{.+}",
"id": "ANID:0",
"min-time": "R{[0-9.]+}",
"max-time": "R{[0-9.]+}"
},
{
- "name": "Sort (Run Merge)",
+ "name": "R{.+}",
"id": "ANID:1",
"min-time": "R{[0-9.]+}",
"max-time": "R{[0-9.]+}",
@@ -245,13 +245,13 @@
"runtime-id": "R{.+}",
"activity-stats": [
{
- "name": "Sort (Run Generation)",
+ "name": "R{.+}",
"id": "ANID:0",
"min-time": "R{[0-9.]+}",
"max-time": "R{[0-9.]+}"
},
{
- "name": "Sort (Run Merge)",
+ "name": "R{.+}",
"id": "ANID:1",
"min-time": "R{[0-9.]+}",
"max-time": "R{[0-9.]+}",
@@ -327,13 +327,13 @@
"runtime-id": "R{.+}",
"activity-stats": [
{
- "name": "Sort (Run
Generation)",
+ "name": "R{.+}",
"id": "ANID:0",
"min-time": "R{[0-9.]+}",
"max-time": "R{[0-9.]+}"
},
{
- "name": "Sort (Run Merge)",
+ "name": "R{.+}",
"id": "ANID:1",
"min-time": "R{[0-9.]+}",
"max-time": "R{[0-9.]+}",
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20530?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: asterixdb
Gerrit-Branch: phoenix
Gerrit-Change-Id: I716c7c40531261eb3b719118b967d45df312a90b
Gerrit-Change-Number: 20530
Gerrit-PatchSet: 1
Gerrit-Owner: Ian Maxon <[email protected]>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
