Skip to content

Commit 3bfbbd3

Browse files
authored
Rename tuplecount -> tuple-count (#110)
To mirror recent upstream changes in Hyper
1 parent 5df9e31 commit 3bfbbd3

23 files changed

+215
-211
lines changed

query-graphs/src/hyper.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,11 @@ function convertHyperNode(rawNode: Json, parentKey, conversionState: ConversionS
231231
// Display the cardinality on the links between the nodes
232232
if (hasOwnProperty(rawNode, "cardinality") && typeof rawNode.cardinality === "number") {
233233
const estimatedCard = rawNode.cardinality;
234-
const actualCard = tryGetPropertyPath(rawNode, ["analyze", "tuplecount"]);
234+
let actualCard = tryGetPropertyPath(rawNode, ["analyze", "tuple-count"]);
235+
if (actualCard === undefined) {
236+
// Backwards-compat: until recently, this was `tuple-count`, not `tuple-count`
237+
actualCard = tryGetPropertyPath(rawNode, ["analyze", "tuple-count"]);
238+
}
235239
if (typeof actualCard === "number") {
236240
conversionState.edgeWidths.push({node: convertedNode, width: actualCard});
237241
convertedNode.edgeLabel = formatMetric(actualCard) + "/" + formatMetric(estimatedCard);

standalone-app/examples/hyper/tpch/tpch-q1-analyze.plan.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
"debugName": {"classification": "nonsensitive", "value": "lineitem"},
2828
"restrictions": [{"attribute": 10, "mode": "<=", "value": {"expression": "const", "value": {"type": ["Date"], "value": 2451059}}}],
2929
"selectivity": 0.993007,
30-
"analyze": {"pipeline": 3, "tuplecount": 568, "execution-time": 105670}
30+
"analyze": {"pipeline": 3, "tuple-count": 568, "execution-time": 105670}
3131
},
3232
"keyExpressions": [{"expression": {"value": {"expression": "iuref", "iu": "v15"}}, "iu": ["v", ["Char1"]]}, {"expression": {"value": {"expression": "iuref", "iu": "v16"}}, "iu": ["v2", ["Char1"]]}],
3333
"groupingSets": [{"keyIndices": [0, 1], "coreIndices": [0, 1], "behavior": "regular"}],
3434
"emptyGroups": false,
3535
"aggExpressions": [{"value": {"expression": "iuref", "iu": "v11"}}, {"value": {"expression": "iuref", "iu": "v12"}}, {"value": {"expression": "mul", "left": {"expression": "sub", "left": {"expression": "const", "value": {"type": ["Integer"], "value": 1}}, "right": {"expression": "iuref", "iu": "v13"}}, "right": {"expression": "iuref", "iu": "v12"}}}, {"value": {"expression": "mul", "left": {"expression": "mul", "left": {"expression": "sub", "left": {"expression": "const", "value": {"type": ["Integer"], "value": 1}}, "right": {"expression": "iuref", "iu": "v13"}}, "right": {"expression": "iuref", "iu": "v12"}}, "right": {"expression": "add", "left": {"expression": "iuref", "iu": "v14"}, "right": {"expression": "const", "value": {"type": ["Integer"], "value": 1}}}}}, {"value": {"expression": "iuref", "iu": "v13"}}],
3636
"aggregates": [{"source": 4, "operation": {"aggregate": "avg"}, "iu": ["v9", ["Numeric", 12, 2]]}, {"source": 1, "operation": {"aggregate": "avg"}, "iu": ["v8", ["Numeric", 12, 2]]}, {"source": 0, "operation": {"aggregate": "avg"}, "iu": ["v7", ["Numeric", 12, 2]]}, {"source": 3, "operation": {"aggregate": "sum"}, "iu": ["v6", ["BigNumeric", 38, 6]]}, {"source": 0, "operation": {"aggregate": "sum"}, "iu": ["v3", ["BigNumeric", 38, 2]]}, {"source": 1, "operation": {"aggregate": "sum"}, "iu": ["v4", ["BigNumeric", 38, 2]]}, {"source": 4294967295, "operation": {"aggregate": "count"}, "iu": ["v10", ["BigInt"]]}, {"source": 2, "operation": {"aggregate": "sum"}, "iu": ["v5", ["BigNumeric", 38, 4]]}],
37-
"analyze": {"pipeline": 2, "tuplecount": 4, "memory-bytes": 18456, "execution-time": 10756}
37+
"analyze": {"pipeline": 2, "tuple-count": 4, "memory-bytes": 18456, "execution-time": 10756}
3838
},
39-
"analyze": {"pipeline": 1, "tuplecount": 4, "memory-bytes": 872, "execution-time": 452}
39+
"analyze": {"pipeline": 1, "tuple-count": 4, "memory-bytes": 872, "execution-time": 452}
4040
},
4141
"analyze": {}
4242
}

