Rename tuplecount -> tuple-count (#110)

To mirror recent upstream changes in Hyper

Author: vogelsgesang

query-graphs/src/hyper.ts

@@ -231,7 +231,11 @@ function convertHyperNode(rawNode: Json, parentKey, conversionState: ConversionS
         // Display the cardinality on the links between the nodes
         if (hasOwnProperty(rawNode, "cardinality") && typeof rawNode.cardinality === "number") {
             const estimatedCard = rawNode.cardinality;
-            const actualCard = tryGetPropertyPath(rawNode, ["analyze", "tuplecount"]);
+            let actualCard = tryGetPropertyPath(rawNode, ["analyze", "tuple-count"]);
+            if (actualCard === undefined) {
+                // Backwards-compat: until recently, this was `tuple-count`, not `tuple-count`
+                actualCard = tryGetPropertyPath(rawNode, ["analyze", "tuple-count"]);
+            }
             if (typeof actualCard === "number") {
                 conversionState.edgeWidths.push({node: convertedNode, width: actualCard});
                 convertedNode.edgeLabel = formatMetric(actualCard) + "/" + formatMetric(estimatedCard);

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

@@ -27,16 +27,16 @@
         "debugName": {"classification": "nonsensitive", "value": "lineitem"},
         "restrictions": [{"attribute": 10, "mode": "<=", "value": {"expression": "const", "value": {"type": ["Date"], "value": 2451059}}}],
         "selectivity": 0.993007,
-        "analyze": {"pipeline": 3, "tuplecount": 568, "execution-time": 105670}
+        "analyze": {"pipeline": 3, "tuple-count": 568, "execution-time": 105670}
       },
       "keyExpressions": [{"expression": {"value": {"expression": "iuref", "iu": "v15"}}, "iu": ["v", ["Char1"]]}, {"expression": {"value": {"expression": "iuref", "iu": "v16"}}, "iu": ["v2", ["Char1"]]}],
       "groupingSets": [{"keyIndices": [0, 1], "coreIndices": [0, 1], "behavior": "regular"}],
       "emptyGroups": false,
       "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"}}],
       "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]]}],
-      "analyze": {"pipeline": 2, "tuplecount": 4, "memory-bytes": 18456, "execution-time": 10756}
+      "analyze": {"pipeline": 2, "tuple-count": 4, "memory-bytes": 18456, "execution-time": 10756}
     },
-    "analyze": {"pipeline": 1, "tuplecount": 4, "memory-bytes": 872, "execution-time": 452}
+    "analyze": {"pipeline": 1, "tuple-count": 4, "memory-bytes": 872, "execution-time": 452}
   },
   "analyze": {}
 }

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

@@ -46,7 +46,7 @@
               "debugName": {"classification": "nonsensitive", "value": "orders"},
               "restrictions": [{"attribute": 4, "mode": "[)", "value": {"expression": "const", "value": {"type": ["Date"], "value": 2449262}}, "value2": {"expression": "const", "value": {"type": ["Date"], "value": 2449354}}}],
               "selectivity": 0.0703125,
-              "analyze": {"pipeline": 6, "tuplecount": 9, "execution-time": 26758}
+              "analyze": {"pipeline": 6, "tuple-count": 9, "execution-time": 26758}
             },
             "right": {
               "operator": "tablescan",
@@ -59,10 +59,10 @@
               "debugName": {"classification": "nonsensitive", "value": "customer"},
               "earlyProbes": [{"builder": 6, "attributes": [0], "type": "lookup"}],
               "selectivity": 1,
-              "analyze": {"pipeline": 5, "tuplecount": 9, "execution-time": 27623}
+              "analyze": {"pipeline": 5, "tuple-count": 9, "execution-time": 27623}
             },
             "condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v12"}, "right": {"expression": "iuref", "iu": "v10"}},