standalone-app/examples/hyper/tpch/tpch-q10-analyze.plan.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"debugName": {"classification": "nonsensitive", "value": "orders"},
4747
"restrictions": [{"attribute": 4, "mode": "[)", "value": {"expression": "const", "value": {"type": ["Date"], "value": 2449262}}, "value2": {"expression": "const", "value": {"type": ["Date"], "value": 2449354}}}],
4848
"selectivity": 0.0703125,
49-
"analyze": {"pipeline": 6, "tuplecount": 9, "execution-time": 26758}
49+
"analyze": {"pipeline": 6, "tuple-count": 9, "execution-time": 26758}
5050
},
5151
"right": {
5252
"operator": "tablescan",
@@ -59,10 +59,10 @@
5959
"debugName": {"classification": "nonsensitive", "value": "customer"},
6060
"earlyProbes": [{"builder": 6, "attributes": [0], "type": "lookup"}],
6161
"selectivity": 1,
62-
"analyze": {"pipeline": 5, "tuplecount": 9, "execution-time": 27623}
62+
"analyze": {"pipeline": 5, "tuple-count": 9, "execution-time": 27623}
6363
},
6464
"condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v12"}, "right": {"expression": "iuref", "iu": "v10"}},
65-
"analyze": {"pipeline": 5, "tuplecount": 9, "memory-bytes": 18456}
65+
"analyze": {"pipeline": 5, "tuple-count": 9, "memory-bytes": 18456}
6666
},
6767
"right": {
6868
"operator": "tablescan",
@@ -75,10 +75,10 @@
7575
"debugName": {"classification": "nonsensitive", "value": "nation"},
7676
"earlyProbes": [{"builder": 5, "attributes": [0], "type": "lookup"}],
7777
"selectivity": 1,
78-
"analyze": {"pipeline": 4, "tuplecount": 9, "execution-time": 37544}
78+
"analyze": {"pipeline": 4, "tuple-count": 9, "execution-time": 37544}
7979
},
8080
"condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v15"}, "right": {"expression": "iuref", "iu": "v19"}},
81-
"analyze": {"pipeline": 4, "tuplecount": 9, "memory-bytes": 18456}
81+
"analyze": {"pipeline": 4, "tuple-count": 9, "memory-bytes": 18456}
8282
},
8383
"right": {
8484
"operator": "tablescan",
@@ -92,19 +92,19 @@
9292
"restrictions": [{"attribute": 8, "mode": "=", "value": {"expression": "const", "value": {"type": ["Char1"], "value": 82}}}],
9393
"earlyProbes": [{"builder": 4, "attributes": [0], "type": "lookup"}],
9494
"selectivity": 0.265734,
95-
"analyze": {"pipeline": 3, "tuplecount": 25, "execution-time": 39892}
95+
"analyze": {"pipeline": 3, "tuple-count": 25, "execution-time": 39892}
9696
},
9797
"condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v21"}, "right": {"expression": "iuref", "iu": "v9"}},
98-
"analyze": {"pipeline": 3, "tuplecount": 23, "memory-bytes": 18456}
98+
"analyze": {"pipeline": 3, "tuple-count": 23, "memory-bytes": 18456}
9999
},
100100
"keyExpressions": [{"expression": {"value": {"expression": "iuref", "iu": "v12"}}, "iu": ["v", ["Integer"]]}, {"expression": {"value": {"expression": "iuref", "iu": "v13"}}, "iu": ["v2", ["Varchar", 25]]}, {"expression": {"value": {"expression": "iuref", "iu": "v17"}}, "iu": ["v4", ["Numeric", 12, 2]]}, {"expression": {"value": {"expression": "iuref", "iu": "v16"}}, "iu": ["v7", ["Char", 15]]}, {"expression": {"value": {"expression": "iuref", "iu": "v20"}}, "iu": ["v5", ["Char", 25]]}, {"expression": {"value": {"expression": "iuref", "iu": "v14"}}, "iu": ["v6", ["Varchar", 40]]}, {"expression": {"value": {"expression": "iuref", "iu": "v18"}}, "iu": ["v8", ["Varchar", 117]]}],
101101
"groupingSets": [{"keyIndices": [0, 1, 2, 3, 4, 5, 6], "coreIndices": [0, 1, 2, 3, 4, 5, 6], "behavior": "regular"}],
102102
"emptyGroups": false,
103103
"aggExpressions": [{"value": {"expression": "mul", "left": {"expression": "sub", "left": {"expression": "const", "value": {"type": ["Integer"], "value": 1}}, "right": {"expression": "iuref", "iu": "v23"}}, "right": {"expression": "iuref", "iu": "v22"}}}],
104104
"aggregates": [{"source": 0, "operation": {"aggregate": "sum"}, "iu": ["v3", ["BigNumeric", 38, 4]]}],
105-
"analyze": {"pipeline": 2, "tuplecount": 8, "memory-bytes": 18456, "execution-time": 13780}
105+
"analyze": {"pipeline": 2, "tuple-count": 8, "memory-bytes": 18456, "execution-time": 13780}
106106
},
107-
"analyze": {"pipeline": 1, "tuplecount": 8, "memory-bytes": 1672, "execution-time": 681}
107+
"analyze": {"pipeline": 1, "tuple-count": 8, "memory-bytes": 1672, "execution-time": 681}
108108
},
109109
"analyze": {}
110110
}

standalone-app/examples/hyper/tpch/tpch-q11-analyze.plan.json

+15-15
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"debugName": {"classification": "nonsensitive", "value": "nation"},
5252
"restrictions": [{"attribute": 1, "mode": "=", "value": {"expression": "const", "value": {"type": ["Char", 25], "value": "GERMANY"}}}],
5353
"selectivity": 0.04,
54-
"analyze": {"pipeline": 6, "tuplecount": 1, "execution-time": 20774}
54+
"analyze": {"pipeline": 6, "tuple-count": 1, "execution-time": 20774}
5555
},
5656
"right": {
5757
"operator": "tablescan",
@@ -64,10 +64,10 @@
6464
"debugName": {"classification": "nonsensitive", "value": "supplier"},
6565
"earlyProbes": [{"builder": 7, "attributes": [3], "type": "lookup"}],
6666
"selectivity": 1,
67-
"analyze": {"pipeline": 5, "tuplecount": 19, "execution-time": 16274}
67+
"analyze": {"pipeline": 5, "tuple-count": 19, "execution-time": 16274}
6868
},
6969
"condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v6"}, "right": {"expression": "iuref", "iu": "v3"}},
70-
"analyze": {"pipeline": 5, "tuplecount": 19, "memory-bytes": 18456}
70+
"analyze": {"pipeline": 5, "tuple-count": 19, "memory-bytes": 18456}
7171
},
7272
"right": {
7373
"operator": "tablescan",
@@ -80,19 +80,19 @@
8080
"debugName": {"classification": "nonsensitive", "value": "partsupp"},
8181
"earlyProbes": [{"builder": 6, "attributes": [1], "type": "lookup"}],
8282
"selectivity": 1,
83-
"analyze": {"pipeline": 4, "tuplecount": 24, "execution-time": 29464}
83+
"analyze": {"pipeline": 4, "tuple-count": 24, "execution-time": 29464}
8484
},
8585
"condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v7"}, "right": {"expression": "iuref", "iu": "v5"}},
86-
"analyze": {"pipeline": 4, "tuplecount": 21, "memory-bytes": 18456}
86+
"analyze": {"pipeline": 4, "tuple-count": 21, "memory-bytes": 18456}
8787
},
8888
"groupingSets": [{"keyIndices": [], "coreIndices": null, "behavior": "static"}],
8989
"emptyGroups": true,
9090
"aggExpressions": [{"value": {"expression": "mul", "left": {"expression": "iuref", "iu": "v9"}, "right": {"expression": "iuref", "iu": "v8"}}}],
9191
"aggregates": [{"source": 0, "operation": {"aggregate": "sum"}, "iu": ["v10", ["BigNumeric", 38, 2, "nullable"]]}],
92-
"analyze": {"pipeline": 3, "tuplecount": 1, "memory-bytes": 0, "execution-time": 2664}
92+
"analyze": {"pipeline": 3, "tuple-count": 1, "memory-bytes": 0, "execution-time": 2664}
9393
},
9494
"values": [{"iu": ["v11", ["BigNumeric", 38, 4, "nullable"]], "value": {"expression": "mul", "left": {"expression": "iuref", "iu": "v10"}, "right": {"expression": "const", "value": {"type": ["Numeric", 5, 4], "value": 1}}}}],
95-
"analyze": {"pipeline": 3, "tuplecount": 1}
95+
"analyze": {"pipeline": 3, "tuple-count": 1}
9696
},
9797
"right": {
9898
"operator": "groupby",
@@ -123,7 +123,7 @@
123123
"restrictions": [{"attribute": 1, "mode": "=", "value": {"expression": "const", "value": {"type": ["Char", 25], "value": "GERMANY"}}}],
124124
"earlyProbes": [{"builder": 3, "attributes": [], "type": "lookup"}],
125125
"selectivity": 0.04,
126-
"analyze": {"pipeline": 9, "tuplecount": 1, "execution-time": 4371}
126+
"analyze": {"pipeline": 9, "tuple-count": 1, "execution-time": 4371}
127127
},
128128
"right": {
129129
"operator": "tablescan",
@@ -136,10 +136,10 @@
136136
"debugName": {"classification": "nonsensitive", "value": "supplier"},
137137
"earlyProbes": [{"builder": 13, "attributes": [3], "type": "lookup"}],
138138
"selectivity": 1,
139-
"analyze": {"pipeline": 8, "tuplecount": 19, "execution-time": 17508}
139+
"analyze": {"pipeline": 8, "tuple-count": 19, "execution-time": 17508}
140140
},
141141
"condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v15"}, "right": {"expression": "iuref", "iu": "v12"}},
142-
"analyze": {"pipeline": 8, "tuplecount": 19, "memory-bytes": 18456}
142+
"analyze": {"pipeline": 8, "tuple-count": 19, "memory-bytes": 18456}
143143
},
144144
"right": {
145145
"operator": "tablescan",
@@ -152,22 +152,22 @@
152152
"debugName": {"classification": "nonsensitive", "value": "partsupp"},
153153
"earlyProbes": [{"builder": 12, "attributes": [1], "type": "lookup"}],
154154
"selectivity": 1,
155-
"analyze": {"pipeline": 7, "tuplecount": 24, "execution-time": 46089}
155+
"analyze": {"pipeline": 7, "tuple-count": 24, "execution-time": 46089}
156156
},
157157
"condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v17"}, "right": {"expression": "iuref", "iu": "v14"}},
158-
"analyze": {"pipeline": 7, "tuplecount": 21, "memory-bytes": 18456}
158+
"analyze": {"pipeline": 7, "tuple-count": 21, "memory-bytes": 18456}
159159
},
160160
"keyExpressions": [{"expression": {"value": {"expression": "iuref", "iu": "v16"}}, "iu": ["v", ["Integer"]]}],
161161
"groupingSets": [{"keyIndices": [0], "coreIndices": [0], "behavior": "regular"}],
162162
"emptyGroups": false,
163163
"aggExpressions": [{"value": {"expression": "mul", "left": {"expression": "iuref", "iu": "v19"}, "right": {"expression": "iuref", "iu": "v18"}}}],
164164
"aggregates": [{"source": 0, "operation": {"aggregate": "sum"}, "iu": ["v2", ["BigNumeric", 38, 2]]}],
165-
"analyze": {"pipeline": 2, "tuplecount": 21, "memory-bytes": 18456, "execution-time": 14244}
165+
"analyze": {"pipeline": 2, "tuple-count": 21, "memory-bytes": 18456, "execution-time": 14244}
166166
},
167167
"condition": {"expression": "comparison", "mode": ">", "left": {"expression": "iuref", "iu": "v2"}, "right": {"expression": "iuref", "iu": "v11"}},
168-
"analyze": {"pipeline": 2, "tuplecount": 21, "memory-bytes": 18456}
168+
"analyze": {"pipeline": 2, "tuple-count": 21, "memory-bytes": 18456}
169169
},
170-
"analyze": {"pipeline": 1, "tuplecount": 21, "memory-bytes": 728, "execution-time": 691}
170+
"analyze": {"pipeline": 1, "tuple-count": 21, "memory-bytes": 728, "execution-time": 691}
171171
},
172172
"analyze": {}
173173
}