-            "analyze": {"pipeline": 5, "tuplecount": 9, "memory-bytes": 18456}
+            "analyze": {"pipeline": 5, "tuple-count": 9, "memory-bytes": 18456}
           },
           "right": {
             "operator": "tablescan",
@@ -75,10 +75,10 @@
             "debugName": {"classification": "nonsensitive", "value": "nation"},
             "earlyProbes": [{"builder": 5, "attributes": [0], "type": "lookup"}],
             "selectivity": 1,
-            "analyze": {"pipeline": 4, "tuplecount": 9, "execution-time": 37544}
+            "analyze": {"pipeline": 4, "tuple-count": 9, "execution-time": 37544}
           },
           "condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v15"}, "right": {"expression": "iuref", "iu": "v19"}},
-          "analyze": {"pipeline": 4, "tuplecount": 9, "memory-bytes": 18456}
+          "analyze": {"pipeline": 4, "tuple-count": 9, "memory-bytes": 18456}
         },
         "right": {
           "operator": "tablescan",
@@ -92,19 +92,19 @@
           "restrictions": [{"attribute": 8, "mode": "=", "value": {"expression": "const", "value": {"type": ["Char1"], "value": 82}}}],
           "earlyProbes": [{"builder": 4, "attributes": [0], "type": "lookup"}],
           "selectivity": 0.265734,
-          "analyze": {"pipeline": 3, "tuplecount": 25, "execution-time": 39892}
+          "analyze": {"pipeline": 3, "tuple-count": 25, "execution-time": 39892}
         },
         "condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v21"}, "right": {"expression": "iuref", "iu": "v9"}},
-        "analyze": {"pipeline": 3, "tuplecount": 23, "memory-bytes": 18456}
+        "analyze": {"pipeline": 3, "tuple-count": 23, "memory-bytes": 18456}
       },
       "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]]}],
       "groupingSets": [{"keyIndices": [0, 1, 2, 3, 4, 5, 6], "coreIndices": [0, 1, 2, 3, 4, 5, 6], "behavior": "regular"}],
       "emptyGroups": false,
       "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"}}}],
       "aggregates": [{"source": 0, "operation": {"aggregate": "sum"}, "iu": ["v3", ["BigNumeric", 38, 4]]}],
-      "analyze": {"pipeline": 2, "tuplecount": 8, "memory-bytes": 18456, "execution-time": 13780}
+      "analyze": {"pipeline": 2, "tuple-count": 8, "memory-bytes": 18456, "execution-time": 13780}
     },
-    "analyze": {"pipeline": 1, "tuplecount": 8, "memory-bytes": 1672, "execution-time": 681}
+    "analyze": {"pipeline": 1, "tuple-count": 8, "memory-bytes": 1672, "execution-time": 681}
   },
   "analyze": {}
 }

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

@@ -51,7 +51,7 @@
                 "debugName": {"classification": "nonsensitive", "value": "nation"},
                 "restrictions": [{"attribute": 1, "mode": "=", "value": {"expression": "const", "value": {"type": ["Char", 25], "value": "GERMANY"}}}],
                 "selectivity": 0.04,
-                "analyze": {"pipeline": 6, "tuplecount": 1, "execution-time": 20774}
+                "analyze": {"pipeline": 6, "tuple-count": 1, "execution-time": 20774}
               },
               "right": {
                 "operator": "tablescan",
@@ -64,10 +64,10 @@
                 "debugName": {"classification": "nonsensitive", "value": "supplier"},
                 "earlyProbes": [{"builder": 7, "attributes": [3], "type": "lookup"}],
                 "selectivity": 1,
-                "analyze": {"pipeline": 5, "tuplecount": 19, "execution-time": 16274}
+                "analyze": {"pipeline": 5, "tuple-count": 19, "execution-time": 16274}
               },
               "condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v6"}, "right": {"expression": "iuref", "iu": "v3"}},
-              "analyze": {"pipeline": 5, "tuplecount": 19, "memory-bytes": 18456}
+              "analyze": {"pipeline": 5, "tuple-count": 19, "memory-bytes": 18456}
             },
             "right": {
               "operator": "tablescan",
@@ -80,19 +80,19 @@
               "debugName": {"classification": "nonsensitive", "value": "partsupp"},
               "earlyProbes": [{"builder": 6, "attributes": [1], "type": "lookup"}],
               "selectivity": 1,
-              "analyze": {"pipeline": 4, "tuplecount": 24, "execution-time": 29464}
+              "analyze": {"pipeline": 4, "tuple-count": 24, "execution-time": 29464}
             },
             "condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v7"}, "right": {"expression": "iuref", "iu": "v5"}},
-            "analyze": {"pipeline": 4, "tuplecount": 21, "memory-bytes": 18456}
+            "analyze": {"pipeline": 4, "tuple-count": 21, "memory-bytes": 18456}
           },
           "groupingSets": [{"keyIndices": [], "coreIndices": null, "behavior": "static"}],
           "emptyGroups": true,
           "aggExpressions": [{"value": {"expression": "mul", "left": {"expression": "iuref", "iu": "v9"}, "right": {"expression": "iuref", "iu": "v8"}}}],
           "aggregates": [{"source": 0, "operation": {"aggregate": "sum"}, "iu": ["v10", ["BigNumeric", 38, 2, "nullable"]]}],
-          "analyze": {"pipeline": 3, "tuplecount": 1, "memory-bytes": 0, "execution-time": 2664}
+          "analyze": {"pipeline": 3, "tuple-count": 1, "memory-bytes": 0, "execution-time": 2664}
         },
         "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}}}}],
-        "analyze": {"pipeline": 3, "tuplecount": 1}
+        "analyze": {"pipeline": 3, "tuple-count": 1}
       },
       "right": {
         "operator": "groupby",
@@ -123,7 +123,7 @@
               "restrictions": [{"attribute": 1, "mode": "=", "value": {"expression": "const", "value": {"type": ["Char", 25], "value": "GERMANY"}}}],
               "earlyProbes": [{"builder": 3, "attributes": [], "type": "lookup"}],
               "selectivity": 0.04,
-              "analyze": {"pipeline": 9, "tuplecount": 1, "execution-time": 4371}
+              "analyze": {"pipeline": 9, "tuple-count": 1, "execution-time": 4371}
             },
             "right": {
               "operator": "tablescan",
@@ -136,10 +136,10 @@
               "debugName": {"classification": "nonsensitive", "value": "supplier"},
               "earlyProbes": [{"builder": 13, "attributes": [3], "type": "lookup"}],
               "selectivity": 1,
-              "analyze": {"pipeline": 8, "tuplecount": 19, "execution-time": 17508}
+              "analyze": {"pipeline": 8, "tuple-count": 19, "execution-time": 17508}
             },
             "condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v15"}, "right": {"expression": "iuref", "iu": "v12"}},
-            "analyze": {"pipeline": 8, "tuplecount": 19, "memory-bytes": 18456}
+            "analyze": {"pipeline": 8, "tuple-count": 19, "memory-bytes": 18456}
           },
           "right": {
             "operator": "tablescan",
@@ -152,22 +152,22 @@
             "debugName": {"classification": "nonsensitive", "value": "partsupp"},
             "earlyProbes": [{"builder": 12, "attributes": [1], "type": "lookup"}],
             "selectivity": 1,
-            "analyze": {"pipeline": 7, "tuplecount": 24, "execution-time": 46089}
+            "analyze": {"pipeline": 7, "tuple-count": 24, "execution-time": 46089}
           },
           "condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v17"}, "right": {"expression": "iuref", "iu": "v14"}},