standalone-app/examples/hyper/tpch/tpch-q12-analyze.plan.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"restrictions": [{"attribute": 12, "mode": "[)", "value": {"expression": "const", "value": {"type": ["Date"], "value": 2449354}}, "value2": {"expression": "const", "value": {"type": ["Date"], "value": 2449719}}}, {"attribute": 14, "mode": "lambda", "value": {"expression": "quantor", "mode": "=some", "value": {"expression": "iuref", "iu": "v8"}, "set": [{"expression": "const", "value": {"type": ["Char", 10], "value": "MAIL"}}, {"expression": "const", "value": {"type": ["Char", 10], "value": "SHIP"}}]}, "value2": null}],
3535
"residuals": [{"expression": "comparison", "mode": "<", "left": {"expression": "iuref", "iu": "v6"}, "right": {"expression": "iuref", "iu": "v7"}}, {"expression": "comparison", "mode": "<", "left": {"expression": "iuref", "iu": "v5"}, "right": {"expression": "iuref", "iu": "v6"}}],
3636
"selectivity": 0.0458916,
37-
"analyze": {"pipeline": 4, "tuplecount": 2, "execution-time": 73445}
37+
"analyze": {"pipeline": 4, "tuple-count": 2, "execution-time": 73445}
3838
},
3939
"right": {
4040
"operator": "tablescan",
@@ -47,19 +47,19 @@
4747
"debugName": {"classification": "nonsensitive", "value": "orders"},
4848
"earlyProbes": [{"builder": 4, "attributes": [0], "type": "lookup"}],
4949
"selectivity": 1,
50-
"analyze": {"pipeline": 3, "tuplecount": 3, "execution-time": 23183}
50+
"analyze": {"pipeline": 3, "tuple-count": 3, "execution-time": 23183}
5151
},
5252
"condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v9"}, "right": {"expression": "iuref", "iu": "v4"}},
53-
"analyze": {"pipeline": 3, "tuplecount": 2, "memory-bytes": 18456}
53+
"analyze": {"pipeline": 3, "tuple-count": 2, "memory-bytes": 18456}
5454
},
5555
"keyExpressions": [{"expression": {"value": {"expression": "iuref", "iu": "v8"}}, "iu": ["v", ["Char", 10]]}],
5656
"groupingSets": [{"keyIndices": [0], "coreIndices": [0], "behavior": "regular"}],
5757
"emptyGroups": false,
5858
"aggExpressions": [{"value": {"expression": "simplecase", "value": {"expression": "iuref", "iu": "v10"}, "cases": [{"cases": [{"expression": "const", "value": {"type": ["Varchar"], "value": "1-URGENT"}}, {"expression": "const", "value": {"type": ["Varchar"], "value": "2-HIGH"}}], "value": {"expression": "const", "value": {"type": ["Integer"], "value": 1}}}], "else": {"expression": "const", "value": {"type": ["Integer"], "value": 0}}}}, {"value": {"expression": "case", "cases": [{"case": {"expression": "and", "arguments": [{"expression": "comparison", "mode": "<>", "left": {"expression": "iuref", "iu": "v10"}, "right": {"expression": "const", "value": {"type": ["Char", 15], "value": "1-URGENT"}}}, {"expression": "comparison", "mode": "<>", "left": {"expression": "iuref", "iu": "v10"}, "right": {"expression": "const", "value": {"type": ["Char", 15], "value": "2-HIGH"}}}]}, "value": {"expression": "const", "value": {"type": ["Integer"], "value": 1}}}], "else": {"expression": "const", "value": {"type": ["Integer"], "value": 0}}}}],
5959
"aggregates": [{"source": 1, "operation": {"aggregate": "sum"}, "iu": ["v3", ["BigInt"]]}, {"source": 0, "operation": {"aggregate": "sum"}, "iu": ["v2", ["BigInt"]]}],
60-
"analyze": {"pipeline": 2, "tuplecount": 2, "memory-bytes": 18456, "execution-time": 11998}
60+
"analyze": {"pipeline": 2, "tuple-count": 2, "memory-bytes": 18456, "execution-time": 11998}
6161
},
62-
"analyze": {"pipeline": 1, "tuplecount": 2, "memory-bytes": 168, "execution-time": 692}
62+
"analyze": {"pipeline": 1, "tuple-count": 2, "memory-bytes": 168, "execution-time": 692}
6363
},
6464
"analyze": {}
6565
}

0 commit comments

Comments
 (0)