-          "analyze": {"pipeline": 7, "tuplecount": 21, "memory-bytes": 18456}
+          "analyze": {"pipeline": 7, "tuple-count": 21, "memory-bytes": 18456}
         },
         "keyExpressions": [{"expression": {"value": {"expression": "iuref", "iu": "v16"}}, "iu": ["v", ["Integer"]]}],
         "groupingSets": [{"keyIndices": [0], "coreIndices": [0], "behavior": "regular"}],
         "emptyGroups": false,
         "aggExpressions": [{"value": {"expression": "mul", "left": {"expression": "iuref", "iu": "v19"}, "right": {"expression": "iuref", "iu": "v18"}}}],
         "aggregates": [{"source": 0, "operation": {"aggregate": "sum"}, "iu": ["v2", ["BigNumeric", 38, 2]]}],
-        "analyze": {"pipeline": 2, "tuplecount": 21, "memory-bytes": 18456, "execution-time": 14244}
+        "analyze": {"pipeline": 2, "tuple-count": 21, "memory-bytes": 18456, "execution-time": 14244}
       },
       "condition": {"expression": "comparison", "mode": ">", "left": {"expression": "iuref", "iu": "v2"}, "right": {"expression": "iuref", "iu": "v11"}},
-      "analyze": {"pipeline": 2, "tuplecount": 21, "memory-bytes": 18456}
+      "analyze": {"pipeline": 2, "tuple-count": 21, "memory-bytes": 18456}
     },
-    "analyze": {"pipeline": 1, "tuplecount": 21, "memory-bytes": 728, "execution-time": 691}
+    "analyze": {"pipeline": 1, "tuple-count": 21, "memory-bytes": 728, "execution-time": 691}
   },
   "analyze": {}
 }

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

@@ -34,7 +34,7 @@
           "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}],
           "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"}}],
           "selectivity": 0.0458916,
-          "analyze": {"pipeline": 4, "tuplecount": 2, "execution-time": 73445}
+          "analyze": {"pipeline": 4, "tuple-count": 2, "execution-time": 73445}
         },
         "right": {
           "operator": "tablescan",
@@ -47,19 +47,19 @@
           "debugName": {"classification": "nonsensitive", "value": "orders"},
           "earlyProbes": [{"builder": 4, "attributes": [0], "type": "lookup"}],
           "selectivity": 1,
-          "analyze": {"pipeline": 3, "tuplecount": 3, "execution-time": 23183}
+          "analyze": {"pipeline": 3, "tuple-count": 3, "execution-time": 23183}
         },
         "condition": {"expression": "comparison", "mode": "=", "left": {"expression": "iuref", "iu": "v9"}, "right": {"expression": "iuref", "iu": "v4"}},
-        "analyze": {"pipeline": 3, "tuplecount": 2, "memory-bytes": 18456}
+        "analyze": {"pipeline": 3, "tuple-count": 2, "memory-bytes": 18456}
       },
       "keyExpressions": [{"expression": {"value": {"expression": "iuref", "iu": "v8"}}, "iu": ["v", ["Char", 10]]}],
       "groupingSets": [{"keyIndices": [0], "coreIndices": [0], "behavior": "regular"}],
       "emptyGroups": false,
       "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}}}}],
       "aggregates": [{"source": 1, "operation": {"aggregate": "sum"}, "iu": ["v3", ["BigInt"]]}, {"source": 0, "operation": {"aggregate": "sum"}, "iu": ["v2", ["BigInt"]]}],
-      "analyze": {"pipeline": 2, "tuplecount": 2, "memory-bytes": 18456, "execution-time": 11998}
+      "analyze": {"pipeline": 2, "tuple-count": 2, "memory-bytes": 18456, "execution-time": 11998}
     },
-    "analyze": {"pipeline": 1, "tuplecount": 2, "memory-bytes": 168, "execution-time": 692}
+    "analyze": {"pipeline": 1, "tuple-count": 2, "memory-bytes": 168, "execution-time": 692}
   },
   "analyze": {}
 }