diff --git a/pkg/sql/distsql_physical_planner_test.go b/pkg/sql/distsql_physical_planner_test.go
index abe5a93c55dc..91139cc44d91 100644
--- a/pkg/sql/distsql_physical_planner_test.go
+++ b/pkg/sql/distsql_physical_planner_test.go
@@ -396,9 +396,9 @@ func TestDistSQLRangeCachesIntegrationTest(t *testing.T) {
 	if err := row.Scan(&json); err != nil {
 		t.Fatal(err)
 	}
-	exp := `{"nodeNames":["1","4"]`
-	if !strings.HasPrefix(json, exp) {
-		t.Fatalf("expected prefix %s, but json is: %s", exp, json)
+	exp := `"nodeNames":["1","4"]`
+	if !strings.Contains(json, exp) {
+		t.Fatalf("expected json to contain %s, but json is: %s", exp, json)
 	}
 
 	// Run a non-trivial query to force the "wrong range" metadata to flow through
@@ -422,9 +422,9 @@ func TestDistSQLRangeCachesIntegrationTest(t *testing.T) {
 	if err := row.Scan(&json); err != nil {
 		t.Fatal(err)
 	}
-	exp = `{"nodeNames":["1","2","3","4"]`
-	if !strings.HasPrefix(json, exp) {
-		t.Fatalf("expected prefix %q, but json is: %s", exp, json)
+	exp = `"nodeNames":["1","2","3","4"]`
+	if !strings.Contains(json, exp) {
+		t.Fatalf("expected json to contain %s, but json is: %s", exp, json)
 	}
 }
 
@@ -571,14 +571,14 @@ func TestDistSQLDrainingHosts(t *testing.T) {
 	}
 
 	// Verify distribution.
-	expectPlan([][]string{{"https://cockroachdb.github.io/distsqlplan/decode.html#eJyskT9r8zAQh_f3U4Sb8oKCIyddNKV0ylC75A8digmqdRhDIpmTBC3B373YGhKHRE1LR935d8_juyNoozCTB7Qg3oADgxQKBg2ZEq011JXDR0v1AWLKoNaNd125YFAaQhBHcLXbIwjYyPc9rlAqpGQKDBQ6We_70Q3VB0mfC-0PFhisG6mtGE2SDpl7J0aZ0QhFy8B4dyJYJysEwVt2v8VjVRFW0hlK0qHEU77NNrtV_roe_7_JSm-yTgivDSkkVIP5RRu3mQ9t1tvn3TLbjBf8tsxsIMPvXz-_Z_0Jn_xi_d9YnP3w7E_Xf4W1QtsYbfHiDNcnT7vzoKow3NIaTyW-kCl7THjmfa4vKLQudHl4LHVodYLnYR4Np4Mwvwyn0fBDnDyLhufx8PxH2kX77ysAAP__gSRfcA=="}})
+	expectPlan([][]string{{"https://cockroachdb.github.io/distsqlplan/decode.html#eJyskd-Lm0AQx9_7V8g8mbKHWZO-7NMd1xSEnF7Vo4UgYesOIphduz-gJfi_F7WQGBKblj46O9_5fJw5gvneAINss908557TjfcpTV683ebr6_Ypij3_Y5Tl2eftwvvdUionrf9-MfZJdzAFEJBKYMwPaIDtgAKBEAoCrVYlGqN0Xz4OTZH4AWxJoJats325IFAqjcCOYGvbIDDI-bcGU-QCdbAEAgItr5thdKvrA9c_H3suEMhaLg3zHoIemTjLvFhJhKIjoJw9EYzlFQKjHbnf4qmqNFbcKh2EU4nn5C3O92nyJfMXN1nhTdYJ4aTSAjWKyfyim7dZT22yt5d9FOf-I70ts5rI0PvXT-9Zf0Af_mH9f7A4--HVf13_FVaKplXS4MUZrk9e9udBUeF4S6OcLvFVq3LAjJ_JkBsKAo0dX-n4EcnxqRc8D9PZcDgJ08twOBv-ME9ezYbX8-H1X2kX3btfAQAA__9aiHOO"}})
 
 	// Drain the second node and expect the query to be planned on only the
 	// first node.
 	distServer := tc.Server(1).DistSQLServer().(*distsql.ServerImpl)
 	distServer.Drain(ctx, 0 /* flowDrainWait */)
 
-	expectPlan([][]string{{"https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkDFLxEAUhHt_xTGVwsolV26lWF2TSO7EQoKs2UcIJPvCextQjvx3SbbQE060fDM78w17QmBPhRtIYV-QozYYhRtSZVmk9GDv32Ezgy6MU1zk2qBhIdgTYhd7gsXRvfVUkfMk2wwGnqLr-rV2lG5w8nEXpkFhcBhdULu5hUE5RbspOBDq2YCn-NWv0bUEm8_m7xvu21aodZFlm59PeCifiuNrVT4frm8usnb_YVWkIwelM86l5myuDci3lP5UeZKGHoWbFZPOcs2tgieNyc3TsQ_JWgZ-D-e_hnc_wvV89RkAAP__weakAA=="}})
+	expectPlan([][]string{{"https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkM9Kw0AYxO8-xTKnVlba9LgnS60QqElNIgolyJp8hEC6G_cPKCHvLkkErVDR4843M79hO9jXBgLpdrfdZMybht0m8R07bJ_2u3UYsdlNmGbp_W7OPi2F9srNLueTT_mjzcGhdEmRPJKFOCBAztEaXZC12gxSNxrC8g1iyVGr1rtBzjkKbQiig6tdQxDI5EtDCcmSzGIJjpKcrJuxtjX1UZr364EJjrSVygp2BY7YO8EirQh5z6G9--q3TlYEEfT87xvWVWWokk6bRXA6YRM_RNlzEj-ms_lZ1uo_rIRsq5WlE8655mWfc1BZ0fSnVntT0N7oYsRMz3jMjUJJ1k3XYHqEajoNA7-Hg1_Dqx_hvL_4CAAA__-ln7ge"}})
 
 	// Verify correctness.
 	var res int
diff --git a/pkg/sql/distsql_running.go b/pkg/sql/distsql_running.go
index a65cb9bee7cf..cd37b2d5f145 100644
--- a/pkg/sql/distsql_running.go
+++ b/pkg/sql/distsql_running.go
@@ -309,11 +309,10 @@ func (dsp *DistSQLPlanner) Run(
 
 	if logPlanDiagram {
 		log.VEvent(ctx, 1, "creating plan diagram")
-		json, url, err := execinfrapb.GeneratePlanDiagramURL(flows)
+		_, url, err := execinfrapb.GeneratePlanDiagramURL(planCtx.planner.stmt.String(), flows)
 		if err != nil {
 			log.Infof(ctx, "Error generating diagram: %s", err)
 		} else {
-			log.Infof(ctx, "Plan diagram JSON:\n%s", json)
 			log.Infof(ctx, "Plan diagram URL:\n%s", url.String())
 		}
 	}
diff --git a/pkg/sql/execinfrapb/flow_diagram.go b/pkg/sql/execinfrapb/flow_diagram.go
index 00f0ec73b869..b8f0fe5a1847 100644
--- a/pkg/sql/execinfrapb/flow_diagram.go
+++ b/pkg/sql/execinfrapb/flow_diagram.go
@@ -532,6 +532,7 @@ type FlowDiagram interface {
 }
 
 type diagramData struct {
+	SQL        string             `json:"sql"`
 	NodeNames  []string           `json:"nodeNames"`
 	Processors []diagramProcessor `json:"processors"`
 	Edges      []diagramEdge      `json:"edges"`
@@ -561,8 +562,11 @@ func (d *diagramData) AddSpans(spans []tracing.RecordedSpan) {
 	}
 }
 
-func generateDiagramData(flows []FlowSpec, nodeNames []string) (FlowDiagram, error) {
-	d := &diagramData{NodeNames: nodeNames}
+func generateDiagramData(sql string, flows []FlowSpec, nodeNames []string) (FlowDiagram, error) {
+	d := &diagramData{
+		SQL:       sql,
+		NodeNames: nodeNames,
+	}
 
 	// inPorts maps streams to their "destination" attachment point. Only DestProc
 	// and DestInput are set in each diagramEdge value.
@@ -680,7 +684,7 @@ func generateDiagramData(flows []FlowSpec, nodeNames []string) (FlowDiagram, err
 // GeneratePlanDiagram generates the data for a flow diagram. There should be
 // one FlowSpec per node. The function assumes that StreamIDs are unique across
 // all flows.
-func GeneratePlanDiagram(flows map[roachpb.NodeID]*FlowSpec) (FlowDiagram, error) {
+func GeneratePlanDiagram(sql string, flows map[roachpb.NodeID]*FlowSpec) (FlowDiagram, error) {
 	// We sort the flows by node because we want the diagram data to be
 	// deterministic.
 	nodeIDs := make([]int, 0, len(flows))
@@ -697,14 +701,16 @@ func GeneratePlanDiagram(flows map[roachpb.NodeID]*FlowSpec) (FlowDiagram, error
 		nodeNames[i] = n.String()
 	}
 
-	return generateDiagramData(flowSlice, nodeNames)
+	return generateDiagramData(sql, flowSlice, nodeNames)
 }
 
 // GeneratePlanDiagramURL generates the json data for a flow diagram and a
 // URL which encodes the diagram. There should be one FlowSpec per node. The
 // function assumes that StreamIDs are unique across all flows.
-func GeneratePlanDiagramURL(flows map[roachpb.NodeID]*FlowSpec) (string, url.URL, error) {
-	d, err := GeneratePlanDiagram(flows)
+func GeneratePlanDiagramURL(
+	sql string, flows map[roachpb.NodeID]*FlowSpec,
+) (string, url.URL, error) {
+	d, err := GeneratePlanDiagram(sql, flows)
 	if err != nil {
 		return "", url.URL{}, nil
 	}
diff --git a/pkg/sql/execinfrapb/flow_diagram_test.go b/pkg/sql/execinfrapb/flow_diagram_test.go
index 0e6996b0a6ff..ab387492556f 100644
--- a/pkg/sql/execinfrapb/flow_diagram_test.go
+++ b/pkg/sql/execinfrapb/flow_diagram_test.go
@@ -136,13 +136,14 @@ func TestPlanDiagramIndexJoin(t *testing.T) {
 		},
 	}
 
-	json, url, err := GeneratePlanDiagramURL(flows)
+	json, url, err := GeneratePlanDiagramURL("SOME SQL HERE", flows)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	expected := `
 		{
+		  "sql":"SOME SQL HERE",
 		  "nodeNames":["1","2","3"],
 		  "processors":[
 			  {"nodeIdx":0,"inputs":[],"core":{"title":"TableReader/0","details":["SomeIndex@Table","Out: @1,@2"]},"outputs":[],"stage":1},
@@ -162,9 +163,9 @@ func TestPlanDiagramIndexJoin(t *testing.T) {
 
 	compareDiagrams(t, json, expected)
 
-	expectedURL := "https://cockroachdb.github.io/distsqlplan/decode.html#eJy0kjFr8zAQhvfvV3y8awS1pE6aNBXSoSlpt9aDah1B4EhGkiEl-L8XyyWJoSkpaUfd3XvP48N7-GDpwWwpQb2Ag0GAQaJm6GJoKKUQx9Y0uLQ7qIrB-a7PY7lmaEIkqD2yyy1B4dm8tbQmYyneVGCwlI1ry_qnsKWlt7TTZQgMqz6r_5ozLVAPDKHPx8Upmw1B8YGdwPnlcP7rcHE5XPwp_MgM0VIkO6dpsUA9fGF4H5z_FJTzSBfd1sT3g96dazPF0XChxWtfVbLR8qAtzzqLnxxsTakLPtFM5dzmavwgshuaDpBCHxt6jKEpf-T0XJVcKVhKeerK6bH0pVWOehrm14TFNWH5bfh2Fq6Gevj3EQAA__8R3DK5"
+	expectedURL := "https://cockroachdb.github.io/distsqlplan/decode.html#eJy0kkFLwzAUx-9-ivG_LmCbeMqpl4kTdbp50x5q8xiBLqlJCpPS7y5NZVvByWR6zHvv_36_PtrCv1eQWC3uZ5PV093kZracgcFYRQ_FhjzkC1IwcDAI5Ay1syV5b13fauPgXG0hEwZt6ib05ZyhtI4gWwQdKoLEc_FW0ZIKRe4yAYOiUOgqrl_ZDc2Nom0Wh8CwaIKcZCnLOPKOwTZhv9iHYk2QaccO4Onp8PTP4fx0OP9X-J5pnSJHakzL-BR5943hrdXmS1CMI7XTm8J97PSudRXI9YbTjL82SSLKTOy0xVFn_puDLcnX1ngaqRzbnPQfRGpNwwG8bVxJj86W8Y8cnouYiwVFPgxdMTzmJrbiUQ_D6Tlhfk5Y_Bi-GoWTLu8uPgMAAP__nLk4fw=="
 	if url.String() != expectedURL {
-		t.Errorf("expected `%s` got `%s`", expectedURL, &url)
+		t.Errorf("expected `%s` got `%s`", expectedURL, url.String())
 	}
 }
 
@@ -358,7 +359,7 @@ func TestPlanDiagramJoin(t *testing.T) {
 		}},
 	}
 
-	diagram, err := GeneratePlanDiagram(flows)
+	diagram, err := GeneratePlanDiagram("SOME SQL HERE", flows)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -369,6 +370,7 @@ func TestPlanDiagramJoin(t *testing.T) {
 
 	expected := `
 		{
+		  "sql":"SOME SQL HERE",
 			"nodeNames":["1","2","3","4"],
 			"processors":[
 				{"nodeIdx":0,"inputs":[],"core":{"title":"TableReader/0","details":["primary@TableA","Out: @1,@2,@4"]},"outputs":[{"title":"by hash","details":["@1,@2"]}]},
diff --git a/pkg/sql/explain_distsql.go b/pkg/sql/explain_distsql.go
index 7139070dc9a2..6f15e00f4a34 100644
--- a/pkg/sql/explain_distsql.go
+++ b/pkg/sql/explain_distsql.go
@@ -126,7 +126,7 @@ func (n *explainDistSQLNode) startExec(params runParams) error {
 
 	distSQLPlanner.FinalizePlan(planCtx, &plan)
 	flows := plan.GenerateFlowSpecs(params.extendedEvalCtx.NodeID)
-	diagram, err := execinfrapb.GeneratePlanDiagram(flows)
+	diagram, err := execinfrapb.GeneratePlanDiagram(params.p.stmt.String(), flows)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/sql/logictest/testdata/logic_test/dist_vectorize b/pkg/sql/logictest/testdata/logic_test/dist_vectorize
index 495c1aa23017..c582d9a2f9fa 100644
--- a/pkg/sql/logictest/testdata/logic_test/dist_vectorize
+++ b/pkg/sql/logictest/testdata/logic_test/dist_vectorize
@@ -51,12 +51,12 @@ NULL       /1       {5}       5
 query T
 SELECT url FROM [EXPLAIN ANALYZE SELECT count(*) FROM kv]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlcGLm0AUxu_9K-SdtjBWR002O6ctPeXQpCRZeiiyzOrDSo0jM-Oyy5L_vaiFGmlnBgIbjz7z5fs-fg_fG9Qixw0_ogL2AygQiIBADAQSILCAlEAjRYZKCdn9ZBCs8xdgIYGyblrdjVMCmZAI7A10qSsEBgf-VOEOeY4yCIFAjpqXVW_TyPLI5ev9r2cgsG94rZjnB53xttXM24gagcAT19lPVJ5oddONu3C6barJSGGFmS6fS_3KvPBT2HkpzavK0-URmRcqSE8EBsmfrErzAoHRE3Hv87koJBZcCxkszut82T5sDo-77ff9zcfLcuMLZq0uRW3PHv03-9_IbS1kjhLzs7zpydyOTmjtH74-rjeHm3v6fu3is3bUfdOofdOCyA_iK--apdGIxnJ2uxa504gcaMR-kFyZhqXRiMbt7GjE7jRiBxqJ33_drknD0mhEYzU7Gok7jcSBxsK_MgtLnxGLu9mxsNzzHapG1Aont_Hf_xx2NxPzAocDq0QrM_wmRdbbDI_bXtcPclR6eEuHh3U9vOoCjsXUKI7OxHQqjszOFuvYqE7M4uSS3AujeGl2Xl7ifGsUr8zOq0uc78ysQsuamJds6p2ePvwOAAD__0aN3zM=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMld9r4k4Uxd-_f8Vwn_TLuPmptXmqdF0QbOway_4ooUyTixsaM9mZibSI__uSpLAadicBYfUxM3M85_C5eHcgf6bgQTCdT29XpBAp-bRc3JHH6df7-WTmk4k_mX_7PiW9j7NgFXye98n704gXmer936_fv2xDoJDxGH22QQneI1hAwQYKDlBwgcIQQgq54BFKyUX5ZFcJZvEreCaFJMsLVR6HFCIuELwdqESlCB6s2HOKS2QxCsMECjEqlqSVTS6SDRNvNy9boBDkLJMeGRil8aJQHvF5hkDhmanoB0rCC5WXx2U4VeRp40hiipFKtol684j5wSy9pGJpSlSyQY-YEsI9hVrynlUqtkbwrD3t3meyXgtcM8WFMTyuc7t48FdPy8WXoNc_LTe-YlSohGft2e2_Zv8duci4iFFgfJQ33OvbWQ1awcPd08xf9W6sf9fOOWpndZ80q33SDHtgOGeetZZGBzRGFzdrdncadgcazsBwz0yjpdEBjauLo-F0p-F0oOEOqn-3c9JoaXRAY3xxNNzuNNwONIaDM7No6XPA4vriWLTs8yXKnGcSG7vxz79sljsT4zXWC1byQkR4L3hU2dSfi0pXHcQoVX1r1R-zrL4qAx6KLa3YPhJbTbGtd26xdrRqVy92T8k91IpHeufRKc5XWvFY7zw-xflaz8psGRP9kDW9w_1_vwIAAP__n7n0ow==
 
 query T
 SELECT url FROM [EXPLAIN ANALYZE SELECT * FROM kv JOIN kw ON kv.k = kw.k]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzUl89vm0oQx-_vr0Bzek9ZP9gFnBipkq-p1KRKe6t8IDC1UQmLliVNFPl_rzCqUmOzA17Vwjfz47M73_FnpeENCpniXfyEFUTfgAMDAQx8YBAAgxBWDEolE6wqqZpXWuA2fYHIY5AVZa2b2ysGiVQI0RvoTOcIEXyNH3N8wDhF5XrAIEUdZ_lum1JlT7F6Xf54BgZfyrioImfmNhs_xjrZYOXIWpe1jpymIF2XeedWhTkmOnvO9GvkeP97zfqVjvPc0dkTRo5XwWrLoEXasn-X9fjqbOJqs1_QksNqu9qtsUaI-JadlnPek_Pne06XTymp6E36vo5UKSpMu-tcNRsPeutI0z6hWuNHmRWoXN6xI8fv-t8lv_rvg8rWm_YnMLhvWrLkbCnY0mfLwK6H-IJJrTNZ9PXxvUf-gB7VxbH8R6PfyZksXR7uh-5GCQ-jhPZRgr0ofLjYnD7Arpi5_mTE5qcmvR5whCeVVPQmPeMR5pd0hMVwG8QA7_2Za5nkr3k_IunNAO8nlVT0Jj2j9-KSvPeH2-AP8D6YueFkbOCnJl0M8H5SSUVv0jN671-S98FwG4IB3oezybjAT80Z0tbPXO7ERepwR-oNqslkFr2Zz-h_cEn-Ex-wD1iVsqiw8-lyfGWvaQ2ma2wbXslaJfhZyWS3TXt5v-N2s2iKlW6fivbitmgfNQUOh-c28MIG5lZ189BM8xEtE-PguQ28sIG5Vd2dlh3Qokt7f9K-ud--Eeb7PfO6dGAjuBkmBDfDhOBmmBKcoAnBQxvBzTAhuBkmBDfDlOAETQg-txH82kZRM0woaoYJRc0wpShBE4re2ChqhglFzTChqBmmFCVoQtGFjaLcak4gaEJSgiYsJWhKUwqnZgW7YcFuWrAbFyznBbuBgVtNDPxgZBhlq5mmbDXTlK1mmrSVwClbxwxLh__ZmGlpLE3ZOmpeGo1Tth4MD0ZbV9t_fgUAAP__VILF4Q==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzUl99P6kgUx9_3r5icJ10H2-kPlCYmmF02wSC44sPuGh4qnYWG2nbbKWoM__um9N54KTCnZXJJeZN2PjPne_xMcvoJ6X8BODDuDXq_PZEsCcgfj6N78tz762Fw2x-S2-Ht4O9_euTs9_74afzn4Jx8W_prsXCxJHej_pAs3shoSBbLywW5IYu3y8UEKISRx4fuK0_BeQYGFAygYAIFCyjYMKEQJ9GUp2mU5Es-10DfewdHp-CHcSbyxxMK0yjh4HyC8EXAwYEn9yXgj9z1eKLpQMHjwvWD9TFx4r-6yUd3sQQK49gNU4e0tPzgF1dM5zwlUSbiTDgkL0hkcVB6lPKAT4W_9MWHQ_RLPd8_FW4QEOG_cofoKUxWFAqkKPt7WS8fZO6m882Cugwmq8l6jxkHh63oYTnbe3K-feXUWJOSGnuTfu0TJR5PuFfe5yI_uNKqHU2758mM30V-yBONlewI-L_irMsuzm8SfzYv_gQKo7wlXUa7Bu2atGup9ZC_82km_Cjc18evHpkVepSFu_LvjD6MWlGsMXszdDmKvR3FVo9ibURh1cVm-AXWjJZmNkZsdmjSqwpXuFFJjb1Jj3iF2SldYaO6DUYF782Wppjkp3lfI-l1Be8bldTYm_SI3hun5L1Z3QazgvdWS7MbYwM7NGmngveNSmrsTXpE781T8t6qboNVwXu71RgX2KE5bdz6lsaIG3qEkUjMedKYzMbezEf03zol_5EP2EeexlGY8tKny-6d9bw13JvxouFplCVT_pBE0_Uxxc_RmlvPoh5PRfHWKH70w-JVXmB1uK0Cd1RgplQ3s-U0q9Eyox7cVoE7KjBTqrvUsi3aKNP6j7Qp77cphdlmz_QybakILocRweUwIrgcxgRHaERwW0VwOYwILocRweUwJjhCI4K3VQS_UlFUDiOKymFEUTmMKYrQiKLXKorKYURROYwoKocxRREaUbSjoihTmhMQGpEUoRFLERrTFMOxWUFtWFCbFtTGBcV5QW1gYEoTA9saGWrZKqcxW-U0ZqucRm1FcMzWOsPS9v-szrRUl8ZsrTUv1cYxW7eGB6mtk9Uv_wcAAP__2fbfeA==
 
 # Verify execution.
 statement ok
diff --git a/pkg/sql/logictest/testdata/logic_test/exec_merge_join b/pkg/sql/logictest/testdata/logic_test/exec_merge_join
index dfe077e55b39..6f6c15f63e46 100644
--- a/pkg/sql/logictest/testdata/logic_test/exec_merge_join
+++ b/pkg/sql/logictest/testdata/logic_test/exec_merge_join
@@ -60,7 +60,7 @@ INSERT INTO t VALUES (1), (2), (3)
 query T
 SELECT url FROM [EXPLAIN ANALYZE SELECT t1.k FROM t AS t1, t AS t2 WHERE t1.k = t2.k]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMkkFLw0AQhe_-ijAnxdUm6W1B6LWCVqo3yWGbfaYL292wO5GWkv8uSQTbUi3Vi7fMm_km816yJec1HtUKkeQrZVQIqoMvEaMPnTQMTPWaZCrIuLrhTi4ElT6A5JbYsAVJelELizmURhilJEiDlbH92jqYlQqbCZOg51q5KJMbErRQXC4RE99w3bBMMhLETW13pDEJirAo2bwb3sgkvU275ZGVtQmbFWSSRipaQQPyeVxkVYFk1orfGcj-iYH8WwNfdzfOB40AvXdz0ZGnRo6k8IBQ4d4bhzDK91OweOPLSXZ9dRdMtRweSdCs8znJ_pYH1igbNt6dzmR8zkedI9beRRxmc3Rz2gUCXWEIOPomlHgKvuxfM5SznusFjchDNx-Kqetb_V-3C2dnwPkhnP8Ij_fgtC3ai48AAAD__7J0Qt8=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMkk9r20AQxe_9FMOcErp1tPJtIWDTqtTFsVPL0D9Bh400dZasteruqCQYffciraFxSBvcXnLbnXm_0byn3WH4YVFhns2zt2tovYX3q-UFXGVfLufT2QKmi-n867cMTt7N8nX-aX4KeynL0W3UMkxzYCn2hxQ-f8hWWRScA6ej2wIF1q6ihd5SQHWFEguBjXclheB8X9oNgll1hyoRaOqm5b5cCCydJ1Q7ZMOWUOFaX1taka7InyUosCLWxg5jG2-22t9PGAXmja6Dgjco8FpzeUMBXMtNywokCuS2sQ9KYxQYyFLJ5qfhewXJKOmHB9bWApstKUgCFp3AiOyXC6w3hEp24t8MyBdiIP2jgd97t7XzFXmqDnYuevI5yRMpXJDf0EdnavJn6WEKlr7zyUS-Pj33ZnMTjyhw2fucyP_Lg-6obNm4-vlMxsf81BWFxtWBHmfz5OSkD4SqDcWAg2t9SZfelcNn4nU5cEOhosCxm8bLrB5aw6t7CMsj4PQxnP4VHh_ASVd0r34FAAD___kkXuQ=
 
 statement ok
 RESET vectorize; RESET vectorize_row_count_threshold
diff --git a/pkg/sql/logictest/testdata/logic_test/exec_merge_join_dist b/pkg/sql/logictest/testdata/logic_test/exec_merge_join_dist
index cc1b7d1fdf06..4a5b94c88aaf 100644
--- a/pkg/sql/logictest/testdata/logic_test/exec_merge_join_dist
+++ b/pkg/sql/logictest/testdata/logic_test/exec_merge_join_dist
@@ -45,7 +45,7 @@ NULL       /2       {3}       3
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM l LEFT OUTER JOIN r USING(a) WHERE a = 2]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzEk8Fro0AUxu_7V8jbyy47QWfiXgYWvGQhYTeW1J6Kh4nzagTjyMwIDcH_vaiFVGtsQkt7c2be73vvex8eoVAS12KPBvg9UCDAICZQapWgMUo3113RUj4C9whkRVnZ5jomkCiNwI9gM5sjcIjENscNConabbQkWpHlrXSps73Qh0ADgdtSFIY7Lpu5zP0OcU1AVfZZ9qS2PTg7YXZ9nYBCXMcEjBUpAmc1OTPeSacqlJaoUfaU4oZ8q2TE43_UKa5UVqB25_3ZokOJ3Pm3-Bs54V202DircLkGAjk-2B8B_fXzj87SXfcJBMLKciegJGAk8AdbODmcv8PhyPhrNVOl6w9XMdra77Wml2fvjWeff2z29Ox4n5E9-9LsR4bboClVYfCiaL3GHsoUu3UZVekEb7RK2jbdMWy5drMSje1e_e6wLNqn9ve7HKbTMB3C3kuY9WA6hNkk_LsHe0N4foXnV52nYToN-1d5jutvTwEAAP__eVLb3w==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzEk9GPk0AQxt_9KzbjS6t7gaX4ssklGOWUSw9O4KLJhYe9MrYkHIu7S2LT9H83wCUV5Gobjb6xu_P7Zub7wg70txI4JP7Sf5eSRpXkKo5uyL3_5Xb5NgjJ7H2QpMmn5Zw8lbzqC0qy9K9Sch0FIVHkLgnCD2Qm5uTzRz_2iSCXxMmAQiVzDMUjauD3wICCAxmFWskVai1Ve73rioL8O3CbQlHVjWmvMworqRD4DkxhSgQOqXgoMUaRo7JarRyNKMpOulbFo1BbTwGFpBaV5sRyLizHegnZnoJszJPsQe1hSzZCb4Y6HoNsn1HQRqwRuLOnz4x30GkqqXJUmA-Uspb8XcnEjjeo1ngtiwqVtRjOlm5r5L3t0V3qx535QKHEr2bmsdfzS1WsN_0nUIgaw4nHqOdQzx25cNhw8QcbTowfygtZW-7YisnW7qA1Oz17ezr78u9mz54d719k7_zX7CeGi1HXstJ4UrR2ux7ma-zt0rJRK7xVctW16Y9Rx3XO5qhN_-r2h6Dqnrrf73SYHYfZGLZ_hp0BzMawcxR-M4DtMbw4Y-dfOh-H2XHYPWvnbP_iRwAAAP__W2L0nA==
 
 query III
 SELECT * FROM l LEFT OUTER JOIN r USING(a) WHERE a = 2
diff --git a/pkg/sql/logictest/testdata/logic_test/explain b/pkg/sql/logictest/testdata/logic_test/explain
index 659f54d0468d..83f33905d0a1 100644
--- a/pkg/sql/logictest/testdata/logic_test/explain
+++ b/pkg/sql/logictest/testdata/logic_test/explain
@@ -7,7 +7,7 @@ CREATE TABLE t (a INT PRIMARY KEY)
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM (SELECT avg(a) OVER () FROM t)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkDFLBDEQhXt_xfEqhchttky1VnKNJ6doISniZjgCe0nIzKJy7H-X3RR6womW8ybf-8IcEZOnO3cghnmBhlXIJfXEnMoc1Qcb_w7TKISYR5ljq9CnQjBHSJCBYPDoXgfakfNU1g0UPIkLw1KbSzi48tEJFB6yi2xW17CTQhrlq5DF7QlGT-rv0ucQfXqjstanxpun28tOX0FhO4pZde1ZXfsf3Y44p8h0IjvX3ExWgfye6h05jaWn-5L6RVPH7cItgSeWutV12MS6mj_4Hda_wu0P2E4XnwEAAP__EY6e-w==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkE1LwzAYx-9-ivA_tRLZumNOG1qlMNfZjimMHmLzMApdU5PUF0a_u6wZ6ISJHp__2y9kD_tSQyCP5_H1inWmZrdZes828dNyPksWLLhJ8lX-MA_ZMXLpA8HxlK_bQIYsXccZC0LvubAAR6MVLeSOLMQGEQqO1uiSrNXmIO2HQKLeIcYcVdN27iAXHKU2BLGHq1xNEFjJ55oykorMaAwORU5W9TDbmmonzcfUgSNvZWMFu0LRc-jOfQ1aJ7cEEfX879DHqlH6jcwoOiXO1nfBNArBkXZOsOnkLG7yH1xGttWNpRPYueVxX3CQ2pL_R6s7U9LS6HLA-DMdeoOgyDrvRv5IGm8dHvi9HP1anvwoF_3FZwAAAP__Y7O2sg==
 
 # Test that explaining a query that contains a subquery the result of which is
 # needed to make the physical plan is rejected. See #40677.
diff --git a/pkg/sql/logictest/testdata/logic_test/explain_analyze_plans b/pkg/sql/logictest/testdata/logic_test/explain_analyze_plans
index 81b242fd0921..2a96dcb173df 100644
--- a/pkg/sql/logictest/testdata/logic_test/explain_analyze_plans
+++ b/pkg/sql/logictest/testdata/logic_test/explain_analyze_plans
@@ -60,19 +60,19 @@ NULL       /1       {5}       5
 query T
 SELECT url FROM [EXPLAIN ANALYZE (DISTSQL) SELECT kv.k, avg(kw.k) FROM kv JOIN kw ON kv.k=kw.k GROUP BY kv.k]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzcWF1vo0YUfe-vQPO01WLBDODYSJXY9intxq7y8VBVVkTC1EFrgzXg7kar_PcK7NQ22NyZMJ6ZzRvggXvu8eVw5nxHWZ7QSbykBQr_RhjZiCAbechGPrJRgGY2WrH8kRZFzqolmxsuk28odG2UZqt1WV2e2egxZxSF31GZlguKQnQbPyzoNY0TyhwX2SihZZwu6jIrli5j9hx9-RfZ6GYVZ0VoDZyq8HRdhlZUwWD518JiNE5CqzotynixsMp0SUPLLZCNHp5L-rqAjK1f0ezFRvm63ALa4Xh4tp7i4ukQQYTR7GVWP3ZOUYhf7Lc1NjzR2NddYw7W2ho52druOTlLKKNJ8zkfq8Jcq46wdEXZnP6epxllDm78_wv6T_khwh9__oWl86fN4Y4hO6roqtZYDabqay266mc0l24uttYu42_Wki5z9mytC1rx61p_pE2Gd-x5IoPxaT5ndB6XOXNw0PpTbDTdELidgk-Tv-4n09v7yd3nzx8iXBFwc3f1ISLV0W_Tu8nt9hgal1ZP-FhPYlPj95uabnKI24-cm7ur-8uKHq86u6ZZQlk9OFZEnMiTRtmOjoCDjnV2jJCjXEzyQb5ySNBYebz28KA25tcmDIuuQwaOZ4rsCrR2wSG7elsjJ1tTKLu4v-y6_LLrCsiu26L3lOYCU7GvucOzaK7LJSDthvoIrvC8AIKLFQruW_k6pbaEXxYIh-J5A8c3RfEEWhtxKJ7e1sjJ1hQqHnkHigdMxb7iXbwbxROeF0DxyA-seB6_LHgciucPnMAUxRNobcyheHpbIydbU6h4Xn_F8_kVzz_X1hoYjH3RG51F9Hw9W2vhqQF0z1Ooez0oOyV9Pr8--BzSFwxMET6BxgJY-AYOtuIssbCVl0-UmSKBvh4J9N-B6QPmY1__xu_G9AnPCyB-_g9s-oBs-ZoWqzwrKFdk6FZE0WRON8QW-Zo90j9Z_liX2ZxO6_vqqCGhRbn5lWxOLrPXn4oyrp-97Txfl3Tbe7vV7cUkLb78f6l-xfnrj2TXf5W7gmblG_BgzzRAnAxhVYCIeoawwAiTM4xwd_2R7Po9-WiMsAGAOBmSOMLAxKhniDQBufuADvG4zZu9zm582QLRAt9dH7vKBQEAFBgGiJjGEFHPkN_5AjTwNG8OOm8mw8PX5wxfgKFaEwWy2Y1HuqkSrK_BRAGA1JsoYGLUM3Sh1kT1xCPdVAnW12CiAEDqTRQwMeoZGnV-BsbdJmosw0RJbKYbj3xTJQpAvUXoBqTBRAGA1DOEW1vzLhe1Bwh6rsgOW0mjIltuAwDJdzzCCNRbHGhqNARFrW22ZpMDANIQHXUDkm97hBFoCIuAqdGQp7W27wc6j_1uq4Nbm23NXgcApCFBghBJ_7aLItBgdyBEGvxOd_Dzdr9jWp4DANLgd4xLeCBE0v2P8NRo4MS0UAcApMHvGBfzQIik-x_hqdHASXeyg4FoB5uW7QCAdPgd49IeABGv__F7vAfG5TvkTPkOkZLvSNxyAYDU-x0AkAa_AyEyjiP5_qeNQEq-I3OOTct3AEAa_A6EyDiO5PufNoLufIcA-Q4xLd8BAGnwOxAiDd924_IeCNH5MzAiK9-Zvfz0XwAAAP__1xvAaA==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzcWF1v4jgUfd9fYfmpowmT2An9QBqJzmx3xSyFbmml7Y5QlTZeioCEdUI7VdX_vkqgC00gNy7G9vSNJE7uuYebk-PzhON_x7iBeyftk68XaMbH6Lfz7in6fvLXWfu41UHHneP21d8naO_XVu-i92f7A1osHd1_GlnIvx_sjR4-jT7Mbxvdo2_dVgeNHlC3ky1Bn1F6Hf1-3r08Q1-uspN9bOEwCljHn7AYN75jgi1MsYVdbGEPW7iO-xae8uiWxXHE0yVP2Q2t4AduOBYehtNZkp7uW_g24gw3nnAyTMYMN_CFfzNm58wPGLcdbOGAJf5wnJWZ8uHE54_N0T22cG_qh3ED1ey0cHeWNFAzhcGjhxhx5gcNlB7GiT8eo2Q4YQ3kxNjCN48Je1lAj9AX3H-2cDRLFoCWOG4e0Z0f371G0CS4_9zPHjtguEGerbc1tr-hsYdlYzbR2hrd2NryOREPGGdB_jkf08KVVq1h6ZTxAfsWDUPGbZL7_8fsn2SvST5--MyHg7v5zyVDVjOlK12Dckxl5wp0Zc_IL52fLKyd-D_QhE0i_ohmMUv5ddAfwzzDS_ZckcE4Hgw4G_hJxG1SL_wpFu7OCVxMwXHn6rrTvbjuXLbbe02SEtC7PN1r0vTX1-5l52LxGxqXQk9kXU9iU-NtNzXl5FBnO3J6l6fXrZQeNz06Z2HAeDY4qEntpiuNsiUd9Qp0zMJ1hKzlohPVoqlN67mV62vvv6pNqmsTgUXXpjXbNUV2BVo7qCC7elujG1tTKLtke9l1qsuuIyC7ToHeTZoLTMWq5u7vRHOdSgJSbGgbwRWeF0BwiULBfStfm9SWVpcFWkHx3JrtmaJ4Aq0dVlA8va3Rja0pVDz6DhQPmIpVxTt4N4onPC-A4tGfWPHc6rLgVlA8r2bXTVE8gdaOKiie3tboxtYUKp67veJ51RXP29XWGhiMVdE73InoeXq21sJTA-ieq1D3tqBsk_R51fXBqyB99ZopwifQWB0WvppNkB8GiKAouWPcFAn09Eig9w5MHzAfq_p39G5Mn_C8AOLn_cSmD8iWz1k8jcKYVYoMnZQoFgzYnNg4mvFbdsaj26zM_LCb3ZdFDQGLk_lVOj9ohS-X4sTPnr3oPJolbNF7sdXFyWAYj_4_lb3i1esfyq7_IncxC5M34CGuaYAqMkRUAaLqGSICI0x3MMLl9Q9l19-Sj9wIGwCoIkMSRxiYGPUM0TwgZxXQazxO_ma3tBtPtkAUwJfXJ45yQQAA1Q0DRE1jiKpnyCt9AXJ48jfXS2-m-69fnx18AfbVmiiQzXI80k2VYH0NJgoApN5EAROjnqEDtSZqSzzSTZVgfQ0mCgCk3kQBE6OeocPSz8BRuYk6kmGiJDZTjke-qRIFoN4ilAPSYKIAQOoZIoWteZmLWgEEPVdkh62kUZEttwGA5DseYQTqLQ40NRqCosI2W7PJAQBpiI7KAcm3PcIINIRFwNRoyNMK2_dXOk-8cqtDCpttzV4HAKQhQYIQSf-2iyLQYHcgRBr8Tnnw83a_Y1qeAwDS4HeMS3ggRNL9j_DUaODEtFAHAKTB7xgX80CIpPsf4anRwEl5skOAaIeYlu0AgHT4HePSHgBRVf_jbfEeGJfv0B3lO1RKviNxywUAUu93AEAa_A6EyDiO5PufIgIp-Y7MOTYt3wEAafA7ECLjOJLvf4oIyvMdCuQ71LR8BwCkwe9AiDR8243LeyBEu8_AqKx8p__8y38BAAD__9RQ4qc=
 
 # This query verifies stats collection for the hashJoiner, distinct and sorter.
 query T
 SELECT url FROM [EXPLAIN ANALYZE (DISTSQL) SELECT DISTINCT(kw.w) FROM kv JOIN kw ON kv.k = kw.w ORDER BY kw.w]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzkWV1v2zYUfd-vIO7ThsmQSEmOLWBAUOxh3YB1aPc2-EGxuFioLRkkvTYo8t8HyQ4ciQk_LJY0kLfqg-K5l-fc0xN_g6at6J_ljnIo_gEMERCIIIUIMoggh1UEe9auKect6145LnhffYUiiaBu9gfR3V5FsG4ZheIbiFpsKRTwd3m3pR9pWVEWJxBBRUVZb_tt9qzelezh9vN_EMGnfdnwAs3ibuMPB1Gg2w4Ga79wxGhZFai75KLcbpGod7RACYcI7h4EfXqBLNE7WD1G0B7ECdAZx90D2pR8M0Rwi2H1uOo_e0-hwI_RZYXNXynsy7mwGD8vjfgujbxa2vk7h6ZlFWW0Gnxp1a3UvfJCf34r-eb3tm4oi_Ho4Lf0X_HjLf7pF1bfb_p_DRrTPUaj7vT3pBb168evHm9K73LRMlohXle0QP07EMGu_Ip2dNeyB3TgtGt0gv6o352eVDX_fLqfSP0_9za1oc2vNRd1sxYxzqUD03NCwqvClU04cxVykqiR55OR5zYd_dQyQVlM8BjVz5fAwhcQYD6Ai83nBtYPxJjM4vRaRqJFaTcGI3FQWuCRiD2PRDxpJCbmIzExHInd517T6YRxqKHMeRzO1UMlcTwOiTmViYFK01mcXYtKLUpbGKh0UFpglRLPKiVvRKUaypxVeuNXpak5lVMDlWazOL8WlVqUtjRQ6aC0wCpNPas0naTSzFylWfh4oaHNWakLtVIzx0rNzOmcGSg1n12LTi0Ky_U6ncUYlU2FMGrFhrJrUWzmWbHZG_FVDXnOal369VVNpP5I-b5tOB2f-4tfTrrDptU9PZKHtwe2pn-xdt1vc7z80K_r00BFuTg-JceL983TIy7K_tunytuDoKfa5VJfOBXomWm-_8L1_k8S5bQRF-DBzhsyFdDcDBD2BYgk3juELShMvgOF1fsvXO8_sR_YeUOmApqbAXJIYQ1jEu8dImNAyXNA6QBPMl6cKhdnQz2OF2fKxbl651y5mAyZlnwH6c39upf2HNV4nLuZ5f4B3EsDyL97aRjj371u_LrXRDzO3cxy_wDupQHk3700jPHvXgulDSzVHrK0ca9nxegs3nOw0f-f49qSjgaQe7OwRuDfHXSsCRBuPKebqYACxB3feccaQYCAc3UJB6sjDtZkHGwVcixsQso_oW1CDSiATagBBcgUOkTObcOaNQFsQorioW1CDSiATagBhfizmAaRc9uwZk0Am5Dy-dAmbjQ2IWUjRzYhRZxLbMKlwasBBbAJNaAQNqFBZGgT_hC5tw0ZgZS2L7EJlzxWAwpgE2pAIWxCg8jQJvwhcm8b8u8lUk4f_vKA1TZBpHh0oU2sHn_4PwAA__-RJ7dt
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzkWV1v4jgUfd9fYd2nVhsmcT5oiTRS2ymrZbYLs9CHnR3xkBJviYCEtU2Zqup_XyVQ0ZDWTkjGRpq3yYfjc6_PuWdOeQL23xx8GHVvup9u0YrO0W_DwZ_oW_fvLzeXvT667F_efP2ni06ue6Pb0V83p2j7anrd63-6RSez9Yf16WbZ7AF9HvT6aLZGgz6aPXyYoY8ofY4Gw-vuEF19za7GYECchKQfLAgD_xtgMMAGAxwwwAUDPBgbsKTJhDCW0PSVp2xBL_wOvmVAFC9XPL09NmCSUAL-E_CIzwn4cBvczcmQBCGhpgUGhIQH0TzbZkmjRUAfL2YPYMBoGcTMRy0z3Xiw4j66SGHQZM0QJUHoo_SS8WA-RzxaEB9ZDAy4e-Tk5QW7g65g_GxAsuJbQDscd49oGrBpHsEFhvHzOPvsPQEfPxuHFdZ-p7D1rjATvy7NVl2a_W5pu--s4oSGhJIw96VxulL2yhv9-T1g089JFBNq4r2Dn5N_-ckFPv1Io_tp9q9cY9LHaK872b1Ci7L1-69ubhbeZTyhJEQsComPsnfAgEXwHS3IIqGPaMVI2mgL_RFdbZ-EEZtt71uF_u9661ShzXXEeBRPuIm9woHJOVHAK8Ll1jhzEXLbEiP3aiP3qnR0lFBOqGnjfVS_HgILH0CAdg4uLj83sHwgmnbLdI5lJFYo7azESMyVpnkkYsUjEdcaiVb5kWiVHInp597TaY1xKKHMbhy2xUPFangc2uWpbJdQqdMy3WNRaYXSzkuoNFeaZpXailVq_yQqlVBmp9IztSp1ylPZKaFSt2V6x6LSCqV1Sqg0V5pmlTqKVerUUqlbXqWu_nghoc1OqedipboNK9UtT2e3hFK91rHotEJhnlynLROjIA4RRgmfEnosinUVK9b9SXxVQp6dWjtqfVUSqYeELZOYkf1zf_PLVnrYJLwnG_KwZEUn5AtNJtk2m8tBti5LAyFhfPPU3lz04pdHjAfZt7eVJytOtrUXS33jVCBjZvn9z5ve_0WijMT8ADy48YbUBdQuBwirAmRbyjuEK1DY_gEUFu9_3vT-NfuBG29IXUDtcoAapLCEMZbyDtn7gKzXgJwcHmt_sSNc7Ob1uL_YFS72xDt7wsV2nmnWD5BeW617Sc9RjKdxN6u4vwb3kgBS714Sxqh3rzO17lUTT-NuVnF_De4lAaTevSSMUe9e50Ib6Ig9pFPFvV4VI7N4xcFG_n-OY0s6EkDNm0VlBOrdQcYaDeFGcbqpC0hD3FGddyoj0BBwji7hYHHEwZKMgyuFnAo2Ucg_um1CDEiDTYgBacgUMkSN20Zl1miwiUIU120TYkAabEIMSMefxSSIGreNyqzRYBOFfJ63iTOJTRSyUUM2UYg4h9hEkwYvBqTBJsSAdNiEBFFJm1CHqHnbKCIopO1DbKJJHosBabAJMSAdNiFBVNIm1CFq3jaKv5cUcnr-lwcstgm7EI8OtInx8y__BwAA___jlNk-
 
 # This query verifies stats collection for WITH ORDINALITY and the hashJoiner.
 query T
 SELECT url FROM [EXPLAIN ANALYZE (DISTSQL) SELECT * FROM kv WITH ORDINALITY AS a, kv WITH ORDINALITY AS b]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8UU1v1DAQvfMrrDkP2nxy8CnqiYLEosIN5eCuh63VxI5mHOiq2v-OkhS1ybaBRahHv3nP782be_DB0ifTkoD-BinUCB2HHYkEHqCJcGnvQCcIznd9HOAaYReYQN9DdLEh0PDVXDd0RcYSbxJAsBSNa8ZvO3at4UN1-wMQvnTGi1ZvAYHDT1FMxmpVAoJE0zQqupa0SgQQrg-RfhPSolQXUB8RQh8fU0g0ewKdHvHvk27ZOm8aFw-bdB50PdBL5tk55k9ryl67pvwfa8r_R03Fi-aPnr0PbInJzgzrQfknyjMbvDdy8yE4T7wp5hts-6hVlWKVYZVjVWBVYvUOEBr6HtVivxE7aZ3d_uaEOoEnXImBySpxlrQaOYDQmjvVUhv4oHohq1WWqI_u4mFindw-4MnKRctzLnpF0gUvtCz32Z-ToVGye5ouJKHnHX3msBttpud21I2AJYnTNJ0el34aDQGfitNVcTETp0txtirO153zM5yzpbhYFZcL5_r45lcAAAD__zWsv94=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8UUFv2kwQvX-_YjSnr9VW2Mb0sCeThipuKaSA1KaRDws7JStsL91dp0GI_17ZpkowwS1V1eO-eW_fmzdbtN9S5DgdDAdvZlCYFN5Oxh_gdvD5etiPR9Af9Yc3Xwbw_2U8nU0_Dl_AnvqyJq7u4VM8u4Lx5DIe9Yfx7Ab6UxDsxGCeIMNcSxqJjCzyW_QxYbg2ekHWalNC24oQywfkHkOVrwtXwgnDhTaEfItOuZSQ40zMU5qQkGQ6HjKU5IRKq2_XRmXCbKLVPTKcrkVuObxChkZ_t2BISA49ZGidSFNwKiMOnkWG842jnwQ_7MEFJjuGunCPKawTS0Lu79jvJx0bqXKRKrfp-IdB2wOdMg_OMX9aU_Cva-r-YU3dv1FTeNL80bPItZFkSB4YJqXyV5RnNrgS9u6dVjmZTni4wbhwHCKfRQGLuiwKWdRj0WtkmNJXB439KuyodaOWd0fUGjziWqcNSbBKEoeKgwwz8QAZZdpsoLAkOQQevFcX-4lUdrXHvZaL9s656ITsWueWmuU--7NXNkpySfWFrC7Mgq6NXlQ29XNc6SpAknX11K8fcV6PyoBPxX6rODwQ-01x0Crutjt3z3AOmuKwVdxrOCe7_34EAAD__1vN32I=
 
 # Verify that EXPLAIN ANALYZE on an unsupported query doesn't return an error.
 statement ok
@@ -91,11 +91,11 @@ true
 query T
 SELECT url FROM [EXPLAIN ANALYZE (DISTSQL) SELECT avg(k) OVER () FROM kv]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lFGL1DAQx9_9FGGeFFKapq1gntZ7kUPw5BR9kD7kmuEI1yYlSb1dln53abq6dqlrBXcfM5P_zO-f6XQPxir8IFv0IL5BBhQ4UMiBQgEUSqgodM7W6L1145VJcKu2IBgFbbo-jOGKQm0dgthD0KFBEPBZPjR4j1KhSxlQUBikbmKbzulWut3m6TtQ-NRJ4wVJ0rHxXR8E2YwYzj574lAqQcajD7JpSNAtCsI8UHjYBfx5gb8hN1ANFGwfjkA-yEcEkQ30D9BH1t5Yp9ChmnFWw4Ktr9oo-4wuLeee3n5593KTvfrlgc89lEseWrklLbbW7UjvUQmSM_Je3xwySvunQ5yd8cdn_rL1Q8n-PpSUJ2l-jbHw9dh8BXaepMU1sPP12PkK7CKJX9XFsYv12MUK7DK59uYuQN-j76zxeLLBy5XZuNmoHnH6DXjbuxo_OlvHNtPxLupiQKEPUzabDrcmpiLg7-LsrPj1TMxOxfxfOkcr0dXhPT2aIAgbH3NeNr9M2eIyZcv_VLYaXvwIAAD__wcNMNE=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lE2P2jAQhu_9FaM5gWSUTyrVJ9iWVqgUtoC2H6scvHiEIpKY2g67CPHfqxjabVZ0m0oLR3vmnXleTyY7ND8y5DgbjAZv51DqDN5PJ5_gdvD1etQfjqE_7o--fR9A691wNp99HrXhmCo2y9aqDZObwRRa7YNqtUmQYaEkjUVOBvktBsgwRIYRMoyRYRcThmutFmSM0lXKzgmG8gG5zzAt1qWtrhOGC6UJ-Q5tajNCjnNxl9GUhCTt-chQkhVp5tqsdZoLve2tNshwthaF4dDxqsaT0nLoVRha3RvQJCSH6misyDKwaU4cfIMM77aWfiWEb-AKkz1DVdpHIGPFkpAHe_YX6EfWslBakiZZ40z2J2x9SQup7kl73bqn_s2HVi9o__YQ1j10T3nIxQPklCu9hdKQ5BD58DG9OkZkalbHe_8Zf2HNX9B8KMG_h-KFHS-6xFjC5thhA-yo48WXwI6aY0cNsOOO-6rOjh03x44bYHc7l97cE9BTMmtVGHqywacr-9Vmk1zS4TdgVKkXdK3VwrU5HCdO5y4kGXuIBofDsHAhB_inOHhW_Lom9p-Kw__p7Kw4V8f3NFRYDn71mPWy0XnKxucp232hssn-1c8AAAD__7YyR2Q=
 
 # Very simple query to make it easier to spot regressions when rewriting results
 # in test files.
 query T
 SELECT url FROM [EXPLAIN ANALYZE (DISTSQL) SELECT k FROM kv WHERE k = 0];
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyMkDFPwzAUhHd-hXWshjirp65dKCpsKINrPxULJ7b8XiqqKv8dJWYBCYnxvvOdfb5hyoGe3EgM-4Yeg0ap2RNzritqB_bhE9ZoxKnMsuJBw-dKsDdIlESweHWnREdygWpnoBFIXExbbalxdPW6-7hA46W4ia3qzENnuntoHGaxatdD4-TEvxOrPEtZ4Vojc0m_EFMiL_ES5WqVeTQbE5eSkjiSVYYxLBot8v1aFncm2H7R_190JC55Yvox5q9mswwaFM7Ufo3zXD091-y3a5o8bLkNBGJpbt_EfmrWMix3XwEAAP__bYGETQ==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyMkM9L-0AQxe_fv2KY70VhNZvrgtCiEQOxrUnBHyWHbTLUkG027k6KpeR_lyS9KAge5zPvvd03J_QfBhVmURLdrqFzBu7T5SNsopdVMo8XMF_Mk9e3CC7u4mydPSWXcJbWk7A-wPNDlEZQww3IHAU2tqSF3pNHtcEQc4GtswV5b92ATqMgLj9RSYFV03Y84FxgYR2hOiFXbAgVrvXWUEq6JBdIFFgS68qMsa2r9todZ_UBBWatbryCQF4FMviPApcdK5iFKHCruXgnD7bjdoBDDHet-YE8GSq4OlR8VCCv5chYGwNc7UmB9Jj3AifL-bee9Y5Qhb34e6OUfGsbT9_K_JYs-1wglTuaruZt5wpaOVuMz0zjcvSNoCTP0zachriZVn3e__sKAAD__xmzmlc=
diff --git a/pkg/sql/logictest/testdata/logic_test/show_source b/pkg/sql/logictest/testdata/logic_test/show_source
index 4cfb068b19b5..19cce0dfd7bb 100644
--- a/pkg/sql/logictest/testdata/logic_test/show_source
+++ b/pkg/sql/logictest/testdata/logic_test/show_source
@@ -385,4 +385,3 @@ query T
 SELECT feature_name FROM crdb_internal.feature_usage WHERE feature_name='sql.show.locality' AND usage_count > 0
 ----
 sql.show.locality
-
diff --git a/pkg/sql/logictest/testdata/logic_test/vectorize b/pkg/sql/logictest/testdata/logic_test/vectorize
index 9ba881967e19..28bc2af013f7 100644
--- a/pkg/sql/logictest/testdata/logic_test/vectorize
+++ b/pkg/sql/logictest/testdata/logic_test/vectorize
@@ -471,17 +471,17 @@ SET vectorize_row_count_threshold = 0
 query T
 SELECT url FROM [EXPLAIN ANALYZE SELECT a FROM a]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyMkLFO9DAQhPv_KaKp9weHClxdew2HDjqUwmevDktObHk3iNMp744SU0CBRLnfzow9e8WUAz-6kQX2FT0GQqnZs0iuK2qCffiANYQ4lVlXPBB8rgx7hUZNDIsXd0p8ZBe43hoQAquLaYstNY6uXnYOhOfiJrHdfxAOs9pu14NwcurfWLo8a1nhHQg6l_QdGbMqhRN7je9RL7YzNw_3K1OXUqdxZNsZwbAQmuvrp6LuzLD9Qn9vc2QpeRL-UeS3ZLMMBA5nbheTPFfPTzX77Zk2HjbfBgKLtm3fhv3UVsuw_PsMAAD__9Tug2M=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyMkMFO4zAQhu_7FNZ_2pW8kHACn1pBkCKFtjQ9AFUObjIqkdzY2BNEVeXdUeIe4IDEcb75Zux_TghvBgplVmS3G9F7I-7XywexzZ5WxTxfiPliXjy_ZOLvXV5uysfinzirOoq6gkRnG1roAwWoLVJUEs7bmkKwfkSnScibD6hEou1czyOuJGrrCeoEbtkQFDZ6Z2hNuiF_mUCiIdatmdY63x60P840JEqnu6DEf0gse1ZilkJip7l-pSBsz26EV5Dg3pmvKElGM5Chmtv3lo9KJBc31yNjbYzg9kBKJAHVIBGnzj8NrPcElQ7y92nWFJztAn0L8tPmZKgkqNlTvFiwva9p5W09PRPL5TQ3gYYCx24ai7yLraEa_nwGAAD__86elhA=
 
 query T
 SELECT url FROM [EXPLAIN ANALYZE SELECT c.a FROM c JOIN d ON d.b = c.b]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJykkk9PIzEMxe_7KSKfs7uTHnOaaxGiqHBDc0gTqwSmcRR7oFU13x3NH0GLBCrimGc_27-nHCFRwBu3Qwb7AAYaDbmQR2YqgzQ1LMMebKUhptzJIDcaPBUEewSJ0iJYuHebFtfoApb_FWgIKC6241hGX3vQcJddYqv-goZVJ1bVRtcL0LBx4h-RFXWSB92ABulyeyINbYwteokvUQ5WVf-qYQuLa1slcYdWVQxNr2GyzFeyuC2CNb2-nOSKYppBzDlILnHnyqEOoOGa6LnL6oliUpSsGklmrN8x4R59J5HSB5eGQq-sCrow-865B6CAe3XSZd7FCzNa_CSjNXKmxHiWz1eTq77RgGGL049i6orH20J-XDM9V6NvFAKyTFUzPZZpKg0HnprNt-bFJ3PT_3kLAAD__8_x9IM=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJykkk-P0zAQxe98itGcQDIl6dESUisoUlYhWdoegFUOrj1aDK4dPA50VeW7o_wRtEigRRz95r2Z-Y18Rv7qUOJuU25e7aGLDt5s67dwt3l_W66LCtbVuvzwcQNPXxe7_e5d-Qxmq16oyarhpi4qMFBXYBYHeAl6cWhQoA-GKnUkRnmHOTYC2xg0MYc4SOfRUJgTykyg9W2XBrkRqEMklGdMNjlCiXt1cLQlZSi-yFCgoaSsG9sy6ZVGgbtWeZbwHAXWXZKwysVqiQIPKulPxBC61A56jgJT17oLabAxOdLJfrPpQUK2yIYpnJRzkOyRJGSMTS9wisxbclL3hDLvxeNJboL1M0h-DdJGe1TxYWVQYBnCl66Fz8F6CF7CSDJj_R8TnUh3yQb_i0tgDN8ZIikz5665ByBDJ7hw5T_FR95o-S832hK3wTNd3edPnbO-EUjmnqYfxaGLmm5j0OOY6VmPuVEwxGmq5tOj8FNpWPAynP81vPwt3PRPfgQAAP__vR0M5w==
 
 query T
 SELECT url FROM [EXPLAIN ANALYZE SELECT c.a FROM c INNER MERGE JOIN d ON c.a = d.b]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8kkFr4zAQhe_7K8ycdlm1sZ2boJBrCm1K2lvxQZGmjkCRjDQqCcH_vcgqNAluQ0rpzXrSNzPvjfdgncJ7scEA_BkqaBh03kkMwfkk5QdztQVeMtC2i5TkhoF0HoHvgTQZBA5PYmVwiUKhn5TAQCEJbYayndcb4XczCQweO2EDL66AwSISL2YVMFgJkmsMhYvUJTFpFDtzINXAIKBBSfpV044X5XWZ2gQSxhSkN8iLMkDTM8jI-5iBRIvAq559z0o1bkWNWal_xUr9qZUPB9E6r9CjOpq-SeS5JyN53KFv8dZpi35SH-dh8IX-zqr__268btf586dWi1uUkbSz5zOZXrLeJYbO2YCn2YxWLlMgqFrMAQcXvcQH7-TQJh8XAzcICgPl2zof5na4Gv6_Q7i6AK5P4fpLeHoEl33T_3kLAAD__6RFR6I=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8klFr2zAUhd_3Ky73qWVaartvgkLC5g2XxO6cPGwrflCku1SgWJ4kj5aQ_z4sF9aUbCVj9M06Op-kc6536H8Y5LjM5_n7FfTOwMe6WsBt_uVmPitKmJWz-ddvOZx9KJar5ef5OTxa5USMVglFWeY1LPL6Uw7XVVGCgqqMhitQk3WDDFurqBRb8shvMcWGYeesJO-tG6RdNBTqHnnCULddHwa5YSitI-Q7DDoYQo4rsTZUk1DkLhJkqCgIbeKxndNb4R6mEhkuO9F6Du-QYdUHDtMUGa5FkHfkwfahG8RBC31nnkgZMvRkSAb9U4cHDskkGa7xQRgDQW-JQ-Kx2TMckcdn-iA2hDzds3-Lkh6Poo5FyV4lSvbHKL8T9K11ihypg9c3A_mS5UgfC3Ibura6JXeRHfZh6Hs4m6Zvz6-c3tyNn_9rtHRPsg_ati93cnnKeGvynW09Pe_m6MnJUAipDY0Fe9s7STfOynjNuKwiFwVFPoy72bgo2rgV_7-ncHoCnD2Hs7_Clwdwsm_2b34FAAD__9y3YyI=
 
 statement ok
 RESET optimizer; RESET vectorize; RESET distsql; RESET vectorize_row_count_threshold
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_agg b/pkg/sql/opt/exec/execbuilder/testdata/distsql_agg
index 93870d84cb76..5f6cd0689958 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_agg
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_agg
@@ -31,188 +31,188 @@ NULL       /1       {1}       1
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslE2PmzAQhu_9FWhOrWRkbCCb5ZQe99ButWlPFQcXjyhSgpFtpFYR_70CDoEoMa68Rz5eP--jseYCrZL4VZzRQPETGBDgQCAFAhkQyKEk0GlVoTFKj7_MgRf5B4qEQNN2vR1flwQqpRGKC9jGnhAK-C5-nfANhURNEyAg0YrmNGE63ZyF_nuQwgogcOxEa4oopiwSrYxYpOxv1EDgtbdFdGBQDgRUb68sY0WNULCB-Pf5XNcaa2GVpvm6zvHHl48H9ukhhj_EXE_vW6UlapSro8vBXYQl_9ckXTVh_gNgPgOgLKY8aAQbjRbmu5ARcH9x7iXOY5oGiW80Wog_hYin_uKpl3ga0yxIfKPRQnwfIp75i2de4llM8yDxjUYL8ef32jZ3MG9oOtUavNk6909Oxm2EssZ5dRnV6wq_aVVNmPnxdcpNLyQaO39l88NLO38aCy7DzBnmqzC7DXM3eQOdOtOZO5yF9M6d4Z2bvAshPznDezd5H0J-ds8q2bgm7kt2yy6HD_8CAAD__8HMzUU=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyslEGL2zAQhe_9FWJOCcjYsp1s1qcsbQqB7GYbp1BYfFCjwQ04livJ0BLy34vtwjphV3ZRj5LmzXsfI-YM-mcBCaSrzerjntSqIJ9320fysvr2vHlYP5HJp3W6T79spuRvia5PEz7tqgQ3PAMKpRT4xE-oIXkBBhRCoBABhRgozCCjUCl5QK2lakrOrWAtfkESUDiWVW2a64zCQSqE5AzmaAqEBPb8e4E75AKVHwAFgYYfi9amUscTV7-XTQagkFa81AnxfEZ4KQgj0vxABRS2tUnIkkF2oSBr8-qlDc8REnah4_M85LnCnBup_Nl1nPTr42TJpu_ahO_avHavS6kEKhRXrbOLPQgL_i1JdJWEjR8AGzMAn3l-6DSCgUQ98rnLCMLx4OEo8NDzIyfwgUQ98DsX8Gg8eDQKPPL82Al8IFEPfOECHo8Hj0eBx54_cwIfSNQDv_9f2-YNmx3qSpYab7bO252DZhuhyLFbXVrW6oDPSh5am-64bXXthUBtulfWHdZl99QE7IuZVRxeidmtOLQ7D1hHVnVsF8cuuWdW8dzuPHdxvrOKF3bnhYvzvX1WwcA3sX-yW-_s8uFPAAAA__8lIeCd
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum((a-1)*1000 + (b-1)*100 + (c::INT-1)*10 + (d-1)) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlUFr2zAUx-_7FOad3E3GluykqU4u2w6BtRtpdxo-aNHDC6SSkRTYKPnuIzaldmhkDe_im5-f_vq_93uC9wxKS7wXT2iB_wAKBBgQyIFAAQQWUBFojN6itdqcjnSCtfwNPCOwU83BnX5XBLbaIPBncDu3R-DwKH7ucYNCokkzICDRid2-tWnM7kmYP6UUTgCBh0Yoy6MkpZFQMqKRdr_QAIENKomGR3EcxyVNKOd8ff-4unpPsyx7CT7EccmGuZfvNpd3weBE70BZtJlPnz-u726_XEF1JKAP7rUv60SNwOmRhPd-W9cGa-G0SRfD1h--38UlvWzDLtq83n5Q2kg0KAdXV0d_ITT7t0ryQSU0fNg0ZNgpTVI2m3GPdN-jvJwybhYOmQVBZkmazwbySPc9yNdTIOfhkPMgyHmSFrOBPNJ9D_JqCuQiHHIRBLlI0sVsII9034N887-2wxs2G7SNVhbPtsTbN2en7YGyxm7VWH0wW_xm9La16cKvra79IdG6Lku7YK261KnAvph6xWwgpudi5ncesc696sIvLqbUvfCKl37n5RTna6945XdeTXG-8c8qG3km_kd27l0d3_0NAAD__0t5SGo=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzUVV9r4k4Uff99iuE-Je2EZJLY2jwprT8IqO2qCwslD1Pn4gqacWcS2EX87kuSLSbSTrJkX_TJ--fMuefcwD2C_rGDCJaT6eRxRXK1I_8vnmfkdfLtZTqO58R6iper5ZepTf606HxvFT9OHMJsckOY53k2uSWW9VZL2VVqHUXxfDU8F6q8KBN2xSV4xhOgkEqBc75HDdErMKDgA4UAKIRAYQAJhYOSa9RaqqLlWAJi8RMij8I2PeRZkU4orKVCiI6QbbMdQgQr_rbDBXKByvWAgsCMb3clzUFt91z9GhUzAIXlgac6Io7LCE8FYURm31EBhQWmAlVECuUj5rCo0mXfFOrfg1vLGvnN2vv_shZUQaOj1jAKy8rT5DGejac2JCcKMs_OunTGNwgRO9Hu2sebjcINz6RyB03py68za8Q-p_E_pTm_nqdSCVQoGk8nJ_MgzPu7SYLGJKz7slmXZbvMcf2rWXeL-prLd33W7Xc32e9ksu-4wdWY3KK-ZvJ9H5OD7iYHnUwOHDe8GpNb1NdMHvYxOexuctjJ5NBxB1djcov6mskP_-o6fECzQH2QqcaLK_Hxy15xPVBssDo1WuZqjS9KrkuaKnwucWVCoM6qKquCOK1KxYB1MDOC_QaYXYJ9M3MLdWBEh2Zw2GfugRF8Z2a-68N8bwQPzczDPswP5l15LZ-J-SO75E5O__0OAAD__7BpaAU=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a), count(a), max(a) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lEFr2zAUx-_7FOadNpCRJTlp6lPKTjmkGU0Dg2GGFj28QGoZSYaNku8-bI_VDrUscHazrfzz-_N74r1CqRU-yhe0kH0DBgQ4EBBAIAUCC8gJVEYf0Vptmp90gY36BVlC4FRWtWs-5wSO2iBkr-BO7oyQwbP8ccYnlAoNTYCAQidP5xZTmdOLNL_XSjoJBPaVLG0WxZRFslQRi7T7iQYI7GqXRWsG-YWArt0byzpZIGTsQsL7PBSFwUI6behiWGd_2H5cs09A4PPu8Pj893n78LV9GoPzUfgbsy61UWhQDYD5xV-PJWP99oft903TkP9rKMYbikFDFj4uFjIuymLKZw1solHPyPL2A-PhOniQDh5TMUvHRKOejrvb6xDhOkSQDhHTdJaOiUY9Havb60jDdaRBOtKYLmbpmGjU03H_f7fbO_AntJUuLV5tuff_OWm2H6oCu1VpdW2O-MXoY4vpXndtrv2g0LrulHUvm7I7agr2w8wb5oMwuw5zP3kCLbzp1B9O5_ReeMNLP3k5h3znDa_85NUc8r1_VsnENfFfsmt2fvnwJwAA__-Um-rw
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF2L2kAUhu_7K4ZzpTASJ4mumytla0HwY2sUFpZQps7BCjGTzkxgi_jfS5KlG2WdBGLvJh9v3ofnhHMC_TuGAMLpfPq0IZmKybf1akFepy_P88lsSTpfZ-Em_D7vkvdXdHbs8C4lO5klpjgd-VuHd8uc4IZHQCGRApf8iBqCV2BAwQUKHlDwgcIAIgqpkjvUWqr8lVMRmIk3CPoUDkmamfx2RGEnFUJwAnMwMUIAG_4zxjVygcrpAwWBhh_ioiZVhyNXf8Y5A1AIU57ogPQcRngiCCPS_EIFFFaZCciYQXSmIDPz0aUN3yME7Eyb80z2e4V7bqRyBpc44XbRGbMuUHhabZeb9_Ni8lKcbpW7N8s_OrNEKoEKxUVhdLbjsf4tvnC7-DHLCd1_hN5tQu-CkDUfF2syLof1HLfVwGqIKkaG9x-Y21yH20iH23O8VjpqiCo6Hu6vw2uuw2ukw-s5fisdNUQVHaP76_Cb6_Ab6fB7zqCVjhqiio7H_7vdPilfo05lovFqy33-5X6-_VDssVyVWmZqh89K7oqa8nJV5IobArUpn7LyYpaUj3LAaphZw-5FmF2HXXtzTbVnTfv2sN-Ge2AND-3NwzbND9bwyN48atP8aJ9Vv-Y3sf9k193R-cvfAAAA__84xwPC
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a+b), count(a+b), max(a+b) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lEFr2zAUx-_7FOadNiYjS3LS1KeUnXJIO5IGBsMMLXp4gVQykgIbJd992B6rExJZEPdmW_nn9-f3xHsFbRQ-yhd0UHwHBgQ4EBBAIAcCEygJ1NZs0Tljm590gYX6DUVGYKfrg28-lwS2xiIUr-B3fo9QwLP8uccVSoWWZkBAoZe7fYup7e5F2j9zJb0EAutaalckKWWJ1CphifG_0AKBFWqFtkjm7POcQ3kkYA7-jei8rBAKdiTxrR6qymIlvbF0clpqvVl-nLNPQODL0-bx-d_z8uFb-3QNzq_C35gHbaxCi-oEWB7D9Vh2rd96s_yxaBry_w3F9YbipCGLHxqLGRplKeUjjG2gV8_LdPyx8XgpPEoKT6kYQcpAr56Uu_GliHgpIkqKSGk-gpSBXj0ps_Gl5PFS8igpeUonI0gZ6NWTcv--W-8CfIWuNtrh2fa7_M9ZsxVRVditUGcOdotfrdm2mO71qc21HxQ6352y7mWhu6OmYD_MgmF-EmbnYR4mD6BFMJ2Hw_ktvSfB8DRMnt5CvguGZ2Hy7BbyfXhW2cA1CV-yc3Z5_PA3AAD__4rp88k=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF2L4jAUhu_3V4RzNTKRmrQ6Tq-UWRcEP2atwsBQlow5uII2bpLCLOJ_X9rKjMqYFuzeJW3fvg_PCdmD-bOBEKLBaPA0J6nekB-z6Zi8Dl6eR_3hhNx9H0bz6OeoQY6fmHR7J8g9eWtQslRpYj92W_F-XBf_kMKKGCgkSuJEbNFA-AoMKHCg4AOFACi0Iaaw02qJxiidfbLPA0P5DmGLwjrZpTZ7HFNYKo0Q7sGu7QYhhLl42-AMhUTttYCCRCvWm7xmp9dbof_2MgagEO1EYkLS9BgRiSSMKPsbNVCYYSJRh6TH7nsc4gMFldrPRmPFCiFkB1qdqr9aaVwJq7TXPoeKFuO7HmsAhafpYjI_rsf9l3x1rZxfLf_sTBOlJWqUZ4XxwY3HWtf4osX41zAj5B-E_nVC_4yQVR8aqzI0jzU9XsPYSrhOvHTqHxuvLoVXksKbnl-DlBKuEykP9Uvxq0vxK0nxm15Qg5QSrhMp3fqlBNWlBJWkBE2vXYOUEq4TKY__99b7onyGZqcSgxe339d_bmW3IsoVFleoUale4rNWy7ym2E7zXP5AorHFW1ZshknxKgM8DTNnmJ-F2WWYu5tLqn1nOnCHg1u4285wx93cuaX5wRnuupu7tzQ_umfVKjkm7kN22R0fvv0LAAD__3k1DwI=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum((a-1)*1000) + sum((b-1)*100) + sum((c::INT-1)*10) + sum(d-1) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMVc2K2zAQvvcpzJycroytn2SzOnlpewh0tyW7PRUf1GhwA1nLyAq0LHn3YrskdtjIpiElt5HGn78fDcwrFEbjo3rBCuR3oECAAQEOBAQQmEJGoLRmhVVlbP1JC1joXyATAuui3Lr6OiOwMhZBvoJbuw2ChGf1Y4NLVBptnAABjU6tNw1Nadcvyv5OtXIKCDyVqqhkEMU0UIUOaGDcT7RAYImFRiuDMKURlVIuHp_nk_c0SZK_BxKEKeu3Oh3elr3-vp2K5v7jpw-Lh_vPkO0ImK072KmcyhEk3ZHxlu_z3GKunLHxtO_46dtDmNJJbbau2L7i-0pMTopgJ0UcuLeFsRot6h5xtvPLpMm_6Dy8TCpuwpTfhCm9SdnktAPec0DHTw4dMzkxjWJ27bMzYLrzKLPLzQ4bnzwblTyLYn7tyQ-Y7iR_e7nk-fjk-ajkeRSLa09-wHQn-fnlkhfjkxejkhdRPL325AdMd5K_-z-b6g0RS6xKU1R4tLHe_nNSbzLUObZrrzJbu8Kv1qwamvb4pcE1Fxor13Zpe1gUbasW2AVTL5j1wPQYzPzMA9TcixZ-sDhH99QLnvmZZ-cw33rBcz_z_BzmO_9bJQNj4h-yY-5s9-5PAAAA__8iBW3U
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMVV9ro0AQf79PscyTNiu6atrUJ0ubAyFNe0kODooP2-yQCySa21W4I-S7H2pJNDSrXMiRt90Zf_7-7MBsQf1aQQDT4Wj4OCO5XJGvk5dn8jb88Tp6iMbEeIqms-m3kUk-PjEMla8NgxOLMJPcEOY4jkl6pKy-16rmvjoPgmg8Gxx6-5aoaiWl4BmPgUKSChzzNSoI3oABBRcoeEDBBwp9iClsZDpHpVJZfLItAZH4DYFDYZls8qwoxxTmqUQItpAtsxVCADP-vsIJcoHSdoCCwIwvVyXNRi7XXP4JCw1AYbrhiQqIZTPCE0EYSbOfKIHCBBOBMiBGyCwWVLbMmyKCjwslRug2W7WOVx0b_X079Mv60_Axen4YQbyjkObZwY7K-AIhYDva3fLDYiFxwbNU2v2m4-n3ZyNkZmG2OLn7k7c_-eZJEe5JEQfuPEmlQImiQRzv9DKZ8y86Dy8T-j0j9HpGyHqha5524DUcsO6Tw7pMjs0s27322WkxXXuU28vNjts9ebdT8q5le9eefIvpWvJ3l0ve65681yl5z7L9a0--xXQt-cHlkve7J-93St637P61J99iupb8_f_ZVJ-ImKDapInCo431-Z-dYpOhWGC19lSayzm-ynRe0lTXlxJXFgSqrOqy6hIlVasQWAczLdhtgNkx2NUzt1B7WrSvB_vn6O5rwbd65ttzmO-04IGeeXAO873-rZyWMdEP2TF3vPvyNwAA__98CJEd
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a), min(b), max(c), count(d) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lM9r2zAUx-_7K8I7pSAj60fS1CeXnXJIOpoGBsMMLXp4gdQykgIbJf_7sH2oExpZS0hvtpVvvh8-T7w3qIzGpXpFB9kPYECAAwEBBCQQmEBBoLZmg84Z2_ykC8z1H8hSAtuq3vvmc0FgYyxC9gZ-63cIGbyoXzt8RqXR0hQIaPRqu2trart9VfZvrpVXQGBVq8plo4Sykar0iI2M_40WigMBs_fvDc6rEiFjBxJP8ViWFkvljaWTY4jVejHO2R0QWMyX45y3T4_fx7lonr4-rZcv41zencXgZzHe2_eVsRot6qPq4hAGZen_kK7Wi5_zAVZxxMriB8diBkdZQvkFoxvg6BmZ3nJ0PF4Hj9LBEyou0DHA0dNxf0sdIl6HiNIhEiov0DHA0dMxu6UOGa9DRumQCZ1coGOAo6fj4bP23AcYz-hqUzk82Xcf_3Pa7EHUJXZL05m93eA3azZtTff61ObaDxqd705Z9zKvuqMGsB9mwTA_CrPTMA83D1SLYFqGw_Ia7kkwPA03T69pvg-GZ-Hm2TXND-FZpQPXJHzJTruLw5d_AQAA__-ZF-tW
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lF2L2kAUhu_7K4ZzlcBInCTuurlSthYCfmyNwsISymzmYAXN2JkJbBH_e0lSWJXdSarYK_P1-j48Zzh70L82EEEyGo8eF6RQG_JtPpuQl9Hz03gYT4nzNU4WyfexS_5-ooutw11KtuvceS1_-ZuTuZRkssiNI9w6L7jhKVDIpcAp36KG6AUYUPCBQgAUQqDQg5TCTskMtZaq_GRfBWLxBlGXwjrfFaZ8nFLIpEKI9mDWZoMQwYK_bnCOXKDyukBBoOHrTVWzU-stV78HJQNQSHY81xHpeIzwXBBGpPmJCtIDBVmY9wZt-AohYgfanmK4WilccSOV1zuFSJYTZ8BcoDCJp87Ar66Gz84gKK8eZ8vpwhmE7qcY_qcY7-1FLpVAheKkOj3YQVn3X0iT5eRH3MAanLCy9oNjbQbnsY7nXzC6Bo4jI3e3HJ3fXoffSoff8YILdDRwHOm4v6WOoL2OoJWOoOOFF-ho4DjS0b-ljrC9jrCVjrDj9S7Q0cBxpOPhf-25DzDmqHcy13i27z7-5265B1GssF6aWhYqwycls6qmvp1VueqBQG3qt6y-ifP6VQl4HGbWsH8SZudh397cUB1Y06E9HF7D3bOG7-zNd9c031vDfXtz_5rmB_usug3HxH7IzrvTw5c_AQAA___zjwZw
 
 # AVG is more tricky: we do two aggregations (for the sum and for the count)
 # and calculate the average at the end.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT avg(a+b+c::INT+d) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lM-L4jAUx-_7V8g7KaakSavj5NRlTx7GWfxxWsqSNY-u4DQlibDL4P8-tD1MlTENaG-28dvvh88L7x1KrXAl39CC-AUMCHAgkACBFAjMICdQGb1Ha7Wp_9IGluofiJjAoaxOrn6dE9hrgyDewR3cEUHAVv454hqlQkNjIKDQycOxqanM4U2a_5mSTgKBTSVLK0YRZSNZqhEbafcXDRBYY6nQiFGWTsfjjE0zPplmiRDL1XYxgfxMQJ_cJ4F1skAQ7EzCKb8XhcFCOm3o7BJys3sZZ2wCBH687lbb5vetSn6z8rPpVGqj0KC6qMnPfigW36La7F5-L2suPumqYjTjNzmTC04WPkAWMkDKIsoHGGEPZ8fW_FEj5OFqeJAaHtFkADU9nB01T49Sk4SrSYLUJBFNB1DTw9lRs3iUmjRcTRqkJo3obAA1PZwdNc9D7MQvKtdoK11avNqNX385rncmqgLbBWv1yezxp9H7pqZ9fG1yzQuF1rWnrH1Ylu1RDdgNM2-YX4TZdZj7m3uqE2869YfTe7hn3vDc3zy_p_nJG174mxf3ND_7ZxX3XBP_Jbvuzs_fPgIAAP__psb8wQ==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF2L2kAUhu_7K4ZzleBInEncdXOVZWsh4MfWKBSWUGadQyq4GTuJpUX87yXJwkZZJwHNXb5e38fnDOcA2e8t-BCNJ-OnJdnrLfm2mE_Jy_jH8-QxnBHraxgto-8Tm7x_Iv4klmUJ0iOvNumRte-Hs-WouJR2lZUiFzFQSJXEmXjDDPwXYECBAwUXKHhAYQgxhZ1Wa8wypYtPDmUglH_BH1DYpLt9XjyOKayVRvAPkG_yLYIPS_G6xQUKidoZAAWJudhsy5qd3rwJ_S8oGIBCtBNp5pO-w4hIJWFE5b9QA4UFphK1TwKvZ1kB6wXc7gXu-3-B-EhB7fMPgiwXCYLPjrQ95WOSaExErrQzPIWMVlMrYDZQeJqvZsvy-lIlv1j50bRPlZaoUZ7UxEczFBtcoopW059hwcXtuirmBPwip3vCydoPkLUZoMP6Du9ghA2cNVt3txohb6-Gt1LD-47bgZoGzpqa-1upcdurcVupcfuO14GaBs6amtGt1Hjt1Xit1Hh9Z9iBmgbOmpqHLnbiJ5ULzHYqzfBsN37-y4NiZ6JMsFqwmdrrNT5rtS5rqtt5mSsfSMzy6i2rbsK0elUA1sPMGOYnYXYe5ubmhmrXmPbMYe8a7qExfGduvrum-d4YHpmbR9c0P5hnNWg4JuZDdt4dH7_8DwAA__-vNhS0
 
 # VARIANCE/STDDEV have three local (sqrdiff, sum, and count) and one final stage aggregations.
 # We calculate and render the variance/stddev at the end.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a), round(stddev(b), 1) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lEGL2zAQhe_9FWZOKcjYkp1sVicvTQOGNmmTbC_FFDUa3EDWMrIMLUv-e7F9WCckssBkb5LGz-_pGzGvUCiJK_GCFfCfQIEAAwIREIiBwBQyAqVWe6wqpZtPOkEq_wIPCRyKsjbNcUZgrzQCfwVzMEcEDjvx-4gbFBJ1EAIBiUYcjq1NqQ8vQv9LpDACCGxLUVTc8wPqiUJ61FPmD2ogsK4N9xJKEgbZiYCqzZtdZUSOwOmJuEd6ynONuTBKB9PzRNvnr5OEfmzCfN8s0uVykrB215y3q0_r59WuXd-Kwm5GeUtQF0pL1CjP7LOTPSwNb6VdpqunL7-2u8Xi849JwkgSkSRuChssJOqWnqdVXcimSjnn6Wo3v32H6OwO1L3D1KXDAfUDNrbHA6F62Gb37jFz58Oc-DA_iMbyGQjV4_Nwbz6RO5_IiU_kB_FYPgOhenzm9-YTu_OJnfjEfjAdy2cgVI_P43vO0CtRNliVqqjwYpZe_3PYzFiUOXYDuVK13uM3rfatTbddt7r2QGJluirtNmnRlZqAfTG1itmZmF6Kmd15wDqyqmO7OB6Te2oVz-zOszHOD1bx3O48H-P8aO9VOPBM7I_s0js7ffgfAAD__xebCC0=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lGFr4j4cx5__X0X4PaoQqUnr5vqoYyoUnG62-3MwypGZH57gGi9JjzvE9360HUxltoXiPWuSfvv99JOQPZifWwggnswmDwnJ9ZZMl4tH8jr59jS7j-bEGUdxEj_PeuTjFZO_O6JHiVZ5Jh1jpcRfzluPEtarolJYkQKFTEmci3c0ELwCAwocKHhAwQcKQ0gp7LRaoTFKF6_sy0Akf0MwoLDJdrktplMKK6URgj3Yjd0iBJCIty0uUUjU7gAoSLRisy1rdnrzLvSfsGAACvFOZCYgfZcRkUnCiLI_UAOFRW4DEjIackgPFFRuP-uMFWuEgB1oe6T79VrjWlil3eEpUfzy6ISsV8A8L8fRdOqEvBwV8-XTw-JlnpTPl1D4RZRPgjxTWqJGeVKfHuph2eAS7TSa38--x8l4PPnfCTkNPRr6xcISM4m6tPdxBkJOWRAE0TwZXf4H7-QfWPsdZm122GV9l3fd4waoI203195j3t4Pb-WH912vq58GqCM_t9f247X347Xy4_Vdv6ufBqgjP6Nr-_Hb-_Fb-fH77rCrnwaoIz93__IO_QJliWanMoNnd-nXXx4UdyzKNVYXslG5XuGTVquyphouylw5IdHYapVVgyirlgrA4zCrDfOTMDsP8_rmhmqvNu3Xh_0u3MPa8E19802X5tva8Ki-edSl-a5-rwYNx6T-kJ13p4f__gYAAP__8VsiBA==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a), round(variance(b), 1) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lEGL2zAQhe_9FWZOKSjYkp1sVieHbQOG1mm92V6KKWo0uIGsZWQZWpb892L7sE7YyAKTvUkaP7-nb8S8QKkkpuIZa-A_gQIBBgRCIBABgQXkBCqt9ljXSref9IJE_gUeEDiUVWPa45zAXmkE_gLmYI4IHHbi9xEzFBK1HwABiUYcjp1NpQ_PQv-LpTACCDxWoqy5N_epJ0rpUU-ZP6iBwLYx3IspiRnkJwKqMa92tREFAqcn4h5pXRQaC2GU9hfniR6fvs5i-rEN8z37lGw2s5h1u_a8Wz1sn9Jdt74WhV2N8pqgKZWWqFGe2ecne1gaXEu7SdL1l18_1lmyTh8-z2JG4pDEUVvKsJSoO36eVk0p2yrlnCfpbnX9FuHZLah7j6lLj30699nULo-EGoBb3rrLzJ0Pc-LD5n44lc9IqAGfu1vzCd35hE58wrkfTeUzEmrAZ3VrPpE7n8iJTzT3F1P5jIQa8Ll_zyn6RpQM60qVNV5M07f_HLRTFmWB_UiuVaP3-E2rfWfTb7edrjuQWJu-SvtNUvalNuBQTK1idiaml2Jmdx6xDq3qyC6OpuReWMVLu_NyivOdVbyyO6-mON_bexWMPBP7I7v0zk8f_gcAAP__EtIIrA==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lNFr4jAcx9_vrwi_pwqRmrQ616eKUyi4ulV3HIxyZOaHJ2jjpe1xh_i_H20HU5lpobi3Jum3308_CTlA-nsLHiwms8l4SXK9JdNo_kheJz-eZqMgJNZDsFgunmcd8v5Kmu8s0aFEqzyR1h-hNyJZofXWoYR1qrAUmYiBQqIkhmKHKXivwIACBwoOUHCBQh9iCnutVpimShevHMpAIP-C16OwSfZ5VkzHFFZKI3gHyDbZFsGDpXjbYoRCorZ7QEFiJjbbsmavNzuh__kFA1BY7EWSeqRrMyISSRhR2S_UQGGeZx7xGfU5xEcKKs8-6tJMrBE8dqTNkUbrtca1yJS2--dEi5dHy2edAuY5egimU8vn5aiYL5_G85dwWT5fQ-FXUT4I8kRpiRrlWX18NMOy3jXaaRCOZj-_j6JgFI4nls-p71DfLZYiTCTq0t_7OfA5ZZ7nBeFyeP0vnLO_YM33mDXZY5t1bd52l2ugTsQNbr3LvLkf3sgP79pOWz81UCd-7m7tx2nux2nkx-nabls_NVAnfoa39uM29-M28uN27X5bPzVQJ37uv_IW_QQlwnSvkhQvbtPPv9wrblmUa6yu5FTleoVPWq3Kmmo4L3PlhMQ0q1ZZNQiSaqkAPA0zY5ifhdllmJuba6odY9o1h9023H1jeGBuHrRpvjOGh-bmYZvme_Ne9WqOifmQXXbHx2__AwAA__-GjSNC
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT stddev(a+b+c::INT+d) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lNFq2zAUhu_3FOZcpUTGkeykqa9UlgUMW7ol6W6GGVp08AKpZSQFNkrefdge1AmNLAi-s638-T--I84rlEriSryggfQHUCDAgEAMBBIgMIWcQKXVDo1Ruv5JG8jkH0gnBPZldbT155zATmmE9BXs3h4QUtiKXwdco5CoowkQkGjF_tDUVHr_IvRfLoUVQGBTidKkQRjRQJQyoIGyv1EDgTWWEnUa8GQ8GnE65uxuzOM0zVbb-R3kJwLqaN8IjBUFQkpPxJ_ysSg0FsIqHU3PITff1otsuRxxelczPn_5__Tx6Xm1bZ6vAbCrAG-9x1JpiRrlWWl-ciPSC5HLbPX4-edmu1h8-j7ilHBGeHwdLD4Do_7zoz7zi2gYsQEm2MPZ0TMbZoLMXxTzEsXCKB5AVA9nR9T9MKJif1Gxl6g4jJIBRPVwdkTNhxGV-ItKvEQlYTQdQFQPZ0fUw_DL8x2ANZpKlQYvluj7_zyplyvKAttNbNRR7_CrVrumpn19anLNB4nGtqe0fcnK9qgG7IapM8zOwvQyzNzNPdWxM524w8kt3FNneOZunt3SfO8Mz93N81uaH9yzmvRcE_clu-zOTx_-BQAA__864QlC
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF1r4kAUhu_3VwznKuJInCS2NlcpVSFgbWvSZaGEZeocXMFm3Jlx2UX870sSoSp1EpDcTT5e38fnhLMD_XsNISTj6fghJVu1JpP50yN5G_94nt7HM-KM4iRNXqYdcnhFGyHwj-M4nHTJe4d0ySIM41k6LI6iU8UFNzwDCrkUOOMfqCF8AwYUPKDgA4UAKAwgo7BRcoFaS1W8sisDsfgLYZ_CKt9sTXE7o7CQCiHcgVmZNUIIKX9f4xy5QOX2gYJAw1frsmajVh9c_YsKBqCQbHiuQ9JzGeG5IIxI8wsVUJhjLlCFJAq6jhOxbuR1upF_-C-Q7SnIrfkk0IYvEUK2p80p75dLhUtupHIHp5DJy3wUTyZOxDoF4-vj4fTw9DpLy_MlAO8iwGfvNpdKoEJxUprt7YjsTOQknt1PfybpaDT-7kSMRh6N_Mtg_gkYaz4_1mR-Luu5XgsTrOE80nPTzgS95qK8RqK8nuu3IKqG80jUbTui_Oai_Eai_J4btCCqhvNI1LAdUUFzUUEjUUHPHbQgqobzSNRd-8vzC4A56o3MNZ4t0a9_uV8sVxRLrDaxllu1wGclF2VNdflU5sobArWpnrLqIs6rRwXgcZhZw95JmJ2HPXtzTbVvTQf2cHAN98AavrE331zTfGsND-3Nw2ua7-yz6td8JvaP7Lw723_7HwAA__8-qyJy
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT variance(a+b+c::INT+d) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lNGKm0AUhu_7FHKuEjJiZjTZrFeGbQNC67ZutjdFyjRzsIGsIzMTaFny7kUtrAmbcSB4p07-_B_fGc4rVFJgxl9QQ_wDKBBgQCAEAhEQWEBBoFZyh1pL1fykC6TiD8RzAvuqPprmc0FgJxVC_Apmbw4IMWz5rwPmyAWqYA4EBBq-P7Q1tdq_cPU3EdxwIPBU80rHnh9Qj1fCo540v1EBgRwrgSr2kmg2mSR0lrDpLAnjOM22qykUJwLyaN4ItOElQkxPxJ1yXZYKS26kChbnkE_f8o_pZjNJ6LRhfP7y_-nh8Tnbts_XANhVgLfeYyWVQIXirLQ42RHphchNmq0___y-ztN19vBpklCSMJKE19HCMzTqPkHqMsGA-gEbYYYDnD1By3FmyNxFMSdRzA_CEUQNcPZE3Y0jKnQXFTqJCv0gGkHUAGdP1GocUZG7qMhJVOQHixFEDXD2RN2Pvz7fAchR17LSeLFG3__nebNeUZTY7WItj2qHX5XctTXd62Obaz8I1KY7pd1LWnVHDWA_TK1hdhaml2Fmbx6oDq3pyB6ObuFeWMNLe_PyluY7a3hlb17d0nxvn9V84JrYL9lld3H68C8AAP__OC0JwQ==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF1r4kAUhu_3VwznKuJInCS2NlcRqxCwsY12WShhmWYOrmAz7mRcdhH_-5JEqEqdBCR3k48375PnDLOH_PcGfFhMZpPxkuzUhkzj-RN5m_x4no3CiFiP4WK5eJl1yPGVP1yteZaiZVmcdMl7h3RJ6vthtBwWS9GpPiC45glQyKTAiH9gDv4bMKDgAAUXKHhAYQAJha2SKea5VMUr-zIQir_g9ymss-1OF7cTCqlUCP4e9FpvEHxY8vcNxsgFKrsPFARqvt6UNVu1_uDqX1AwAIXFlme5T3o2IzwThBGpf6ECCjFmApVPAq9rWQHrBk6nG7jHf4HkQEHu9CdBrvkKwWcH2pxytFopXHEtlT04h1y8xI_hdGoFrFMwvj4dV-P5a7Qs19cAnKsAn727TCqBCsVZaXIwI7ILkdMwGs1-fh_F4SgaT6yA0cChgXsdzT1DY80nyJpM0GY922lhhjWcJ4Lu2pmh01yU00iU07PdFkTVcJ6Ium9HlNtclNtIlNuzvRZE1XCeiBq2I8prLsprJMrr2YMWRNVwnoh6aP_4_AIgxnwrsxwvjtGvv9wvjlcUK6zO4lzuVIrPSqZlTXU5L3PlDYG5rp6y6iLMqkcF4GmYGcPOWZhdhh1zc021a0x75rB3C_fAGL4zN9_d0nxvDA_NzcNbmh_Ms-rXbBPzJrvsTg7f_gcAAP__2jsjsA==
 
 # Test various combinations of aggregation functions and verify that the
 # aggregation processors are set up correctly.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a), avg(b), sum(c), avg(d), stddev(a), variance(b), sum(a+b+c::INT+d) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzUllGL2kAQx9_7KZZ5Um4k2U2iMU8r5wmB1mvVu5ciR2oGK3hZ2URoOfzuJYnVKOcmIAi-ze7kv_Of_Q1sPiBRMY2jd0oh-AkcEAQgOIDgAoIHc4SNVgtKU6XzT0pBGP-BwEZYJZttlm_PERZKEwQfkK2yNUEAs-jXmiYUxaQtGxBiyqLVuiiz0av3SP-VcZRFgDDdREkasI7FWZTEjDOV_SYNCBNKYtIBk-5DqyX5gxTtB-kEQTie-W1kkiOTApl0kEkX5jsEtc2OjtIsWhIEfIfNXQ-WS03LKFPa8k5NT1--taRo537zyMmjx-eX8WwfF7vuIfIq-SKe_pgMw9Fof8Y-I04yx3N4-2I74mI7xy62idIxaYpPWpjvzA1z-5OO-cHT_97fQmPPhy-6-WoUjgdf36az4fDptSV7KDlK_5h4HUzCwfjxqSX7KAVWb8BuVyegQG2VpJFJz5JdZLKHTPrIZP_ibTknt8WbjyxvMrIW71jiBkNb47vCsHsPQyuaYxCNMIiO5dwAQ43vCobePWBwmmNwGmFwOpZ7Aww1visY_HvA4DbH4DbC4HYs7wYYanxXMPTvAUPNj8GE0o1KUjp7UT8_2c5fWoqXVD7LqdrqBX3XalGUKZfPha7YiCnNyiwvF2FSpnKDVTE3isWJmJ-LhblyTWnHqHbNYvca355R3DVX7l5TuWcU--bK_jWV-2ZWds2YmIfsvPZ89-VfAAAA__-ZSpEL
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzUVt9r4kAQfr-_YpmnBEfibuKvPK1UhYC1rbHloEjZZhdPsIm3ieWO4v9-JPE0ljYJCIJvM5n59vtmv4HNB8S_1-CCP5qMbuZkq9dkPLu7Jc-jn_eTgTclxtDz5_7DxCT7lnj7ZggTiXhfGq8mZnmwz2WaJ1Kq96zlXeiVCAN16DMMQRrk1SQNEriuN5330lCaOacUiVgAQhhJNRVvKgb3GSggMECwAcEBhDYsEDY6ClQcRzpt-cgAnvwDbgthFW62Sfp5gRBEWoH7AckqWStwYS5e12qmhFTaagGCVIlYrTOajV69Cf2XpxoAwd-IMHZJ06JEhJJQEiW_lAaEmQql0i7hTsMwOG1wZja4vZ8FCadIOEPCbSTcgcUOIdomR0VxIpYKXLrD-qoHy6VWS5FE2mqfivYfbw3OzFRvGtlpdHP3OJ3v4-yrc4jahXoW-w-zoTce78_YV9hJ5XgONb8dh307znGKbRhpqbSSJyMsduUD09YXE9ODpv-zv3ilMx86Omk29qaDyYs_Hw5HTwbvIqfIe8fC02DmDaY3I4P3kTMs3kDLLG5AZrWVO42Ety3eQcK7SHgPCe9_e1v2yW3R-itL66ysRZsWu8DSVugueNi5hqVl9W1gtWxgTcu-gA0Vugs2dK_BBru-DXYtG-ym5VzAhgrdBRt612CDU98Gp5YNTtNqX8CGCt0FG_rXYEPFj8FMxZsojNWnF_Xrk1vpS6vkUuXPchxtdaDudRRkNHl6l-GyD1LFSV6leeKFeSkVWATTUjA7AdPPYFbOXEFtl6KdcrBzju52KbhTztw5h7lbCu6VM_fOYe6Xe9WqWJPyJfvMvdj9-BcAAP__RtW5-g==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a), min(b), max(c), count(d), avg(a+b+c::INT+d), stddev(a+b), variance(c::INT+d) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzUVlFr4lwQff9-RZiniCPJvTfRmKcrtULga7qrtiwsUrJmcAWbyE2EXYr_fUlCYyI1Cfggvk1m5njmzBnwfkAUh-QH75SA-xMYIHBAEIBgAYINK4S9iteUJLHKWgqAF_4B10TYRvtDmqVXCOtYEbgfkG7THYELy-DXjuYUhKQMExBCSoPtLqfZq-17oP7KMEgDQFjsgyhxtYHBtCAKNabF6W9SgDCnKCTlatLq67pkfcl7fSlc1_OXTg-1PINZ9TOZ5VDLkyIrwOqIEB_S05RJGmwIXHbE7komm42iTZDGyrDrQhYvT7q0eoDw5Pm6tPNo8kOXwyx6eH7xl7ocZXHeySrZPF58n0-92UyXvOzhlR5e6xFlj6j0iN5FkfyiyJO2QxSrkBSFNWGrY_MamPnFHli5B17u4XPmNy-b1SoV2LV8vq2Z50_-f1ssp9PHV12OUDoox6fC62TuTfyHR10yEyVjKFlOU95IzXjUpG3IIWpyhJp0Lq5I1FbEul8063LRBhsY_EY33aKlYubwfm-adzeMdzKMDwxxI8NatFQMG92vYaK7YaKTYWJgWDcyrEVLxTDnfg2zuhtmdTLMGhj2jQxr0VIxbHy_hrW8ZeaU7OMoobO_-69_2cyeARRuqHgzJPFBrembitc5TfH5nOPyREhJWlRZ8eFFRSkbsApmjWBeA7NzMG9mbqEWjWirGWxdM7fdCB42Mw-vYR41gp1mZuca5nGzV2bLmTQf2Tn36vjfvwAAAP__hM679A==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzUVl9r-koQfb-fYpmnDY7ETeKf5mmlKgSs_VVtKRQp2-ziFTTxbmLppfjdf2y0NiltEuiD-NTJzJyeOXMG3HdI_luDD7PheHg9Jzu9JqPp7Q15Gj7-GfeDCaGDYDaf3Y0tcmxJdhsqLCSbVURfzF_xRkMLSRjvopRKC4l4XVJKBWmQF4s0SOj7wWTeM6GpJqmU6vVYRvIq9EpEoaLHtqzrMIMUqVgAQhRLNREblYD_BAwQHEBwAcEDhDYsELY6DlWSxNq0vGeAQL6B30JYRdtdatILhDDWCvx3SFfpWoEPc_GyVlMlpNJ2CxCkSsVqndFs9Woj9P_czAAIs62IEp80bUZEJAkjcfqv0oAwVZFU2ifca1DKWYM7VoO7R8VIsgya6kfS5JBkSdcUYLFHiHfp55RJKpYKfLbH-kr6y6VWS5HG2m4Xhczubyj3LEC4CSaUt7Oo_0h5x0TXt_eTOeVdE2edLJfN4tnddBCMRpQ7px4n1-MUetxTj5vrca0fRTo_ivzUtotiLZVWsiBssS9fA2t9swd22oNz2sPHzM-BmdU7KWgX8tm2RsGkP36ezQeD4QPlXeQ95FefhYf-NOhProeUsxZyxpCzjOZ0IwXjkfC2zTtIeBcJ7_24IrewIlb_olmdi7ZZ03bOdNMVWnJmdi73pp36hjm1DHOatnsmwyq05AzrXq5hbn3D3FqGuU3bO5NhFVpyhvUu1zCvvmFeLcO8pt0-k2EVWnKGXV2uYRVvmalKtnGUqC8_99__55Z5Bii5VIc3QxLvdKj-6DjMaA6ftxkuS0iVpIcqO3wE0aFkBsyDWSnYKYDZV7BTzlxB7ZaivXKw95u526XgTjlz5zfM3VJwr5y59xvmq3KvWhVnUn5kX7kX-3_-BgAA__-sY-ji
 
 # Verify that local and final aggregation is correctly shared and de-duplicated.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a), stddev(a), avg(a) FILTER (WHERE a > 5), count(b), avg(b), variance(b) FILTER (WHERE b < 8), sum(b) FILTER (WHERE b < 8), stddev(b) FILTER (WHERE b > 2) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzslkGP2jwQhu_fr7DmtJ9klNhOIORktIAUacu2gd1Li1YpGVEkNkFOkFqt-O9VkpYkNHEiceDCCTyemdfz5rHkD4jiEBfBOybgfgUGFDhQEEDBAgo2rCkcVLzBJIlVllIUeOFPcE0Ku-hwTLPwmsImVgjuB6S7dI_gwir4vkcfgxCVYQKFENNgt89lDmr3HqhfMgzSACgsD0GUuGRgMBJEIWEkTn-gAgo-RiEql0j27WiaAm3Xdb3FyqFE8jyycS4jyMsIy6KwPlGIj2l50CQNtgguO9H-w0y2W4XbII2VYddnWb58epDW_9kYX_ypN5__WT0-vyxWf3eKHDL3nlYzn0hW3W-K2ucqu9bZLrN5mVGLnTvUMxs6iIYOorGDaDWRt5pYeneMYhWiwrBm3Pqkt5mZDT6zzI25t5g8vS1X0-ns9UFyKhmVomJz8e_NqxpZrIbnrFHZ6HXie5PF4-xBOlSOqWTmOWv8rxxjVLJMM1csAc1Qo0QKQ1qUSJsSOTTynxElMoNx3OqhqHnI-t8q1udWGWxg8Nvdq45xKh98eL9XbfeK92eC92KCDwxxOyY6xqkwMboz0caE6M-E6MWEGBjW7ZjoGKfChHNnoo0Jqz8TVi8mrIFh346JjnEqTIzvTPR5kzWY6GNyiKMEL95mzZ3N7M2G4RaLB14SH9UGP6t4k8sUy-e8Lg-EmKTFLisWXlRsZQesFjNtMa8Vs8tirlfukBbaaktfbF1zbltbPNQrD69RHmmLHb2yc43yWP-tzA5M9JBdaq9P__0OAAD__wXcSdY=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzsVk1vqzgU3c-vsO6KSI7AfOSDlaOGaJDStCVpZ6ROVDlgZSIlkGegek9V_vsT0AbI40vqIpuswNf33HPv8bHkDwh_7MGEpTW37lYoFns0cx7u0av17-N8Yi-QNLWXq-XTvIc-U8L4ILEeRmHkefw9_WXvW4n10MyerywHSf_8bTkWYui_WFE0joweRm4Q-5G0-cxNvu9M7JjvcmlzCdxkQBeNEpb40JaR9VGXxJHay0byWMTWgMEPPL5gBx6C-QoEMKiAQQMMOmAwYI3hKAKXh2EgkpSPFGB7P8FUMOz8Yxwl4TUGNxAczA-IdtGegwkrttlzhzOPC1kBDB6P2G6f0hzF7sDEL5r0ABiWR-aHJurLBDHfQwQF0f9cAAaH-x4XJqIka94wTdNerEYYUTWbeXQZ4WoeIUkU1icMQRzljYYR23IwyQl3H2ay3Qq-ZVEgZKM8y_L5XqJ6LxnjyZnas9nn6u7hebH62slyvo6EkuJ-VdQ4o4xSZSPPVvOMUuxcoZxZUUGrqKBVVtBqRVRrRcy1i_1AeFxwryTc-tQsM1EqdCaJGjN7MZm_LVfTqfUiURVTgqlWkDn7e7OLQmarwTlrmBd6mTj2ZHFnSXSE6RhTopyzxn_SEYIpSThTxtygidUwoppMdYyogREdyOlniBFNzDiu1VAraUi63yrS5VbJpC-r17tXLeMUDnxwu1d190rt7gm1kyfUvqxdzxMt4xQ8Mbx5os4TWndPaJ08ofVl_XqeaBmn4InRzRN1ntC7e0Lv5Am9LxvX80TLOAVPjG-e6PImqxDR4eEx8EN-8TarrqwkbzbubXn2wAuDWLj8UQRuSpMtH1JcGvB4GGW7JFvYfraVNFgEk0awWgKTS7DazNxCrTWi9Waw_p2-jUbwoJl58B3mYSN41Mw8-g7zuPmslBabNJvsknt9-ut3AAAA__-3oYzC
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a), avg(DISTINCT a), variance(a) FILTER (WHERE a > 0) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0k0GL1DAUx-9-ivBOK6SkSTsiOc2wrlLQUTp1L9pDbB61MJuUJAVl6XeXtoe1yzhEZvaYl_zyfu_B_xGM1bhXD-hBfgMOFARQyIBCDhQ2UFPonW3Qe-umJwtQ6F8gUwqd6YcwlWsKjXUI8hFCF44IEir144glKo2OpUBBY1DdcW7Tu-5Bud9brYICCodeGS9JwjhRRhNObPiJDiiUaDQ6Sbb8-5CmGaZSymJfvaVky6EeKdghPAn4oFoEyUf6D8knt8FYp9GhXnnV44kxdm3rsFXBOrZZT3H4-ulmK14Dhd39h5t3xaEq9rcVWUr3u7LY7W_vphfkffGxuivPSYuVNI_fLI_ZLOMJE9ffrYjXFFGaImHZ9TWzeM0sSjNLWH59zTxeM4_SzBO2edlAndAs0ffWeHwWrNM_p1PgULe4pNPbwTX4xdlmbrMcP8_cXNDow3LLl0Nh5qtZ8G-Yn4XfrOD0OSwu6ZxdAueXwJv_guvx1Z8AAAD__1Jn5xc=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0k8GOmzwQgO__U1hzSiRHYCC_Kp8SpWyLlGW3QLeVthxcPKJIBFPbrFpFefcKaJVmla6okh49M5_n81izB_O1Bg5puA03Gel0TW6Su1vyGH68366jmMxeR2mWvtvOyc8S0-1mYk6JeCqHXBRvMtIHnoSuRFPgTMzJTbTNwoTMPrwNk5AI8qlzXR-JOx9vl8KKHCg0SmIsdmiAPwIDCh5Q8IFCABSWkFNotSrQGKX7kv0ARPIbcJdC1bSd7cM5hUJpBL4HW9kagUMmPteYoJCoHRcoSLSiqoc2ra52Qn9f9Q5AIW1FYzhZOIyIRhJGlP2CGigk2EjUnKzYKO9yzqM4e0XJikF-oKA6exQwVpQInB3oHySPbl2jtESN8sQrP5x5xrosNZbCKu0sT1-Rvr-drbw5UFg_vDn-wxh6WCfROt6EfcWvr3hB2juRZtMny6ZM1mELx7v-bL3pmt4kTW_h-NfX9Kdr-pM0_YUTXF8zmK4ZTNIMFs7y3y7UGc0ETasag88W6_zNbr9wKEsct9OoThd4r1UxtBmPdwM3BCQaO2bZeIiaITUI_g6zF-H_T2D3Oexd0tm_BA4ugZd_BeeH_34EAAD__9v8Cg8=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a), avg(a), count(a), stddev(a), variance(a) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lNGLm0AQxt_7V8g8XWFFdzW5nE-GywWEXtJqci9Fjm12sIGcK-sKLUf-96IWTsNlFSQPgcxOvnzf_maZd8ilwA1_wxKCn0CBAAMCHhDwgcAMUgKFkgcsS6nqn7SCSPyBwCVwzItK18cpgYNUCME76KM-IQSw479OGCMXqBwXCAjU_HhqbAp1fOPqbyi45kAgKXheBpbtUIvnwqKW1L9RAYFtpQMrpJCeCchKf3iVmmcIAT2T8XmWWaYw41oqZ9aPk-yf70L6FQg8bveb3f_vyY94Fa3XTXUtALsa4MO3yqUSqFD0TNOzOSJ1r2VM9s-vUZ2S1dU62iy_vSa71erp5S70SEhJt_GyjKPl5vGp14oxF6hqssQKqRMyYjUfj1ihf_WuXu-udPzw6ZjhO9R22KTxDyTqsJ3fZvxsPBI2CgmzHW8SkoFEHST3t0HijUfijULi2Y4_CclAog6SxW2Q-OOR-KOQ-LYzm4RkIFEHycPt9-YnAWIsC5mXeLE_P_9nt96rKDJsl3ApK3XA70oeGpu23Da65kBgqdsubYsob1t1wK6YGsWsJ6aXYmZ2HrD2jGrfLPan5J4ZxXOz83yK871RvDA7L6Y4P5hn5Q48E_Mju_ROz1_-BQAA__-gWwJr
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF9ro0AUxd_3Uwz3KYEJZtT0j0-GJgEhTVpNy0KRMutc3EDqZGfGskvJd1_UQk1oVJA8hMz1ejzH35X7AfrPDjyI5sv53YbkakcW4fqevMx_PiynwYoMZkG0iR6XQ_J5i87fBnxICX9Py_9E5pkpT9oIge_l8Z2rLc8SHPBh9TzBDY-BQiYFrvgbavBegAEFGyg4QMEFChOIKeyVTFBrqYpbPkpBIP6CN6awzfa5KS7HFBKpELwPMFuzQ_Bgw3_tMEQuUFljoCDQ8O2utNmr7RtX__wiA1CI9jzTHhlZjPBMEEak-Y0KKKxz4xGfQXygIHPz5aUNTxE8dqDd80zTVGHKjVTW5DhO9HQ_8NkQKNytn1abz3P0GM6CxaKszgWwzwb48s0zqQQqFEem8aE5Ihufyxg93b8GRUq7qBbBarp8jTaz2fx54DvUZ7TeeJ6GwXR1Nz9qhZgJVAVZSnxm-TYl5c-hxHfPvqtz9K6s-_BZl-FbbGTZvcbfkqjG9uoy47e7I7E7IbFHltMLSUuiGpLryyBxuiNxOiFxRpbbC0lLohqSm8sgcbsjcTshcUfWpBeSlkQ1JLeX35vfBAhR72Wm8WR_fv_kcbFXUaRYLWEtc5Xgg5JJaVOV61JXXhCoTdVlVRFkVasIWBezRrF9JGanYrvZucXaaVS7zWK3T-5Jo_iq2fmqj_N1o_im2fmmj_Nt86zGLZ9J80d26h0ffvwPAAD__xJcIvU=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a), avg(b), sum(a), sum(a), avg(b) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lEGL2z4Qxe__T2Hm9C_IyJKcbNYnl55y2E1JNqdiihoNbiBrGUmGliXfvcimrBM2ssDpbcbKy3v6jZg3aLTCZ_mKFopvwIAABwICCORAYAEVgdboA1qrjf_JIFirX1BkBI5N2zn_uSJw0AaheAN3dCeEAl7kjxNuUSo0NAMCCp08nnqb1hxfpfldKukkENi1srFFklKWyEYlLNHuJxogsOlckZSMlByqMwHduXc762SNULAziY_0ua4N1tJpQxeXiXb7p_9L9smH8RX31ZfN_vmlr2-Z85vm755do41Cg-rCsDqH47FsOt9u__R97RMK322xUWh6XEnJaSnIUP5tb15CXFyCxQ-VxQyVspTyuWOdCDXitrz_WHk8ER5FhKdUzCUyEWpE5OH-REQ8ERFFRKQ0n0tkItSIyOr-RPJ4InkUkTyli7lEJkKNiDz-22X4gfkWbasbi1dL8eN_zvyyRFXjsFmt7swBvxp96G2GdtPr-g8KrRtO2dCsm-HIBxyLWVDML8TsWszDzhPWIqjOw-J8Tu5FULwMOy_nOD8Exauw82qO82N4VtnEMwk_smvv6vzfnwAAAP__B8X2Pw==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF-L2kAUxd_7KYb7pDASZxJ33Txl2VoQ_LM1CoUllFnnkgqasTOT0iJ-95Kk7aqsk0Ds272TnJyT3x3uAcz3LYQQjyajpyXJ9ZZ8Wsyn5GX05XnyOJ6RzsdxvIw_T7rkzysm33VElxLxI-28dum__vy8-ooUViRAIVMSZ2KHBsIXYECBAwUfKARAYQAJhb1WazRG6eKVQykYy58Q9ilssn1ui-OEwlpphPAAdmO3CCEsxesWFygkaq8PFCRasdmWNnu92Qn9KyoyAIV4LzITkp7HiMgkYUTZb6iBwjy3IYkYjTgkRwoqt292xooUIWRH2jzSY5pqTIVV2hucJ4pX007EukWYouJF9TRfzZZlfc2cXzV_88wzpSVqlGeGydEdj_Xr88Wr6ddxkdAvugVmEnWJi0Tci3xalX_bqz_hn_0Eaz5U1mSoHut5vO1Ya0KdcLu7_Vh5cyK8ERHe8_y2RGpCnRC5vz0RvzkRvxERv-cFbYnUhDohMrw9kaA5kaARkaDnDdoSqQl1QuTh_y7Dd8wXaPYqM3ixFN__cr9YlihTrDarUble47NW69KmauelrjyQaGz1lFXNOKseFQFPxcwp5mdidinmbucaa9-pDtzioE3ugVN853a-a-N87xQP3c7DNs4P7ln1a66J-5JdeifHD78DAAD__4-zEsY=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT avg(c), sum(c), avg(d), sum(d) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lF-L4jAUxd_3U5T7tEIk5o-O06fKwIKwMy5Wn5ayZM2lKzhNSVPYZfC7L22FaWVMC8V50tzk9Jz8brhvkBmNL-oVCwh_AgMCHAgIICCBwBwSArk1BywKY6sjjWCt_0I4I3DM8tJV5YTAwViE8A3c0Z0QQtip3yfcotJo6QwIaHTqeKptcnt8VfZfpJVTQCDOVVaEwZSyQGU6YIFxf9ACgU3pwiASJJKQnAmY0r3bFU6lCCE7k-GRVmlqMVXOWDrvJor3z18jNgECT5v9y-7yv67yVpVPbgbhN4O8-5eZsRot6o55cvZHZbNbWeP986_1JdclrejUZbXaYqbRhkHE6NMqrk6v4m_fN6vdckKCiJEgEjSS1c_Ny4nO5djwxrMhjadsSvnY1veEavFc3Lf1fDgdPogOn1Ixlk5PqBadh_vSEcPpiEF0xJTKsXR6QrXoLO9LRw6nIwfRkVM6H0unJ1SLzuPnDdUPgmyxyE1W4NVw_fjLs2rook6xmdCFKe0Bf1hzqG2a5abW1QWNhWt2WbNYZ81WFbAtZl4x74jZtZj7nXushVct_WI5JvfcK174nRdjnB-84qXfeTnG-dHfq1nPM_E_smvv5PzlfwAAAP__uBQKgA==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lF-L2kAUxd_7KYb7ZGAkThJdN08R64Lgn61RKCyhTJ1LKmhiZyalRfzuJYmwUdZJILhP8d7M8fxy7nBPoH7vwYdwMpuM1ySTe_KyWs7J2-T762w0XZDO12m4Dr_NLHI5wv_Ena1FicoOxTOvxaUWVqkWXPMIKCSpwAU_oAL_DRhQcICCCxQ8oNCHiMJRpltUKpX5kVMhmIq_4Pco7JJjpvN2RGGbSgT_BHqn9wg-rPnPPa6QC5R2DygI1Hy3L2yOcnfg8l-QMwCF8MgT5ZOuzQhPBGEk1b9QAoVlpn0SuDTwIDpTSDP9bqc0jxF8dqbNkUZxLDHmOpV2_5oo3Mw7AbOAwni5Wawvv4uuU-k61l0Q5y7Iu3-WpFKgRHFlHp3NqKx3jzXczH9ML1wXWveq7-XVChOB0icBs8ejMD89Cl9my9F6aFESMEoC1w68_HH349yrj2PNB8-aDN5mXdtpO_oaqEqeg8eO3mmejtMoHadru23TqYGqpPP02HTc5um4jdJxu7bXNp0aqEo6w8em4zVPx2uUjte1-23TqYGqpPP8eUv1A5AVqmOaKLxZrh__cy9fuihiLDe0SjO5xVeZbgubslwWuqIhUOnyLSuLaVK-ygGrYmYUO1didit2zM411q5R7ZnFXhvuvlE8MDsP2jg_GcVDs_OwjfOzeVa9mmtivmS33tH5y_8AAAD__48DJK0=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT max(a), min(b) FROM data HAVING min(b) > 2]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslEFr2zAUx-_7FOKdWpCRJTlpqpN7GeTQdHQ9DDYftOjhGVLLSDJslHz3kfhQJySywDlayj-_P78n3ge01uBGv6MH9RM4UBBAQQKFAigsoKLQObtF7607_GQIrM1fUDmFpu36cDiuKGytQ1AfEJqwQ1Dwpn_v8BW1QcdyoGAw6GZ3xHSuedfuX2l00EDhe6dbr0jGONGtIZzY8AcdUHjpgyIlp6WAak_B9uET54OuERTf0_RKT3XtsNbBOrY4bfT89OOu5PdA4Xm9uSvF_VWguAr85PStdQYdmhNItY9X4vlUJwpfm11Ap0gpyK8-zyUSoZRab95WVwvLk8I8fWg8ZWiMZ0zMHdtEqZGj5W3GJtItiCQLImNyroWJUiMLD7exINMtyCQLMmPFXAsTpUYWVrexUKRbKJIsFBlbzLUwUWpk4fH2i-wC8BV9Z1uPZwvt8j_nh0WHpsZhK3rbuy1-c3Z7xAyfL8fc8cCgD8MtHz7W7XB1KDgO82hYnIT5eVjEyRNoGU0X8XAxp_ciGl7Gycs55IdoeBUnr-aQH-OzyieeSfyRnbOr_Zf_AQAA__8xO-Q5
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyslF2L2kAUhu_7K4ZzpTCSzCS67lxFWrcN-LFVKQvbXMyagw3EjJ1MYIv434um3Y2yTgLxMpN587w8J5w95L9TELAcT8afV6TQKXlYzKfkefz0OBmFM9L5Ei5Xy--TLvl3ZStfO7JLyTbJOi_d8nYsjSTfRj_C2df_5z8L1_WQ8AgoZCrGmdxiDuIZGFDgQMEDCj5Q6ENEYafVGvNc6eOV_SkQxq8gXApJtivM8TiisFYaQezBJCZFELCSLykuUMaoHRcoxGhkkp4wO51spf4THKsBheVOZrkgPYcRmcWEEWV-oQYK88IIEjAacIgOFFRh3nG5kRsEwQ60eaXRZqNxI43STv-80XT01AlYFyhMw1kn4N2rQH4V-M4pMqVj1BifQaKDvRJz6zpReEhSg1qQgL8NUQgRzlbDq4W9s8Ks-dBYk6E5rOfwtmOrKVVxNLjN2HhzC7yRBd5zvLYWakpVLNzdxoLX3ILXyILXc_y2FmpKVSwMb2PBb27Bb2TB7zn9thZqSlUs3N9-kX0AXGC-U1mOFwvt4y-7x0WH8QbLrZirQq_xUav1CVM-zk-500GMuSnfsvIhzMpXx4LVMLOG-VmYXYa5nVyD9qxp3x722_TuW8MDO3nQhnxnDQ_t5GEb8r19Vm7Nb2L_yS7Z0eHT3wAAAP__CqMAAw==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT DISTINCT (a) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslD2vmzAUhvf-CnTWGhkbyAdThi5ZmirtVjG4-ChFSjCyjdQq4r9fARK5RDfGujBi5_XzPjmW71Apid_FDQ1kv4EBAQ4EYiCQAIEUcgK1VgUao3T3kyFwlP8giwiUVd3YbjknUCiNkN3BlvaKkMEv8eeKZxQSNY2AgEQrymuPqXV5E_r_QQorgMDPWlQmC0LKAlHJgAXK_kUNBE6NzYIDg7wloBr7YBkrLggZa4l_n2-lsWVVWJpOyxw66ZOWqFE6afwl7QFRwznPhK-Qt65KLPpkp3jSiflPhPlMhLKQ8kUzmWk0_gGbVWbC_f25lz8PabzIf6bR6L9dxT_294-9_OOQJov8ZxqN_rtV_BN__8TLPwlpush_ptHov1_9TfqAdkZTq8rghPXq5Kh7sFBecHjgjGp0gT-0KnrM8Hnqc_2CRGOHXTZ8HKthqyv4PsycYT4Js-cwd5Nn0LEznbjDyZLeqTO8cZM3S8hbZ3jnJu-WkPfuWUUz18R9yZ7ZefvlLQAA__-HYNkY
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyslEFvmzAYhu_7FdZ3ajUjMJA05ZSpzSSkLOmSHCZVHDz8qUOimNlG2hTlv0_AlC7RYqySo8Evz_vwWd6D_llCAtvFcvGwI40qyefN-gt5Xnx7Wn5KV-TmMd3utl-Xt-Tvlnadrh525Ibf9nsFNzwDCpUUuOKvqCF5BgYUQqAQAYUYKEwgo1ArmaPWUrVb9l0gFb8gCSgUVd2Y9nFGIZcKIdmDKUyJkMCOfy9xg1yg8gOgINDwouwwtSpeufo9bzsAhW3NK50Qz2eEV4IwIs0PVEBh3ZiEzBlkBwqyMW8sbfgLQsIO1L3PY6FNUeXGn5yWmbfSayVQobDSwou0N4jsv3NO-AjZwVaJBe_sFJ10Yu4TYS4T8Znnh6NmMtDo-AOmV5lJ6O4fOvmHnh-N8h9odPS_u4p_5O4fOflHnh-P8h9odPSfXcU_dvePnfxjz5-M8h9odPS_v_qd9B_aBnUtK40nrEtfDtoLC8UL9heclo3K8UnJvMP0y3WX6x4I1KZ_y_pFWvWv2oL_hpk1HJ6E2Xk4tJMH0JE1HdvD8ZjeE2t4aidPx5DvrOGZnTwbQ763zyoYOCb2Q3bOzg4f_gQAAP__GTjtnQ==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT SUM (DISTINCT A) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslEGPmzAQhe_9FWhOrWTk2JBsllOq7iWH7lab9FRxcPGIImVtZBup1Yr_XgESW1DWWKFH7Lx578uz5hWUlvgoXtBC9gMYEOBAIAECKRDYQk6gNrpAa7XpfjIIjvI3ZBsClaob1x3nBAptELJXcJW7IGRwFj8v-IxCoqEbICDRierS29SmehHmz0EKJ4DAqRbKZlFMWSSUjFik3S80QOCpcVl0YJC3BHTj3rysEyVCxloSnuehsq5ShaPbaRjPfP7u_LexjdJGokE5mZq3VxJ8LkuDpXDaUDb7R07fv358OJ7Ox8cv5-jAPr0bKZlEYuEVsJAKKIspX1XCQqKxhN2NJfBwYh5EzGOarCJeSDQS391InIQTJ0HESUzTVcQLiUbi_Y3EaThxGkScxnS7ingh0Uh8_x9Wy5X5z2hrrSzOVsz1yZtu9aAscdhTVjemwG9GF73N8PnU6_oDidYNt2z4OKrhqgv4r5h5xXwiZnMx9zsvWCdedeoXp2tyb73ind95t8b5zive-533a5zv_V1tFp6J_5HNvfP2w98AAAD__4HrxaQ=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyslFGLm04Uxd__n2K4T__ABDNqslmfsuymIGSTbUyhsPgwdS5WMI6dGaEl5LsXtSRNyI4S--g4557z88g9gP6RQwDRcrV83pFK5eTTdvNK3pdf31ZP4Zr8_xJGu-jzakT-XNHVvjkL1887wkftdcENj4FCIQWu-R41BO_AgIILFDyg4AOFKcQUSiUT1Fqq-sqhEYTiJwQTCllRVqY-jikkUiEEBzCZyREC2PFvOW6RC1TOBCgINDzLG5tSZXuufi3qDEAhKnmhAzJ2GOGFIIxI8x0VUNhUJiALBvGRgqzM2UsbniIE7Ej753nJtMmKxDjTyzCW-e6H889jq0IqgQrFxdT4eCPBU5oqTLmRymFXXyT68nquaMFGH0byLiKx_hWwPhU4bOy4g0roSHQqYXZnCW5_YrcXsTt2vEHEHYlOxA93Env9ib1exN7Y8QcRdyQ6Ec_vJPb7E_u9iP2xMx1E3JHoRPz4D1bLjflb1KUsNF6tmNuTJ_XqQZFiu6e0rFSCb0omjU37uGl0zYFAbdq3rH0Ii_ZVHfBvMbOK3Qsxuxa7ducOa8-q9u1if0juqVU8szvPhjg_WMVzu_N8iPOjvatJx29i_8muvePjf78DAAD__wbY234=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT SUM (DISTINCT A), SUM (DISTINCT B) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslMFvmzAYxe_7K9B3WiUjx4akKadM6yWHtVOTnSYOHv7EkFIb2UbaVOV_nwCJDpQYK_SIzfN7Pz_rewOlJT6JV7SQ_QQGBDgQSIBACgTWkBOojS7QWm3aX3rBXv6BbEWgUnXj2uWcQKENQvYGrnInhAyO4tcJX1BINHQFBCQ6UZ06m9pUr8L83UnhBBA41ELZLIopi4SSEYu0-40GCDw3Lot2jOw45GcCunHvdtaJEiFjZxIe6bGyrlKFo-txHr8Fv2rxfnKjtJFoUI4Ozs8XQnwpS4OlcNpQNrmXw49vnx_3h-P-6esx2rG79m5GS_zuaspklJKFd8NCuqEspnxpOzOhhnY2t7fDw7l5EDePabKUeybUwH1_O3cSzp0EcScxTZdyz4QauLe3c6fh3GkQdxrT9VLumVAD98PHTKELFi9oa60sTqbR5ZNX7ZRCWWI_0qxuTIHfjS46m_7zudN1CxKt63dZ_7FX_VYb8H8x84r5SMymYu53nrFOvOrUL06X5F57xRu_82aJ871XvPU7b5c4P_i7Ws08E_8jm3rn50__AgAA__-0ndB6
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyslFFr2zAUhd_3K8R9WkDBkey0qZ9S2gwCadIlGQyKH9To4hkcy5Nk2Aj578P2SOaQyibeo650dM6nK-4BzM8UQtjMFrOnLSl0Sr6sVy_kbfb9dfE4X5LPz_PNdvN1MSB_j5hiX9Xmy6ctEQPaLLwPar0UVkRAIVMSl2KPBsI3YECBAwUfKARAYQwRhVyrHRqjdHnkUAnm8heEIwpJlhe2LEcUdkojhAewiU0RQtiK9xTXKCRqbwQUJFqRpJVNrpO90L-nZQagsMlFZkIy9BgRmSSMKPsDNVBYFTYkU0anHKIjBVXYs52xIkYI2ZF2j_ScGJtkO-uNm3ncFvxDi_PNRaa0RI2ycXF0vBLiMY41xsIq7bGLd9l8ezk3asoG5ds0SnzwYUq_kZJ17w3r0huPDT3etzstoU7dubu9O7w7N-_EzYee35e7JdSJ-_52br87t9-J2x96QV_ullAn7snt3EF37qATdzD0xn25W0KduB_-zxS6YrFGk6vM4MU0un7zqJxSKGOsR5pRhd7hq1a7yqZeripdVZBobL3L6sU8q7fKgP-KmVPMG2J2KeZu5xZr36kO3OKgT-6xU3zndr7r43zvFE_czpM-zg_uXo1avon7k116R8dPfwIAAP__KV_rKg==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT DISTINCT a, b FROM data WHERE (a + b + c::INT) = 27 ORDER BY a,b]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lE9r2zAYxu_7FOI9tUTGluT8qWDgwxjk0oyut-GDZr10htQykgIbJd99OIJ0CYssSOpLQHYe_x79XqE36IzGR_WKDuQPYECBAwUBFEqgMIeaQm9Ng84ZO_wlBNb6N8iCQtv1Oz88rik0xiLIN_Ct3yJIeFY_t_iESqPNC6Cg0at2e8D0tn1V9k-llVdA4XuvOidJljOiOk0YMf4XWqDwtd16tJLc3VWMzEjF74dfIeX68Xl1Tz4TvpRhARQ2Oy9JxWjFod5TMDv_3s159YIg2Z6m9__SOt92jc_np-UDgsLGarSox5j8IvMdZcKnzjkzWvEZ1PtYOVZc1U6ctGPpE2UpE81ZlvNJZzqyg6O2xQ1nytOt8SRrPMvFpNZGdnC0tryhNZFuTSRZE1leTmptZAdHa6sbWivTrZVJ1sosn09qbWQHR2sPH3Tr_of5hK43ncMT4qUvF8N1jPoFwxXuzM42-M2a5oAJy80hd3ig0fnwloXFuguvhoL_hlk0zE_C7DzM4-QRtIimy3i4vKb3PBpexMmLa8jLaHgVJ6-uIT_EZ1WMHJP4ITtn1_tPfwMAAP__0NQX6g==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lFFr2zAUhd_3Ky73KSUKjmSnTQUDb43LDFnSOYFtFD8otugMrp1JCmyE_Pdhe6RNWGVDsjxeSUffuecKbVH_zJHjIpgGd0vYqBzuo_lneAy-PUw_hDPoTcLFcvFlegV_j1R1OLtbgiCwag6nwgj4-imIAuj1BPRhdQV9SDgPZ8vxFbwHdgPzaBJE8PF7LYuRYFGmciaepUb-iBQJMiToIkEPCY4wJrhWZSK1LlV1ZFsLwvQX8iHBrFhvTLUcE0xKJZFv0WQml8hxKVa5jKRIpXKGSDCVRmR5jVmr7Fmo335lGAku1qLQHAYOBVGkQKE0P6RCgvdZbqTi0Ov5FPrgs6of333dEG8KJDjfGA4-JT7DeEew3JgXb9qIJ4mc7kh3_5NMm6xIjDM6NN8gCM5VKpVM25jsTeYLqmyuOub0ic_6GO9s5ujwJHfugTvafaK0y0QdOnDYRWfa0sE-tuszzpR1T411So0NHPeiqbV0sE_t5oypud1Tczul5g4c76KptXSwT218xtS87ql5nVLzBs7ooqm1dLBP7fY__br_YEZSr8tCywPiWzcPq-9Ypk-y-cJ1uVGJfFBlUmOacl7r6oVUatPs0qYIi2arMvhaTK1idiCmx2JmJ7egXavas4u9U3yPrOJrO_n6FPKNVTy2k8enkG_tsxq2PBP7Iztmx7t3fwIAAP__l1s3KA==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT DISTINCT a, b FROM data WHERE (a + b + c::INT) = 27 ORDER BY b,a]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lUFr2zAUx-_7FOKdWizjSLKbRjDwYQxyaUbb2_BBsx6dIbWMpMBGyXcfjiBdwiKrJMslICl__d775aG8QW80PqhXdCC_AwMKHCgIoFAChQoaCoM1LTpn7PiVEFjqXyBnFLp-2Phxu6HQGosg38B3fo0g4Vn9WOMjKo22mAEFjV516x1msN2rsr9rrbwCCk-D6p0kecGI6jVhxPifaIHC127t0Upyc1MzkpGa346fQsrlw_P9LflM-FyGBVBYbbwkNaM1h2ZLwWz8e23OqxcEybY0vf4vnfNd3_qiOiw-ICisrEaLeorJTzLfUSZcdczJaM0zaLax4tjsrOrER4w8GevRFowdIXlGa5adZJQHDJY-NSxlagqWF_yqczPRwf6nubvg3PB0azzJGs8LcVVrEx3src0vaE2kWxNJ1kRelFe1NtHB3tr9Ba2V6dbKJGtlXlRXtTbRwd7a4j-97P9gPqIbTO_wgHjq5tn45KN-wfA34czGtvjNmnaHCcvVLrfb0Oh8OGVhsezD0Vjg32EWDfODMDsO82hYxMkiXjaPp8touoqHq3OavouG53Hy_BzyfTS8iJMX55DZxIxNDdnHpqzZfvoTAAD__3tHTBk=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lVGL2kAUhd_7Ky73ySUjcSZx1YFC2jVLA1a3UWjLkocxGbaBbGInI7SI_73EFHeVOsmi9fHOzJnv3JPLZIPlzww5zv2Jf7eAtcrgPpx9hkf_28PkQzCFzjiYL-ZfJjfw90hVB9O7BQgCy_pwIrSAr5_80IdOR4AFyxuwIOY8mC6GN_Ae2ABm4dgP4eN3WBIQERLMi0ROxbMskT8iRYIMCTpI0EWCfYwIrlQRy7IsVHVksxMEyS_kPYJpvlrrajkiGBdKIt-gTnUmkeNCLDMZSpFIZfeQYCK1SLMdZqXSZ6F-e5VhJDhfibzk0LUpiDwBCoX-IRUSvE8zLRWHTsejYIHHqn4853VDvC6Q4GytOXiUeAyjLcFirV-8lVo8SeR0S9r7H6elTvNY2_1D8zWC4EwlUsmkiclOMl9QRX3VMcciHrMw2prM0d5Z7py3JDIvlJbKpvQIySziUeskwz1g0PZTQ9tMjU27Nrvq3DR0sP80txecG9Y-NdYqNda1naum1tDBPrXBBVNz2qfmtErN6druVVNr6GCf2vCCqbntU3NbpeZ27f5VU2voYJ_a6D-97P9ghrJcFXkpD4inbu5VT75MnmT9myiLtYrlgyriHaYuZzvdbiGRpa53aV0Eeb1VGXwtpkYxOxDTYzEzih0z2THbZma1a1T3zeL-OU3fGsUDM3lwDnloFI_M5NE5ZNowY01D9rYpi7bv_gQAAP__CDlrVw==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT c, d, sum(a+c::INT) + avg(b+d) FROM data GROUP BY c, d]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzUll9r4lAQxd_3U4R5aumVOPfe-CdPKfskdO3S2odlkZKaixXaRG4ibCl-9yXGVmPamYgR9C3GnMzcOb855B3iJDLD8NWk4P8FBAESBCgQoEGAB2MBc5tMTJomNn-kEAyif-C3Bczi-SLLb48FTBJrwH-HbJa9GPBhFD69mDsTRsa6bRAQmSycvazKzO3sNbRvQRRmIQi4n4dx6jstF50wjhx0kuzZWBBwZ-LIWN8J8CpQvj8YjnrCCeRVoIUTKOEEGsZLAcki27SRZuHUgI9LUb_V6-nUmmmYJdb1yp0GSgT5IK6Hfx6Ht6PH4cPNzUWgLiu3dH7r_uHXRYCfVzK_-nn7MBytrsutbqo_vTnPYfq8UxhFIGG83JxIfnuizasWcWIjY01UetnqLcSZsf1V7d0TYvXQ8vOo6vPqYxCPg_zY3mXJxty9D-vcwPvWPbWPe8Oklcxd3HGuWvSKwEU3O9yiJdneefLr2l6pNtbfKqyzVS62XHmsvWKa3WKscyZ7hU3uFZ72XjHurfeq09xeyfpsy1psy5arjsU20-yWz90zYVs2ybY8bbYZ99Zsd5tjW9VnW9ViW7VcfSy2mWa3fO6dCduqSbbVabPNuLdmu9cc27o-27oW27rlesdim2l2y-f-mbCtm2RbnzbbjHtrtvvH-db_ouCdSedJnJpaX_LtfPgmmprCqTRZ2In5bZPJqkzx83alW92ITJoV_2LxYxAXf-UNbotxV4zbYlkS437i7iFixIPU3kHqPq2W5MAVPXBFijVdWZNiyXjtkeoOLe4cAgotZkChxRwojJoBhVEzoHTJgffogfcOAaVPZ0KbCYVKpOyVCrSaiwVazeYCI-eCgZEzhmMlWMpzl8zc6WRhPEc6WlAzxSvhspfptJoznVazpjNyznRGzplO5yoywYqVjNnLdDpjkAkZrKTMXqbTas50Ws2azsg50xk5ZzqdsJJJWEl_tO2aPl7--B8AAP__baTweQ==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzUll1vukgUxu_3U0zOlcYxODPgC1d0u92NicWuL8k2jWmoTKyJBXfAzTaN3_0fwNYX2jkYMdE7RH6cM-d5zhM-IPp3ATYM73p3tyOyUgvy56B_T57u_nno3XRdUvmjOxwN_-5VyeaRKSU-JdHqreKRGpnadtcdtaukRrz_ZpUXUiN-NXuF78Ue-WvQHz-Q3x9TbAIUgtCXrvcmI7CfgAEFDhQEUDCBggUTCksVTmUUhSp55CMFuv7_YDcozIPlKk5uTyhMQyXB_oB4Hi8k2DDyXhZyID1fKqMBFHwZe_NFWmap5m-eeneSjoDCcOkFkU3qBiNe4BNGwvhVKqAwkIEvlU0cVnNEdjBKHF5zTEocQYljwmRNIVzF2zai2JtJsNmaFm_1ZjZTcubFoTKs_U4dQZ1kEDfu47PbHz27416v4ohq7paZ3BqO7ysO-7riydVtf-yO0uv9VrfVX97Jqxe9HhRm1OEwWW9PxH880fZVqyBUvlTS33tZ-hbNmVnju9qHJ2T5Q_Ovo4qvq89BPHeTY1vVPRkT9T6lMxzrR_XEMeq5YT1cGuxAuXzRmsYuZrnDzVrijYMnv69t7dVmxbeKFdkqg9UNfq69Qprd8VjzSvaKlblX7LL3ClFvs1fN8vaKF_c2L-RtXjfEubyNNLujc-tKvM3L9Da_bG8j6m283SrP26K4t0Uhb4u6YZ7L20izOzq3r8Tbokxvi8v2NqLextvt8rxtFve2WcjbZt2wzuVtpNkdnTtX4m2zTG-bl-1tRL2Ntzvn-db_puBARsswiGShL_lGMnzpz2SmVBSu1FQ-qHCalsl-9lMuveHLKM7-ZdmPbpD9lTS4C7NDmO3CfA9mx8GtU2DGTqKtk-iOnubagQv9wIUWNvWVTS3MEa0tLd3Uw81TjKKHEaPoYcwoCI0YBaERo7S0A2_rB94-xSgdfSY0kFDIRcpRqaCnsVjQ02guIDgWDAiOCM5ywbI_d47MXZ8siOZMHy3MRIrnwuUo0fU0JrqeRkVHcEx0BMdE1-cqQ4KV5TLmKNH1GcOQkGG5lDlKdD2Nia6nUdERHBMdwTHR9QnLkYTl-o-2Q9En699-BQAA__-myQ5q
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT c, d, sum(a+c::INT) + avg(b+d) FROM data GROUP BY c, d ORDER BY c, d]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzUl1Fr4k4Uxd__nyLcpxZH4p2ZWJunKf8noatLax-WRUpqBiu0RiYpbCl-9yUmrSaucyPTgL7F0ZNzc-_9HeIHLJNYj6JXnUL4GxAYcGAggIEEBgFMGaxMMtNpmpj8J4VgGP-BsMdgsVy9ZfnxlMEsMRrCD8gW2YuGECbR04u-01Gsjd8DBrHOosXLxmZlFq-ReVdxlEXA4H4VLdPQ6_roRcvYQy_JnrUBBnd6GWsTego7SoThcDQZME_xjpLMU4J5SsJ0zSB5y7ZlpFk01xDimjUv9T4xmTZ-UK1SiQ5TsnPQgh9jcTOfGz2PssT42Kv7MJU3e2xibXQcep8HN6Nfj6Px5HH0cHt7ocTl3pHMj-4fflwo_Lri-dX_44fRZHNdLX5bz9O79xylz7VKkCkO0_X2GcXBZ9zeKinqrt-qwxTvFDezNaPe9E0Ju80oD6pPjvvN4F8tEF9Xnw16HObtCC4rO5Wv0uce-So4OGd5zJxHSTdZ-bw24n3TjmV3g1aaXlZW7fehEvqVErA56diEdB-7Pm-LdaLYkvW-C-uExe5647myji2wXm_6qbNOzLkkCr-Pdd4cNN4INN71RVugEcWWoF25gEZY7O4WP1fQeAug1Zt-6qARcy5B498HmmgOmmgEmuj6si3QiGJL0AYuoBEWu7slzhU00QJo9aafOmjEnEvQxPeBJpuDJhuBJrt-0BZoRLElaNcuoBEWu7slzxU02QJo9aafOmjEnEvQZDt_E_9heKfTVbJMdaN_f718Gjqe62KCafJmZvqnSWYbm-LjeKPbHMQ6zYpvsfgwXBZf5QXuitEq5nYxr4txVywqYjxOfO0iRumkdvLmhLewNlzaGy6t4sDuHNhH3bdb963qK7v4yioe2MUDly2zi4lJ28XUlhFqJ29qy67tmdAjQsEeKcSeoT1TkAgV3OOrKheEfA-wY9aFUBMzI9TUwlByN3dqZdAeLhgQfbfHC7Uz9nhBIl_QHjBIJAw6RQyhpqbmFjKU3M2d3Bl7znAiZ7hTznDi3YV6ebHnDCdyhjvlDKGm3kDccoaSu7lTO8PtOcOJnOHH5cx0_d_fAAAA__83bima
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzUl1tv4kgQhd_3V7TqCeRGpi_OxU_OzmRXSIzJApF2NEKRg1skEsFs26x2FOW_r3xJgs2ky6hjKXkzDcenXFXfkXmE9J81-DC7HF9-mZOdXpM_ppNv5Mfl31fji1FIel9Hs_nsr3GfVD9ZUhJTku4eehFxyNL3R-H8rE8cEv276t0Sh8T98hZxlEXkz-nk-or8_r2Qkcn06-X0-dMCKGySWIXRg0rB_wEMKHCgIICCBAoeLChsdbJUaZro_CePhWAU_wf-kML9ZrvL8uMFhWWiFfiPkN1nawU-zKPbtZqqKFbaHQKFWGXR_bqw2er7h0j_DPL6gMJsG21SnwxcRqJNTBhJsjulgcJUbWKlfRIwJxDlY1IScCeQlASCkkDC4olCsstey0izaKXAZ0-0famzRGdKu169ykA4NJDOmxb8GIuL1UqrVZQl2mXDpg8N8mZPdKy0in3yfHARfr8JJ_Ob8Ho87gWif3Ak86PZ9bdewF6ueH71ZXIdzovrevGv9dz-JHdReteohNGAw-Lp9RnFm8_4equkrLt5K4cG3ClvZmpGs-lFCfvNqA7qT84Om8FfWiBerp4bdDPK2-H1azuVr9LzHrmB9-ac5TFzDpNBsnV5Y8SHpo5hd71Oml5VVu_3WyWc1Epg7UlnbUh32cDlXbGOFFuxfmLDOmKxv97ss7LOOmC92fSPzjoy54oo9n6s8_ag8Vag8YErugINKbYC7dQGNMRif7f4ZwWNdwBas-kfHTRkzhVo_P1AE-1BE61AEwNXdgUaUmwF2pkNaIjF_m6Jzwqa6AC0ZtM_OmjInCvQxPuBJtuDJluBJgeu1xVoSLEVaOc2oCEW-7slPytosgPQmk3_6KAhc65Ak938TfyF4VSl22STqlb__ob5NFS8UuUE02Snl-pKJ8vCpvw4KXTFQazSrPyWlR9Gm_KrvMB9MTOKuVnMm2K2LxY1MTtOfG4jZtJKbeXNEW9hbLg0N1waxZ7Z2TOP-sRsfWJUn5rFp0bxmVl8ZrNlZjEyabMY2zJEbeWNbdm5OROGSCiYIwXZM2bOFIaECjvgqy4XiPwAsGPWBVEjM0PU2MJgcjt3bGWYOVyYh_TdHC_YzpjjhSH5wswBw5CEYVYRg6ixqdmFDCa3c0d3xpwzHMkZbpUzHHl3wV5ezDnDkZzhVjmDqLE3ELucweR27tjOcHPOcCRn-HE5s3j67f8AAAD__8NhSwY=
 
 # There should be no "by hash" routers if there is a single stream.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT c, d, sum(a+c::INT) + avg(b+d) FROM data WHERE a > 9 GROUP BY c, d]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyUks9Kw0AQh-8-RZhTS6ckm0SQPW1PUqip9I8gEsqaHUKgzYbdLSgl7y7JHmwUox7nN_NNvjB7gVoryuSJLPAXYIBwCzlCY3RB1mrTxX5oqd6ARwhV3ZxdF-cIhTYE_AKuckcCDpme6yaMAUGRk9WxH2sR9Nl9QtbJkoAnLV4tZuOLd_L1SBuSikwYDdZDY6qTNO9CSScBYdvI2vIgZNEcEDZUKzI8EGwmEs6X2e4OAxHPRIqBSDAQKfzkx_7jtyhLQ6V02oRsqCcSFCkgLLLnQ7beHbL9ajURyfRblHbRdv8wEaxvPt1PRDwd_EOn3nnPRrTjgfYv99qQbXRt6U8Hi9ocgVRJ_k1YfTYFPRpd9J_x5brn-kCRdb6b-GJZ-1YneA2zUTgeh-NROPoC5-3NRwAAAP__DNTtHA==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkm-Pk0AQxt_7KSbzioa9lD810X21VetJwtEKVL2c5LLHTkgTyuIuGE3T724AE68a0Xs5z8zz8BtmT2i_1Mgx28Sb1zn0poa36fYG7jafdvE6SsB5E2V59j5ewM-RkoFiYPujI8GFkvMoyV8swAX5tXIewAW1mCKU7CR8fLdJNyDhc-95IcFLuE63-x28uh1zCmTYaEWJPJJFfoc-MnyOBcPW6JKs1WaQT-NQpL4h9xgemrbvBrlgWGpDyE_YHbqakGOir3S7DJChok4e6nHszFD33S-T7WRFyMMzexTszwfn8qGmlKQis_Qu4rE1h6M038WwLzLMWtlYDkvfu0KGKTWKDAfhuyKc_hUDEbhixUCEDMQK_8bnP4VvXVWGKtlps_Qv8UTIxAoZrpPb-2Sb3yf7OHZEuPhDWg1Str9xhD82P1w7Ilhc7DCgD9zuDHZwgf2Pe6VkW91Y-q-DeeeCIamKpjdhdW9K2hldjp-Zyu3oGwVFtpu64VREzdQaAB-b_VlzMG8OZs3eb-bi_OxHAAAA___etg9r
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a), sum(b), sum(c) FROM data GROUP BY d HAVING sum(a+b) > 10]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzUll9r4kwUh-_fTxHOVcs7kpyZiW1zlbJ_oNDapdteLLtSpmawgs3IZIQtxe--JEKNujsnZRT0ykR9cs6c58chb1CaQg_Ui64g-wkIDDgwEMBAAoMUhgxm1ox0VRlb_2UJXBW_IUsYTMrZ3NVfDxmMjNWQvYGbuKmGDO7V01TfaVVoGyfAoNBOTaZNmZmdvCj7mhfKKWDwfabKKot6MUaqLCKMjHvWFhjc6bLQNoty_D_nLMqRRc2nYFEuYbhgYOZu1UHl1FhDhgvWvcvL8djqsXLGxul6k3l9fzn48Ti4vX8cPFxfn-Tpad3tw81Jzt-vxPuVfL_C043mVvWeXqNnVT1vlEIYLlYH4P88wOo589LYQltdrD2peYrniJhsFd48I3Y8YzOLr5OpawSl0a95kggdYZJl2ecvn65uLq-Bwe3cZbWzXDCPMbHbAw9Mz8xiTDf--ffacq02ds80dsl0jL2Y7yHVRJ8t5f3DTDXuMtV4BKnm3ZPFOyWL92Kxh2QRfbbGfnaYyeK7TBY_gmSJ7skSnZIlerHcQ7KIPltjPz_MZIldJkscQbJk92TJTsmSvTjdQ7KIPltjvzjMZMldJkseQbKIt_I7Xc1MWelOb3BJPRBdjPVyepWZ25H-Zs2oKbO8vW245otCV275Ky5vrsrlT3WDbRg3YWzDfA3Gj8H9EPgiBMagvjH109w7b-GHhV9W329LeunUD6chqv0wodoPE6r9MKWaoAnV_RDVZ1743C_rPESWHyZk-WFClh-mZBE0IesiRBYSW5Rao2F7NGyRhm3SwFUatksxaJkisU0lIW1rnX5Imp-mpPlpSpqfJqUROCVta6l6pQ0X__0JAAD__-bTv9w=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzUll1r4kAUhu_3VwznSulIcjKJbXMVt7Vdwcau2mVLV0o0gxVs4k4S2FL870uSUj-6O5MyCnqVzydz5jwvh7xC8nsOLgza3fbFkGRiTq76vRvy0P552211fFK77AyGg-_dOnl7Jcmea0GdFsfx23FSL6kwSANy3e_d3ZKv9yQk31o_Ov51iZATMq6TX5lpMk7QHAGFKA65HzzzBNwHQKBgAQUGFGyg4MCIwkLEE54kschfeS2ATvgHXJPCLFpkaX57RGESCw7uK6SzdM7BhWEwnvM-D0IuDBMohDwNZvNimYWYPQfixctLBQqDRRAlLmkYSIIoJEji9IkLoNDnUciFSzw88SxKPKSkODJKPBtGSwpxlq4qSNJgysHFJa1eZWs6FXwapLEwnM0ivfy65d8_-r3ho3_X7dY8p55Xe3dT86z3M_Z-Zr-fYX2ruNV64xfyFCRPW0shjJarDVj_3cDqO1kUi5ALHm58qfiKZItoflh4e49YcY9FL65m87QQ5KxC5bruZfuic9PqAoVelrq5M49RiTG22w37cSNeGOhsvfnvte2NtbF6prFKpg1sGNYeUq2oc0158zBTjbtMNR5Bqq3qybIqJctqGGwPyVLUudb208NMlrXLZFlHkCxWPVmsUrJYw7D3kCxFnWttPzvMZLFdJosdQbLs6smyKyXLbhjOHpKlqHOt7eeHmSx7l8myjyBZir_yPk8WcZTwSn9wZt4QHk552b0kzsSE34p4UixTXvYKrrgR8iQtn2J50YnKR3mB6zBuw7gOWxswfg5u6sDnOjBq1Y2OnLak_WZymMllNeW2bCntyGFHR7UcVqiWwwrVclilWkErVDd1VJ9K4TO5rDMdWXJYIUsOK2TJYZUsBa2Qda4jCxVTVDVG9eao3iDVm6Sao1RvlqLWMEXFNLUV0j6M009Jk9MqaXJaJU1OK6UpcJW0D0NVKm20_PI3AAD__0Hd4gQ=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT avg(a+b), c FROM data GROUP BY c, d HAVING c = d]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlmFro04Qxt__P4XMq5b_ipldTVvhwHJwUOjZo9e8OI4QtnFJAqkrq4ErJd_9UMvFJHc7lk3Ad7r6c56Z52HwDXKdqVS-qBLin4DAgAMDAQxCYBDBlEFh9FyVpTb1Ky1wl_2CeMRglRebqj6eMphroyB-g2pVrRXE8CSf1-pRyUyZYAQMMlXJ1bopU5jVizSvSSYrCQy-FzIvY88P0JN55qGnq6UywODLal0pE3uJ8D55SS3oUeVZc4L_J5x5iWD1-XTLQG-qnZaykgsFMW5Zf723i4VRC1lpE0T7cpN6HLfpj1n68DRLJ_f3F4m4rHVPvl4kWF99fpikT-_X-y_yywN1u4LPr95SlsuDWgjT7a4D_s8Odt_Z5Npkyqhs70vNVyw94uio8KF2_NMkf7-a3dVtiuM2w8uuOTwgjBGnbSvVvi4CjA7e_HvtcK829g8x9glxgH7AzxpjQnHH4vFAY4ynjDEOJsa8f5R4ryhxPxBnjRKhuDPmq4FGiZ8ySnwwURL9oyR6RUn4QXjWKBGKO2O-HmiUxCmjJAYTpbB_lMJeUQr9IDprlAjFnTHfDDRK4SmjFA4mSsQP9KMqC52Xqtdf2KhuW2UL1c6o1BszV9-Mnjdl2tuHhmsOMlVW7VNsb-7y9lEtsAvjIYxdmO_B-DF47ALfuMDopBsjO82t8xZ2WNjNGtvdCq10ZIcjF6vtMGG1HSastsOU1QRNWD12sfrKCl_bzbp2McsOE2bZYcIsO0yZRdCEWTcuZiGxRak16rZH3Rap2yZ1XKVuuxSdlikS2zQkTDtapx8yzU5TptlpyjQ7TZpG4JRpR0vVatp0-9_vAAAA__8tx7ql
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMll9r2zAUxd_3KcR9SqiCI8lJW0PBWdd2gdTp8meslFBUW6SB1MpkZ6yUfPdhpyxOskkuSsBvtqyf7rk6h4vfIPk5Bw-GV72ryxFaqjm6HvRv0cPVj7tepxug2pfucDT81quj9y3817TG0Ql6qmMUrjdHPOXoZtAf36HP9yjEKEJfO9-7wQ0K0QWKJoAhlpEI-ItIwHsAAhgoYGCAwQUMLZhgWCgZiiSRKtvylgPd6Dd4TQyzeLFMs-UJhlAqAd4bpLN0LsCDEX-ai4HgkVBOEzBEIuWzeV5moWYvXL36mTzAMFzwOPFQwyGIxxEiSKbPQgGG69k8FcpDPkMXyM8EDUQc5SvkxKcY-Qxn65MVBrlMN1qSlE8FeGSFy-vtTKdKTHkqldPalutn19EJ7h-D_ugxGPd6NZ_VM93j25pPsqfL_jgYvT9vb6T1HXWbgk-v6Jknzzu1CExWmw7ofzvYnLOMpYqEEtHWSfkpmh5Jc6_wrnbyt0n6_vTYzdpk-2269aI51DEYww7bViAbcuGQ1s7Of9d2t2qT8iEmZULskIZDjxpjg-KCxe2KxpgcMsakMjGm5aNES0WJNhx21CgZFBeu-bSiUaKHjBKtTJRY-SixUlFiDcc9apQMigvXfFbRKLFDRolVJkpu-Si5paLkNpzWUaNkUFy45vOKRsk9ZJTcykTJ8AM9EMlCxoko9RfWzNoW0VSs7yiRSxWKOyXDvMz6tZ9z-UIkknT9laxfuvH6UyawCJNdmBRhugWTj8FtG_jcBiZWuklLT1PtfTM9zPRmtfVuuVq6pYdbNlbrYYPVethgtR42WW2gDVa3baw-1cJnerPObMzSwwaz9LDBLD1sMstAG8w6tzGLGKaoaYzazVG7QWo3SS1Hqd0sJVbDlBimqWswbW-cfsg0PW0yTU-bTNPTRtMMuMm0vaGqNW2y-vQnAAD__5Mv1j4=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a+b), sum(a+b) FILTER (WHERE a < d), sum(a+b) FILTER (WHERE a = c) FROM data GROUP BY d]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMll1r2z4Uxu__n8Kcq_6ZjH0kOW0NA_Vig0KXjqy9GFsoaizSQGsZ2YaVku8-bEPjvExyUUJyJ7_8fJ5znoeD3yDXmRrLF1VC-gsQCFAgwIAABwIJTAkURs9UWWrTvNIB19kfSGMCi7yoq-b2lMBMGwXpG1SL6llBCnfy8VlNlMyUiWIgkKlKLp7bMoVZvEjzKjJZSSDwo5B5mQZhhIHMswADXT0pAwQmKs-USQOBnwQlgcDfdRyzmeDN-bNgJBAcpksCuq5WQspKzhWkuCTDxV7N50bNZaVNlKxrFc0crsY_H8a3dw_j-5ubM8H_b0TffzsT2DsFX69v7r5MAkF33GMbMleVH1-DJ1k-bRRFmC5XrdB_trL6Tp1rkymjsrUvtV-xNIvxVuHNblc90vcTez-1s7itqzQQlAhGLIaw_XYx1qEuIkw23txdm6_VxuHJxSHJjTCM6OGy65Dbs3N06tnFfWYXj5VdOjw_dFB-aBixw-XHIbc30vNTzw_dZ37osfLDhueHDcoPCyN-uPw45PZGenHq-WH7zA87Vn748PzwQfnhYZQcLj8Oub2RXp56fvg-88NP4d9rh8aJKgudl2rQn1XcdKmyuepGUurazNR3o2dtme7ytuXaG5kqq-4pdhfXefeoEdiHcRPGPkzXYPwYPPKBL31g9NKNiZ2m1nkzO8zsZo3sbnErndjhxMdqO-yw2g47rLbDLqsdtMPqkY_V51b4wm7WhY9Zdthhlh12mGWHXWY5aIdZlz5moWOLutao3x71W6R-m9RzlfrtUvRapujYptxh2tY6_ZBpdtplmp12mWannaY5cJdpW0vVatp0-d_fAAAA___qTKJK
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMltFv2joUxt_vX2GdJ1CNgu2EtpEqpfdeuiFR6ALVVnWocolFkWjMnERaVfG_T0m2EmhnpzKovJngX853zvfpKM-Q_FiAD6Nuv_vfGGVqgS7C4SW67X676p_3Bqjxf280Hn3pN9HvK0n22ODoCN03ceWMLnr9cTdEja-fu2EXcfQ9a7fZFEX6W2do2iwLRjzl6FM4vL5C_96gaAIYYhmJAX8UCfi3QAADBQwMMLiAwYMJhqWSU5EkUuVXngugF_0Ev41hHi-zNH88wTCVSoD_DOk8XQjwYczvFyIUPBLKaQOGSKR8vijKLNX8kaunIJcDGEZLHic-ajkE8ThCBMn0QSjAEIo4EspHATkKKEYBKfsN3Px8FjCMAhcmKwwyS9dCkpTPBPhkheuLPZ_NlJjxVCrH29Qa5HM4H9zcDYbju8F1v98I3GYu-vqyEZDK6c_YA_rGM7Ylc135_gk98ORhqyiByWrdCv1rK-v3ZLFUkVAi2nhT8RZNs6T9qvB2t-se6cuJvZyKWQyz1EcBxQHDGkPYbrsYyJZcOsTbuvl2bXejNqmfXFInuQ5pOXR_2TXIrdjZOfTskl1ml3xUdmn9_NBa-aEth-0vPwa5lZEeH3p-6C7zQz8qP6x-flit_LCW4-4vPwa5lZGeHHp-2C7zwz4qP279_Li18uO2HG9_-THIrYz09NDz4-4yP-4hfHu9oTEUyVLGiaj1ZdXOuxTRTJQjSWSmpuJKyWlRpvw5LLjiQSSStPyXlD96cflXLrAKk22YVGG6AZP3wR0b-NQGJla6iaenqXbeTA8zvVkdvVuulvb0sGdjtR42WK2HDVbrYZPVBtpgdcfG6mMtfKI368TGLD1sMEsPG8zSwyazDLTBrFMbs4hhi5rWqN0etVukdpvUcpXa7VJitUyJYZu6BtNerdN3maanTabpaZNpetpomgE3mfZqqWpNm6z--RUAAP__Wi_LjA==
 
 # Same query but restricted to a single range; no local aggregation stage.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(a+b), sum(a+b) FILTER (WHERE a < d), sum(a+b) FILTER (WHERE a = c) FROM data WHERE a = 1 GROUP BY d]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyUksFq4zAQhu_7FGJOWXaCLdknwYJy2IVA6hQ3OZTWBNUajCGxjCRDS_C7F9uHJqV125vmn_nGH4zP0FhDmT6RB_kAHBAEFAitsyV5b90QT0Nr8wwyRqibtgtDXCCU1hHIM4Q6HAkkZHZp20gAgqGg6-M41iPYLrxBPuiKQCY9Xizm84t3-ulIOWlDLoqv1kPr6pN2L8rooAHhrtWNlyziy9Ejp8aQk0zxP0ogU_yxi-OkVOnw_qsSZCqFzxT5TxRXVeWo0sG6iF8bqhQQVtn9IdvuDtl-s1mo9Pegur9ZKH7xYv_Xm92_nCnxQZYAwrYLkimBKsEZbXGl_cXJcvKtbTx962ZxXyCQqWj6LbztXEm3zpbjZ6ZyO3JjYMiHqZtMxbqZWoPgJcxnYTEPi1k4fgcX_a_XAAAA___19-2A
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyUktGLm0AQxt_7VwzzlHB7xNU8CQd7bb1W8DQ1hva4yrHnDhIwrt1doSXkfy9qyyWlte3b7LffN_PT2SPaLw2GuI2S6E0BvWngLs_u4TH6tElu4xQWb-Ntsf2QLOGHxfaHhYQreF6ysxru4qSIclh8fB_lEUj43HteUIGad91AtZwGKukkvMgc3uXZbgOvH0CVyLDVilJ5IIvhI3Jk6GPJsDO6Imu1GeTjaIrVVww9hvu2690glwwrbQjDI7q9awhDTPW17lY-MlTk5L4ZbSeGuncvIetkTRgGJ3bWmM83LuRzQzlJRWblXbTHzuwP0nwTw3ciw20nWxvCil-PHDm1ikwIgl8Jn4Hg0-8T66G-EQEDscY_IfL_Qbyta0O1dNqs-CWhWCPD2_ThKc2Kp3SXJAuxXg6ou_uF4GfVzy0K_zdagAyz3oUgfCYCNoPtX2D_ZWU52U63lv5pZ96pZEiqpulZWN2bijZGV-OY6ZiNuVFQZN10G0yHuJ2uBsDzMJ8N-_Nhfzbs_RIuT6--BwAA__8RpBmb
 
 # Verify the XOR execution plan
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT xor_agg(to_hex(a)::bytes) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslE1r3DAQhu_9FWZOLcjIkr2bjU5JoYRcmrLJoaWYoK4GZ2EjGUmGlOD_XmwfYi-JrGIf_fHqeXlGzCtoo_C7fEYH4jcwIMCBQA4ECiCwgZJAbc0BnTO2-2UI3KoXEBmBo64b370uCRyMRRCv4I_-hCDgQf454R6lQkszIKDQy-Opx9T2-Czt3yslvQQC97XUTiQpZYnUKmGJ8U9ogcAetUIrEm8en_Dl8xX7IsTXXw_f7qFsCZjGv9GdlxWCYC2Jb3hdVRYr6Y2lm2nBn3f7x-ubm474IYp_iHojNNpYhRbV5PiyDZdh2f-3ySdtWPxoWMxoKEspX3k4Mx1HPrZLh8PjdfAoHTyl-co6ZjqOdFws1ZHH68ijdOQpLVbWMdNxpGO3VEcRr6OI0lGkdLOyjpmOIx2Xa26yd1B7dLXRDs822vsnZ92mQ1XhsBadaewBf1hz6DHD412f618odH74yoaHWz186gqOwywY5pMwOw_zMHkGnQfTRThcLOm9CYa3YfJ2CfkiGN6Fybsl5MvwrLKZaxK-ZOfssv30LwAA__8kYPJY
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyslF1v2jAUhu_3K6xzVSSj4CRQ6quyjVVIrHTARacqQh4-SpFonNmOxIT471OSTg2odTIll_l487x5jnWOYH7vgcNqOp9-WZNM78m35eI7eZo-Pswns3ty9XW2Wq9-zHvk9ZWD0hsRx1dWbZ7xcCV6nH_-uZ6uemVQCisioJAoiffiBQ3wJ2BAwQcKAVAIgcIQIgqpVls0Run8lWMRmMkD8AGFXZJmNr8dUdgqjcCPYHd2j8BhLX7tcYlCovYGQEGiFbt9gUn17kXoP7d5B6CwSkViOOl7jIhEEkaUfUYNFJaYSNScvP7CLfv3DxCdKKjMvtGNFTECZyfavOEkjjXGwirtDc8LPi6Wm8ndXU78EOV_iHojZInSEjXKs89HJ3cZNvj_NsFZG9Z8NKzJaDzW9_yOh1PTseJj1HY4fnMdfiMdft8LOtZR07Gi47qtjqC5jqCRjqDvhR3rqOlY0TFuqyNsriNspCPse8OOddR0rOi46XKTvYNaoklVYvBio73_5UG-6VDGWK5FozK9xQettgWmvFwUueKGRGPLp6y8mCXlo7xgNcycYf8szC7Dvptcgw6c6dAdDtv0HjrDIzd51IZ87QyP3eRxG_KNe1aDmmPiPmSX7Oj06W8AAAD__-R8DCQ=
 
 # Verify the XOR execution plan
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT xor_agg(a) FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslM-LnDAUx-_9K-SdWojERJ2d9TR7WvbSKdMeCkVKah5WmDWSRGhZ_N-LehgdZmJK9uiPbz7fDy-8N2iVxM_iFQ0UP4ABAQ4EUiCQAYEcSgKdVhUao_T4yxx4kX-gSAg0bdfb8XVJoFIaoXgD29gzQgHfxK8znlBI1DQBAhKtaM4TptPNq9B_D1JYAQS-dqI1RRRTFolWRixS9jdqIHDsbREdGJQDAdXbC8tYUSMUbCD-fZ7qWmMtrNI0X9f5fjz9fHp-_nhgn-6i-F3UhdC3SkvUKFfHl4O7DEv-v026asP8B8F8BkFZTHnQKDYaLex3oaPg_vLcS57HNA2S32i0kH8IlU_95VMv-TSmWZD8RqOF_D5UPvOXz7zks5jmQfIbjRbyj--5gW6gTmg61Rq82kS3T07GDYWyxnmdGdXrCr9oVU2Y-fE45aYXEo2dv7L54aWdP40Fl2HmDPNVmF2HuZu8gU6d6cwdzkJ6587wzk3ehZAfnOG9m7wPIT-6Z5VsXBP3Jbtml8OHfwEAAP__W2jUcQ==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyslNFq2zAUhu_3FOJcJSBjy3bS1FcJW1YCWdMluSgUU7To4AVcy5Nk6Ah592F7UCe0sod2aVu_v__jiHMC_SuHBHbL9fLznlQqJ1-3m2_kafn4sF6s7snoy2q3331fj8nfI69SPfMsG_Fxe1Jww1OgUEiB9_wFNSRPwIBCCBQioBADhQmkFEolD6i1VPWRUxNYiVdIAgrHoqxM_TqlcJAKITmBOZocIYE9_5HjFrlA5QdAQaDhx7zBlOr4wtXved0BKOxKXuiEeD4jvBCEEWl-ogIKm8okZM4gPVOQlXljacMzhISd6fA-iyxTmHEjlT-5rPO42T4v7u5Gczb-EBV-iHojVIVUAhWKi9-nZ3sZFvx7m-iiDRs-CDZkED7z_NBpFD2NOvZT11GEw-XDQfKh50dO8j2NOvI3rvLRcPlokHzk-bGTfE-jjvzMVT4eLh8Pko89f-Ik39OoI3_7PzfQO6gt6lIWGq820ft_DuoNhSLDdp1pWakDPih5aDDt46bJNS8EatN-Ze3Dqmg_1QW7YWYNhxdhdh0O7eQedGRNx_Zw7NJ7Yg1P7eSpC_nGGp7ZyTMX8q19VkHPNbFfsmt2ev70JwAA__-WyOlb
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT max(t.a), min(t.b), avg(t.c)  FROM (VALUES (1, 2, 3), (4, 5, 6), (7, 8, 0)) AS t(a, b, c) WHERE b > 3]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkM1KxDAUhfc-RTmrGQhM0m4kq3ajdDFVRETQLkJ7KYXYW_IjwtB3lzYLHWFEd7nn5jtfyAkT99SYN_LQL1BoBWbHHXnPbo3Shbr_gJYC4zTHsMatQMeOoE8IY7AEDcudsdm7sZF8Jg8SAj0FM9qt-Wa0gZzOyjx7jVIWlBVa67p5vEa7CHAMX80-mIGg1SL-bq-GwdFgAruDOjcfq-ddqfYQONbNrszXU_V0uyuL_UV1_h_1A_mZJ09n2kvNcmkFqB8ofa7n6Dq6d9xtmjTebdwW9ORD2qo01FNarQ_8Dqtf4fwH3C5XnwEAAP__aQiixw==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkF1r2zAUhu_3Kw7nSoJDajv7KLqK2dzNkKRdnHWFzheKfTAGxcokuRSC__uwPbZ10LHena_nfYTO6L8bVFhk6-z9Hnpn4Gp3vYH77O5mneZbEB_yYl98Xkv4eXLUjyIstCQ4tp0Ii4Mk0A-NCItKzqy4TddfsgJETJAQLCWBeE3whuDtWL4juCSIpIS0gABCExwIKglfP2W7DA7wrY-iJcOyRMLO1rzVR_ao7jHGkvDkbMXeWzeOztNBXj-iigjb7tSHcVwSVtYxqjOGNhhGhcZW2sCDNj17iC4iJKw56NZMyVetCewUrJJfdqVUvt1fYjkQ2j78TvZBN4wqHuj_7WnTOG50sO4ifmrepHdiFUsk3ORbsUrGKr39KFZL-aw6eYl6x_5kO89PtM8lR0NJyHXD8-d627uKb5ytJs3cXk_cNKjZh3kbz03ezavxgX_C8T_h5C-4HF79CAAA__8-tMoV
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM (VALUES (1, '222'), (2, '444')) t1(a,b) JOIN (VALUES (1, 100.0), (3, 32.0)) t2(a,b) ON t1.a = t2.a]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyckUFL_DAQxe__T1Hm9BcCbVJPAaFH14MrXqWH0IzdQsyUTCLC0u8uTQ7rLq7ueuvMvN-8zssePFl8NG_IoF9AQi9gDjQgM4W1VQQb-wG6ETD5OcW13QsYKCDoPcQpOgQNjgbjqnfjEnLV1A0IsBjN5LJ-EUApHmiOZkTQchF_dJC1vMhBnXU4LE6egsWA9nTj75JvfvPe8O6BJo-hVkdqcPga_3fy5i5M4y5_gYBtirrqpOiU6FrR3cK5S9prsnpGnskzXpRRs56BdsQSC1MKAz4FGrJNKbeZyw2LHMtUlWLj8yg_5ldYXgGrU1j9CLdHcLP0y7_PAAAA__870evq
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyckU9r20AQxe_9FMNcLJXB3l35JAjItC51cK00Sksh-LCVpo5gq3V3V6Vg_N2LVin5Q9PGuWlm3m-e5u0B_Q-DOVbL9fLNFfTOwLvL8gNcL79crBerDSRvV9VV9XGdwq3k9ShIPi_Wn5YVJJJgopSapASJIpjM5_NJmsKigiAh0QRfUzgvh033CCnEVAxERpCpqbgF1B-g3ECQUw1nENRUb5Gwsw1v9Hf2mF-jxC3h3tmavbduaB2iYNX8wlwQtt2-D0N7S1hbx5gfMLTBMOZobK0N_NSmZw9iJpCw4aBbE_VHQtuHO9oHvWPM5ZFe6CBn8lkO6kmHu8V9Z13DjpvHG_8v-ctvvtf-5ty2HbuZeqBGw99CUsj0zLW7m_iFhGUfcigkFYqKjIo5PnVJdkpWl-z3tvP8rIzEcAY3Ox5j8bZ3NV84W0ebsSwjFxsN-zBO1VisujiKj3kflifA6jGs_glnD2Bx3B5f_Q4AAP__go0S1Q==
 
 statement ok
 CREATE TABLE nullables (a INT, b INT, c INT, PRIMARY KEY (a))
@@ -220,12 +220,12 @@ CREATE TABLE nullables (a INT, b INT, c INT, PRIMARY KEY (a))
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT array_agg(a) FROM (SELECT a FROM data WHERE b = 1 AND c = 1.0 AND d = 1.0 ORDER BY a)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlEGL00AUx-9-iuF_anFiMkkqy4CQ4LpLYW2l9iISZOw8YqCbCTNTUJZ-d2mC1ojVkV5ynPfyy3u__-E9oTWaVuqRHORHCHCk4MjAkYNjgYqjs2ZHzhl7-mQAlvorZMLRtN3Bn8oVx85YgnyCb_yeILFVn_e0IaXJxgk4NHnV7PsxnW0elf1WaOUVON53qnWSRbFgqtVMMOO_kAXHXbP3ZCWbzYqUvWJCSrlcbW_mrFzdslmRnWovEinl3cO63N7MfzTyn43bN6-Xb8uHOTjWBy9ZIVAdOczBnxd3XtUEKY78gtzZyVhNlvTYphDPUR3_kEBZ15Zq5Y2NF2Ok3GzKD5_K-_tZIeYXN0pHG4nwuEVI3LGI4nQ6gafhemmQXhrF2XT0snC9LEgvi-J8Onp5uF4epJdH8WI6ev84dRtynWkdjcwu_Tk5nQrSNQ2nxZmD3dE7a3b9mOG57rm-oMn5oSuGx7LtW_2Cv8Lir_DLEZz8DqfXTM6ugfNr4MV_wdXx2fcAAAD__6aqGXg=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlNFr2zAQxt_3V4h7spkyR7YzimBgr3E6Q5p0TmArxRQ1OryAa2WSAish__uwna7zWDaXvOTNn-4-3_e7h9uB-V4Ch0UyTS6XZKtLMsnm1-Qu-XozjdMZccbpYrn4PHXJoUVoLZ7uRVE4wm17nedKK6Wwgnz5lGQJcZwH8oEwl8SzMXFW9fe7oXuQ8iDJPBsnGfl4S4SbA4VKSZyJRzTA74ABBR8oBEAhBAojyClstFqhMUrXLbvGkMofwIcU1tVma-vnnMJKaQS-A7u2JQKHpXgoMUMhUXtDoCDRinXZjNno9aPQT1GdHSgsNqIynAw8RkQlCSPKfkMNFCbr0qLmxHEiv47POU9ny4sDURS0SJzzyXQeLy-eUaPwV2GcXKbX8dQFCvOt5SRikO8pqK19CW6sKBA429MjcC9MSkvUKLs0EXsL-f4vG4iLQmMhrNLeqGuJsyy-vY-vrpyIuUcT-Z1ErP-6WZ91e2zg-eezcL8_nt8Lzx94wfngBf3xgl54wcALzwcv7I8X9sILB97ofPD-c-oyNBtVGeyQHfvzsD4VKAtsT4tRW73CG61WzZhWzhtf8yDR2LbKWpFWTakJ-LuZ_dP8vmMe_mn2T5kcnGIOTzGPXmXO929-BgAA__9VED8a
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT json_agg(a) FROM (SELECT a FROM data WHERE b = 1 AND c = 1.0 AND d = 1.0 ORDER BY a)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlEGL00AUx-9-iuF_anFiMkkqy4CQ4LpLZW1ltzcJMnYeMdDNhJkpKEu_uzRBa8TqLL3kOO_ll_d-_8N7Qms0rdQjOchPEOBIwZGBIwfHAhVHZ82WnDP2-MkALPU3yISjabu9P5Yrjq2xBPkE3_gdQWKjvuzonpQmGyfg0ORVs-vHdLZ5VPZ7oZVX4HjoVOski2LBVKuZYMZ_JQuOm2bnyUo2mxUpe8OElHK52lzNWbm6ZrMiO9ZeJVLKm7t1ubma_2zkvxrX794uP5R3c3Cs916yQqA6cJi9Py3uvKoJUhz4GbmTk7GaLOmxTSFeojr8JYGyri3VyhsbL8bI-4f16nN5ezsrxPzsQuloIRGetghJOxZRnE4n7zRcLw3SS6M4m45eFq6XBellUZxPRy8P18uD9PIoXkxH7z-X7p5cZ1pHI7Nzf06Ol4J0TcNlcWZvt_TRmm0_Zniue64vaHJ-6IrhsWz7Vr_g77D4J_x6BCd_wuklk7NL4PwSePEsuDq8-BEAAP__vcYZMw==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlNGL00AQxt_9K5Z5SnBrukkqx4KQeM2dkV5zpgWVIxx73SFWctm6uwWl9H-XJNUzYjXSl77l25kv8_3mYXZgvlTAYZHMkssl2eqKXOXZDblLPtzO4nROnGm6WC7ezVxyaPlsVH0vytIRbtfqHAqik1JYQd6_SfKEOM4DeUWYS-L5lDir5vvF2D1IeZAky6dJTl5_JMItgEKtJM7FIxrgd8CAgg8UAqAQAoUJFBQ2Wq3QGKWbll1rSOVX4GMK63qztc1zQWGlNALfgV3bCoHDUjxUmKOQqL0xUJBoxbpqx2z0-lHob1GTHSgsNqI2nIw8RkQtCSPKfkINFK7WlUXNieNEfhOfc57OlxcHoijokDjnV7MsXl78QI3Cn4VpcpnexDMXKGRby0nEoNhTUFv7FNxYUSJwtqdH4J6YlJaoUfZpIvYciv0fNhCXpcZSWKW9Sd_ydpHN7-Praydi7tFAfi8QG75tNmTbHht5_vns2x-O5w_C80decD54wXC8YBBeMPLC88ELh-OFg_DCkTc5H7x_XLoczUbVBntkx_48bi4FyhK7y2LUVq_wVqtVO6aTWetrHyQa21VZJ9K6LbUBfzWzv5pf9szj383-KZODU8zhKebJf5mL_bPvAQAA__9Wiz5w
 
 # Test that orderings on GROUP BY columns are propagated through aggregations.
 statement ok
@@ -259,43 +259,43 @@ NULL       /1       {1}       1
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT a, max(b) FROM sorted_data GROUP BY a]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkcFq8zAQhO__U4Q5JbAhlsN_0ck5BlKnpCm0FBNUa2sCqddIMhSC373YOjQpxG2PO9pvZlidUYvl3Lyzh36BAuE_CkLjpGTvxfVyXFrbD-iEcKybNvRyQSjFMfQZ4RhODI1c5tIsUhAsB3M8DWsdQdrwBflgKoZednRhrMaN9-b1xDs2lt0iubLHm0jmxQW2B2uCAeGhMbXXkzkI2zboSaYoS3Grh_pLj1VVOa5MELdQ1zWyfl7lz4d8uz_kj5vNNFMzEO5WT9Msnd2MT6_if7jvjn0jtedfHTjpCgLbiuMfemldyfdOyiEmjtuBGwTLPsTXZRzWdXzqC17CahROx-F0FE6-wUX37zMAAP__NDHaoA==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkVGrm0AQhd_7K5Z5UtgQNfRln7RtWgSjqRpICBI27lQCxrW7KwSC_72ohSaFeO99nJnzzTk7ewf9uwYG2Tpaf81Jp2ryPU025Ljeb6MgjIn1Lczy7Gdkk78STsmV36yzPQm1VAbFSXDDyY802W3JlwPhBVBopMCYX1EDO4ILFD5DQaFVskStpRra91EUihswh8KlaTsztAsKpVQI7A7mYmoEBrFcyHbpAQWBhl_qUdZTkJ35B2nDKwS26unDYnd-cc7PNabIBaql87QefknpPzwPKGQtbzQjC6CQdIYR36W-B69yuB_JEVSVwoobqZbucwx_qIP4cIqT_BTvosjyXRsobIK95Xv2S3vvyf6N-6aoW9lofNeBnb6ggKLC6Q-17FSJWyXL0WYqk5EbGwK1maarqQibaTQEfITdWdibh71Z2PkPLvpPfwIAAP__u9n0cA==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT a, max(b) FROM sorted_data GROUP BY a ORDER BY a]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMllGL4jwUhu-_X1HO1QxfSj1p62iv6uXArC6zs7DLIpKxQQWnKWmEHQb_-1J7YdWdnJbUxUtbn-RNnsNLPyBXmZyKN1lC8gsQGHBgEAKDCBjEMGdQaLWUZal09ZcaeMx-QzJgsMmLnakezxkslZaQfIDZmK2EBF7E61Y-S5FJHQyAQSaN2GwP2xR68yb0e1oqbWS2yIQRwOBbIfIy8fwAPZFnHnrKrKUGBrOdSbwUWcphvmegdua4a2nESkKCe9Y-2WS10nIljNJBfBosrS5gpjOpZVZtCQwm05-L6exlMf3-9HSX4j0w-DL5cZfy-7Mwx_Vf3721KNcXS8_3x8D808DHdVQd5Hyd_-uFLKfCQX_HOkYOe488Vb4qAjyV8Nn20cn22H74sMPwBegH3HX8iGwNUcPbGD_sefzw-uPH2_vnXfxzPwhd_RPZGjf1cBv-ec_--fX9h-39h138h34QufonsjVuanQb_sOe_YfX9x-19x918R_5Qezqn8jWuKnxbfiPevYf_dvPj7-keZZlofJStvqyGFTnkdlK1ucv1U4v5Vetlodt6p-zA3d4kMnS1G-x_vGY16-qgE0Yz2FswvwExm7w0AUeu8DolBtjO82t9x3a4dAua2i3FVnp2A7HLqrtMKHaDhOq7TClmqAJ1UMX1Q9WeGSXNXKRZYcJWXaYkGWHKVkETcgau8hCokWpGnXrUbcidWtSxyp161J0KlMk2jQipF3UaSdpdpqSZqcpaXaalEbglLSLUrVKm-__-xMAAP__HM5iZA==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlmFr4jAYx9_fpwjPK-UiNWl1W1_p3bxDcHanDjaGjMwGJzjTSyJsDL_70fbAut2SltTDd9rml-ef_B4e-gbq9xpCmA5Gg-8ztJVr9GMSXaH7we31qD8co8blcDqb_ho10d8lDKNn9tJ4bOYLlZCaxw8x0wz9nEQ31-jbHWIomlwOJtnPOWDYiJiP2TNXEN4DAQwUMPiAIQAMHZhjSKRYcKWETJe8ZcAwfoGwjWG1SbY6fTzHsBCSQ_gGeqXXHEKYscc1n3AWc-m1AUPMNVutszKJXD0z-dorBAQM04RtVIhaHkFsEyOChH7iEjBEWx2iHsE9CvMdBrHV-6pKsyWHkOxw-WT95VLyJdNCep3DYL30AiIZc8njtCRg6I_vHsbR7GF8Mxo1eqQJGK76t40ebb4Ls9__8RU9MfX0Yev5bh-Yfhp4v4_Ig7zf52u-keFUpF3fsfaR_dojj0VLJB45lPBZ-eCgPCnffKRC83mk5VHX9rNkK4jqnkb7kZrbjxy__Wh5_7SKf9ryfFf_lmyFmzo7Df-0Zv_0-P798v79Kv79lhe4-rdkK9zU-Wn492v27x_ff1Def1DFf9DyOq7-LdkKN3VxGv6Dmv0H__fz4x9pJlwlYqN4qS-LdnoeHi95fn4ltnLBr6VYZGXyv1HGZQ9irnT-luR_hpv8VRqwCJP3MCnC9AAm1eCuC3zhAhOn3KRjpqnxvn0z7Jtldc22AiPdMcMdF9Vm2KLaDFtUm2GbagttUd11UX1mhM_Nss5dZJlhiywzbJFlhm2yLLRF1oWLLGKZorYx6jZH3Qap2yR1HKVus5Q4DVNimaaBRdqHcVpJmpm2STPTNmlm2irNgtukfRiqRmnz3Zc_AQAA__9IUH8M
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT c, min(b), a FROM sorted_data GROUP BY a, c]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlk1v4jAQhu_7K6I5Fa2jYDuhkFN6ROqGVbd7WK0QcokFSDSOHCNtVfHfVyQHwkc9CeaQYz6ezIzfR6N8Qq4ymYp3WUL8FygQYECAA4EQCEQwJ1BotZRlqfThlRqYZv8gHhLY5MXOHG7PCSyVlhB_gtmYrYQYXsXbVr5IkUkdDIFAJo3YbKsyhd68C_2RlEobmS0yYQQQ-FWIvIw9P6CeyDOPesqspYb5noDamWOh0oiVhJjuSftmnlYrLVfCKB1Ep70kh5lnOpNaZrFXXT2lfxbp7HWR_n5-fkjoAAj8mKYPCRtcPOSDs_6OJd8-vLUo1xfV5vvjDOzLGY7fUXVv59_5Xn_IMigd3nlSArOdib2Ek4SRapLryfAWU-3ya3NdHSlVvioCGp29eb12eFKbtleUdlA0oH7AbpAUaaeR3ai3ktI7S0p7ISlrLwrrIgrzA36DKEg7jfN77K0o7M6isF6IwtuLwruIwv0gvEEUpJ3G-Y17Kwq_syi8F6KE7UUJu4gS-kF0gyhIO43zm_RWlPDOooS9EAX5c32RZaHyUrb6-xkeRpbZStZHVKqdXsqfWi2rMvXlrOKqG5ksTf2U1hfTvH50aLAJ03OYNmF2AtNu8MgFnrjA1KlvGtlpZj1vboe5PayRPa3QSkd2OHKJ2g4jUdthJGo7jEWN0EjUI5eoH63w2B7W2CUsO4yEZYeRsOwwFhZCI2FNXMKiyBbF1qjbHnVbpG6b1HGVuu1S6rRMKbJNQyS0i3XaKTQ7jYVmp7HQ7DQaGoJjoV0sVWto8_23_wEAAP__X2mXqg==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlt9v2jAQx9_3V1j3BJpRcH7QNk90Wzch0dABlVZVqHKJRZFozGwjrar43yeSSaTAfAHzkMcQf3J3_n504h307wXEMLrp33wdk5VakO_DwS15vPl117_uJaTxrTcaj372m-TfkSklr_Os8dykhBdntVRGpE8pN5z8GA7u78iXB8IpmU6AQiZTkfBXoSF-BAYUfKAQAIUQKEQwobBUciq0lmpz5D0HeukfiNsU5tlyZTY_TyhMpRIQv4OZm4WAGMb8eSGGgqdCeW2gkArD54u8zFLNX7l665YaAwqjJc90TFoeIzxLCSPSvAgFkzUFuTLbQtrwmYCYrWn1Zq5nMyVm3EjlRR976W5mHqhUKJHGJH-6Th6eksH4Kbnv9xtd1gQKt72k0fWbey-D5k5_25LPb-SF65e9apP1dgb_vzNsvyOL3na_87n4kGVQ1j7zpBQGKxOTbkC7Ps0nOZxMUGGqVXZoroMjJbIllx6Ldk4erh1-qM2qK8qOUNRjLc8_QVKknVJ2ndpKys4sKauFpH51UfxjRPFbXnCCKEg7pfu7qK0o_plF8WshSlBdlOAYUYKWF54gCtJO6f4uaytKcGZRglqIElYXJTxGlLDlRSeIgrRTur-r2ooSnlmUsBaiIP9ch0IvZaZFpX8_7c3IIp2J4oq0XKmpuFNympcpHgc5l_-QCm2Kt6x46GXFq02DZZjtwqwM-x9gdhzccYGvXGDm1DeL7LRvve_ADgf2sDr2tEIrHdnhyCVqO4xEbYeRqO0wFjVCI1F3XKK-sMKX9rAuXcKyw0hYdhgJyw5jYSE0EtaVS1gM2aLYGnXbo26L1G2TOq5St13KnJYpQ7ZpiIS2t06PCs1OY6HZaSw0O42GhuBYaHtL1RraZP3pbwAAAP__Dpuy1g==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT c, min(b), a FROM sorted_data GROUP BY a, c ORDER BY a]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlsFu4jAQhu_7FNGcitZRsJ1QyCk9InXDqts9rFYIucQCJBpHjpG2qnj3FcmBAMWTYA45hvB5Zvz9GuUTcpXJVLzLEuK_QIEAAwIcCIRAIII5gUKrpSxLpQ9_qYFp9g_iIYFNXuzM4ec5gaXSEuJPMBuzlRDDq3jbyhcpMqmDIRDIpBGbbVWm0Jt3oT-SUmkjs0UmjAACvwqRl7HnB9QTeeZRT5m11DDfE1A7cyxUGrGSENM9ad_M02ql5UoYpYPotJfkMPNMZ1LLLPaqp6f0zyKdvS7S38_PDwkdAIEf0_QhYYOLl3xw1t-x5NuHtxbl-qLafH-cgV2d4XiOqns7P-d7fZBlUDq886QEZjsTewknCSPVJF-b4TdPxa9MlSpfFQE9VXetfHhSnrZPKe2Q0oD6Abshp0g7DX2j3uaU3jmntBc5Ze2DwroEhfkBvyEoSDuN-3vsbVDYnYPCehEU3j4ovEtQuB-ENwQFaadxf-PeBoXfOSi8F0EJ2wcl7BKU0A-iG4KCtNO4v0lvgxLeOShhL4KCfLy-yLJQeSlbff0MDyPLbCXrKyrVTi_lT62WVZn6cVZx1Q-ZLE39ltYP07x-dWiwCdNzmDZhdgLTbvDIBZ64wNSpbxrZaWa9b26HuV3WyG4rtNKRHY5cVNthRLUdRlTbYUw1QiOqRy6qH63w2C5r7CLLDiOy7DAiyw5jshAakTVxkUWRLYqtUbc96rZI3Tap4yp126XUaZlSZJuGiLSLddpJmp3GpNlpTJqdRqUhOCbtYqlapc333_4HAAD__6Vgl6k=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMllFr4kwUhu-_XzGcK-UbiZOJts2V3a27CDbpqoUtRcrUDFawGXcywpbif19MFox1O8c4XuRyTJ6cc-Z5OfgO2a8lhDDuD_tfJ2Stl-TbKL4lj_2fd8PrQUQaN4PxZPxj2CR_X5lR8rpIG89NSkTxbqa0kclTIowg30fx_R358kAEJTMSj276o_w0BQqpSmQkXmUG4SMwoOADBQ4UAqDQgSmFlVYzmWVKb195z4FB8hvCNoVFulqb7c9TCjOlJYTvYBZmKSGEiXheypEUidReGygk0ojFMi-z0otXod96pR6Bwngl0iwkLY8RkSaEEWVepIbphoJam12hzIi5hJBt6PHNXM_nWs6FUdrr7PfS284c60RqmYQkP11HD09RPHmK7ofDRo81gcLtIGr0_ObBQ9780N-u5PMbeRHZy0G16WY3g__pDLvvqKK3j9_5v_iQZVDWPvOkFOK1CUmP055P80n-bYafPBX_ZKpItdTKY_vqPisf7JVnx6eUVUipx1qef0JOkXZK-rq1zSk7c05ZLXLqHx8Uv0pQ_JbHTwgK0k7p_i5qGxT_zEHxaxEUfnxQeJWg8JYXnBAUpJ3S_V3WNij8zEHhtQhKcHxQgipBCVpe54SgIO2U7u-qtkEJzhyUoBZBQf68jmS2Umkmj_r3096OLJO5LK4oU2s9k3dazfIyxTHOufyHRGameMqKwyAtHm0bLMPsI8zKsL8Hs2pw1wW-coGZU9-sY6d9631zO8ztsrp2W4GV7tjhjotqO4yotsOIajuMqUZoRHXXRfWFFb60y7p0kWWHEVl2GJFlhzFZCI3IunKRxZAtiq1Rtz3qtkjdNqnjKnXbpcxpmTJkmwaItIN1Wkmancak2WlMmp1GpSE4Ju1gqVqlTTf__QkAAP__YkS1rQ==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT b, max(c) FROM sorted_data@foo GROUP BY b]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkk9r8kAQxu_vp5DnpLBi_vhecopHi02KtdBSgmyz0xDQTNjdQIvku5dkCzWCaT3uzPzm-YXJCRUrSuSRDKJX-BD4j0yg1pyTMay7shtaqw9EnkBZ1Y3typlAzpoQnWBLeyBESHjO9SKEgCIry0M_1gpwY38gY2VBiJatOFvsjy_eybcDbUkq0gtvsB7vzLFhbUntlbQSAo-1rEw0mUMgbWw0iX1ck_Bvkbjjsvp28IcOtS6PUn9eeLjwQMTh1fzglvxVUWgqpGW9CIb5ceeTakWaVP-9AqvkZZ-ku33ytNlMY38GgfvV8zQOZldlwoHML6fekqm5MvSnW3ttJkCqIPc7GW50Tg-a8z7GPdOe6wuKjHXdpXusK9fqBM9hfxQOxuFgFA7H4XAU9i7grP33FQAA__9E9hy_
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyUklFr2zAQx9_3KcT_KQGVxHb34idnWzYyXDtLUmgpJijW1RgcnyfJ0BHy3UfswpJCvPZRp_vd_ydOB9jfFUKs5_H860a0phLfV-mdeJo_LOPZIhGjb4v1Zv0rHovXlp0Ue_Uyysd9o2XjSG-1cip6ZhY_Vun9Unx5FLsMEjVrStSeLMIneJD4jEyiMZyTtWxO5UPXtNAvCKcSZd207lTOJHI2hPAAV7qKECLhG24mASQ0OVVWXdtRglv3D7JOFYTw9ijPBnvDgzdqV9GKlCYzmV6MxzNzdPZESKwbVdtQ3EAibV0oIg_XJLyPSPzksn518C4dGlPulfnzxqMP92UUXM33P5I_KwpDhXJsJv5lfnTySY0mQ7p7r8Qsedwm6Wab3MfxKPLGkLibPYwif3xVJriQ-c-qV2Qbri29a9fTYyZBuqD-O1luTU5Lw3kX0x_TjusKmqzrb2_7w6Lur06C57A3CPvDsD8IB8NwMAhP38DZ8dPfAAAA__-h7zgW
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM (SELECT a, max(c) FROM sorted_data GROUP BY a) JOIN (SELECT b, min(c) FROM sorted_data@foo GROUP BY b) ON a = b]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMl11v4kYUhu_7K9C5SrSDzIzNp1TJuUy1C9V2K7WqUOTgCSARDxobqVHEf6_AqvgwnNeTIa3vAviZOYd53hzmnTKT6nHyqnMa_UWSBCkSFJKgiAR1aSpobc1M57mxu0dK4DH9m0YdQctsvSl2b08FzYzVNHqnYlmsNI3oR_K80t91kmobdEhQqotkudpvs7bL18S-xbmxhU6f0qRISNBv6yTLR612IFtJlrZkyxQLbUnQZFOMWrEUcUjTrSCzKQ675kUy1zSSW1G_sof53Op5UhgbdE8Li3dfwMSm2up0tyUJehj_-TSe_Hga__71610s70nQt4c_7mJ1f1bMYf3nt9YiyReVpafbQ8HqasGHdUxZyPk6X8qFmK5k5_9qK_RrSxye2mSXnrvY-Tdt5_oXs8y0DeTgdN2VfinuYvnl_me7nC_KP4-VUiIORRxdFatfoyGHUsembdaBCs-evLz34GRvWT9u0iFugWwHyjdwoLYjNXvNCJy8ceBkMwLn3NYNAjf8zMCp-tIrF-lVOwh9pQe1HenRb4b06sbSq2ZI79yWv_Sq85nSh_WlD12kD9tB5Cs9qO1Ij0EzpA9vLH3YDOmd27qB9PIzpY_qSx-5SB-1g66v9KC2Iz2GzZA-urH0UTOkd3BEnt3sXoy5ct08CHHVhsilil1a_i2iV8fUcnfF6dj9oI7yY788HsfeB9fz8_EG_63Uf3URvFDId52vTZbrWte8zq4Vnc51-e3kZmNn-ldrZvttypeTPbd_I9V5UX4qyxePWfnRrsBjWJ7D8hhWJ7B0g_s-sJRedNeLHvK0YunQBx74wBIcF6B7PrQCbYespBEPRyysIl7xLkv3eLjnkw8eBvngYZQPQIN8ABrko--TDx4G-eBhlA9Ag3zwNMrHwCcfQ34CdMAIqAwQpxnA02gI8DScAgBHYwDgwHPJjxFw4oAGpgMaqY5w4DrAkeyyMktcbJf8LJFgHMjKNHHSnaeR7jwNdQc40h3gSPfKIHXSnaeR7jwNdQc40p3Hoe6Vceqke2WwnOo-ALpXJouT7jyNdOdpqDvAke4AR7pXpqqT7jyNdOdpqDvAke48jnRX_IVUgRupqsyWU1wB3OV2phzpgRd9dmzOeM8LV6h1tyvadPvTPwEAAP__qGgS1A==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMl1Fv4jgQx9_vU1jzBLdGwU6gFGml9O56J1YUem1X2tUKVYa4FInGnBOkXVX97qeQnggEPHFNb_O2BP_sGfL779TPkPyzhD7cXg4vf78ja70kf96Mr8i3yy_Xw4vBiDT-GNze3f49bJLXJb_mCxqvHwUlT-J7Y9bMHydKpzK6j0QqyF8348_X5LevRDTJp3G21yszpeRpER9iwgeltty0ScYjIshHMp0AhVhFciSeZAL9b8CAAgcKPlAIgEIHJhRWWs1kkiidLXneAIPoO_TbFBbxap1mjycUZkpL6D9DukiXEvpwJ6ZLeSNFJLXXBgqRTMViuTlmpRdPQv8ICzUChduViJM-aXmMiDgijKj0UWqgMF6nfRIyGvoweaGg1un21CQVcwl99kKrV3Yxn2s5F6nSXme3sDD7AcY6klpG2ZFA4WL09X40vrsffR4OGyFrAoWriy-NkDf3itnuP_1BHkXyWNp68rItmB8teLuPygvZ3-dDvpGhK9b-WW35bm3R7ap1fGjdwc6vpJ7LT2oRS-2x3u6-S_mQNkL2oflRL-aP-T-LSnEa-jQMjop1VqEhi1JHqqVWHvf3Vh4-u7dzNqseN2YRN4-1PO4aOKS2gprdegSOnThwrB6Bs27rBIE7f8_A8erScxvpecvzXaVHaivocVYP6fmJpef1kN66LXfpefs9pferS-_bSO-3vMBVeqS2gh69ekjvn1h6vx7SW7d1AunZe0ofVJc-sJE-aHkdV-mR2gp6nNdD-uDE0gf1kN7CEbZ3s3tQ6sh1cyvEURsCmyqytPxXRLeKqfnp3KRj5406srf95TEYOb-4rpuPJ_jfiv9fF8EDhdzIZKXiRFa65rWzVmQ0l_mvk6i1nslrrWabY_KP4w23eRDJJM2_ZfmHQZx_lRVYhNk-zIow34GZHXzmAjPmRHec6HMzzY207wL3XGCGvC6E7rrQHGnbN0oamOHACPPArHjHSHfNcNclH2YYyYcZxvKB0Eg-EBrJx5lLPswwkg8zjOUDoZF8mGksHz2XfJybJ0AbGQGlAWI1A8w0NgTMNDoFEBwbAwiOeM7MYwR54wiNmI7QmOoYjriO4JjsrDRLbGxn5lnCkHHAStPESnczjeluplHdERzTHcEx3UuD1Ep3M43pbqZR3REc092Mo7qXxqmV7qXBsqt7D9G9NFmsdDfTmO5mGtUdwTHdERzTvTRVrXQ305juZhrVHcEx3c04pjs3X0g5ciPlpdmyi3MEt7mdcUu650TvvTZrvOuEc6x1uyva5OWXfwMAAP__qOFDRA==
 
 # Verify that the stages preserve the ordering as expected.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(x) FROM (SELECT a, b::float + c AS x FROM data) GROUP BY a ORDER BY a]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMllFr4k4Uxd__nyLcp5ZOiHcSrc1T-vKHgquLax-WRcrUDCrYTJiMsKX43ZcksEZd56Y7wfVxjL-5595zuMwHZCqVY_EmC4h_AAIDDgxCYBABgz7MGeRaLWRRKF3-pQae0p8Q9xiss3xryp_nDBZKS4g_wKzNRkIMM_G6kVMpUqmDHjBIpRHrTVUm1-s3od-TVBgBDL7lIitizw_QE1nqcU-ZldQFMJjKLJU69pLwLuFx_P9o8jgbMi9BmO8YqK3Zly-MWEqIccfaS3xcLrVcCqN00D9UmJRTmOhUapnGXnV6HH9_GU9mL-Pn0egm4bel8OcvNwneHonZ3__67q1EsTq6uhS_F8zPCt7fo2ohx_fc1RdZusLeSe1mW3jSFv5uq2pwsjVl98wy8PCv9fMz-sfKV3mAh46cKx8dlMf2kcQ2kQzQD3gVSqxD2UEmCY0N9wbXkUnsOJN44Uzy9qHgrULB_SDsOBSExsb47q8jFLzjUPALhyJsH4qwVShCP4g6DgWhsTG-4XWEIuw4FOGFQxG1D0XUKhSRXz0sXINA6GqM7OE6ghB1HIToHz5j_iBtKotcZYVs9ULplc3JdCnrYRRqqxfyq1aLqkx9nFRc9UMqC1N_xfrwlNWfSoFNGI9hbML8AMbPwQMX-MEFRifd2LfT3Drv0A6HdrMGdrciK923w30Xq-0wYbUdJqy2w5TVBE1YPXCx-t4KD-1mDV3MssOEWXaYMMsOU2YRNGHWg4tZSGxRao267VG3Req2SR1XqdsuRadlisQ2jQjTTtbpp0yz05RpdpoyzU6TphE4ZdrJUrWaNt_99ysAAP__sRl0YA==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMllFv2j4Uxd__n8K6T6AaBTuB0jyF_0onJEq6QKVVFapcYlEkGjM7SK2qfvcpSTcCrHY6Rx1vJPjne-49R1d5AfVjBT5MBqPBlynayBW6iMJLdDv4fjXqD8eocT6cTCffRk30dkRtHhtPzeJU4-0dw-je9y9GYX_aQydojvoT9FQciVnKmuhrFF5fof9vEENhdD6I8p8zwJCImI_ZI1fg3wIBDBQwuIDBAwwdmGFYSzHnSgmZHXnJgWH8BH4bwzJZb9Ls9QzDXEgO_guky3TFwYcpu1_xiLOYS6cNGGKesuUqL7OWy0cmn4NMGmCYrFmifNRyCGJJjCgS6QOXCjBEPIm59FHgngT0V38YBQRmrxjEJt2WVylbcPDJK64usb9YSL5gqZBOZ1dhkE0hlDGXPPZR_tQf39yNw-nd-Ho0agS0mQm_vmwEpLknZnv__TN6YOph7-pM_FYwfVfw9h5RCNm_56S4SNMVaR_ULrdFDtoiv9vKGww3adY91gzc_Wv99B39Y9ESa4fsOvJeeW-nPKkeSVIlkg5pOTQPJSlCWUMmDRpL7nWPI5Ok5kyST84krR4KWikUtOW4NYfCoLE0vtPjCAWtORT0k0PhVg-FWykUbsvxag6FQWNpfL3jCIVbcyjcTw6FVz0UXqVQeK38w8I2CAZdpZGdHUcQvJqD4P3Dz5g_SIu4WotE8UpfKO2sOR4veDEMJTZyzq-kmOdliscw5_IXMVdp8S8pHoZJ8VcmsAyTfZiUYboDk4_BXRv4zAYmVrpJR09T7bxdPezqzerq3fK0dEcPd2ys1sMGq_WwwWo9bLLaQBus7tpYfaqFe3qzejZm6WGDWXrYYJYeNplloA1mndmYRQxb1LRG7fao3SK126SWq9RulxKrZUoM29QzmHawTj9kmp42maanTabpaaNpBtxk2sFS1Zo2e_3vZwAAAP__faGWgA==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(x) FROM (SELECT a, b::float + c AS x FROM data) WHERE a > x GROUP BY a ORDER BY a]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlk1r20wQx-_PpxBzSsgaaVbym07KJRDIY5c0OZTWBMVaHIOjNas1NIR89yIt1LLVzMi1cH30y08zu__fDHqHXGdqkr6qAuLvgCBAgoAQBEQgoA8zAWuj56ootCn_4oDb7CfEgYBlvt7Y8uuZgLk2CuJ3sEu7UhDDQ_q8UvcqzZTxAxCQKZsuV1WZtVm-puYtyVKbgoCv6zQvYq_no5fmmSc9bV-UKUDAvcozZWIvCa8SGcc3d9Prh5HwEoTZhwC9sdvyhU0XCmL8EO1bnOieXvv93eZulitb1ZTej00QhIoqJw8pd71YGLVIrTY-7t1IUt761GTKqKwsDQKuJ9-eJtOHp8nj3d1FIi_Li3r8_yLBy71utgWe37yXtHjZe3TZ_bbj8NOOt8_RrpH951y5B1HH6jdq14-FjWPh72NVB5xubHl6Qdx49Nf9y0_6dxbI3UQ-K9_fKY_tRwDbjICPPV9WQ4BuCDqYAaZHd_pBZzPAlKvLgucxA9jxDAxOPAOyvYSylYSy54cdS8j06CQcdiYhU66eljwPCWXHEg5PLGHYXsKwlYRhz486lpDp0Uk46kxCplw9rfA8JAw7lnB0Ygmj9hJGrSSMetXb4bHiMX058cadiceUqycUnYd4Ucfijf_ha-gfWrtXxVrnhWr1hhmUh1PZQrnLKPTGzNUXo-dVGfdxWnHVF5kqrPsV3Yfb3P1UNliHkYQlDct9GOtwuAPjYfDoGBjlUfTgGFoGNB2SFx7RcESnxWTdJ-kBDQ9IeEjDw2NEoWFGFBrmRGFoRhSa5kQZHSPKmN4JAbMUmJXC7ZTGUjkkboZm8mZoLnAOZxJncC5ybKyWQzJHerVgxKRGLxfsM3hjuxwUOk1zodM0GzqDc6HTOBs6vVm50BtLZje1EZMavWVwzOCNPXNQ6DTNhU7TbOgMzoVO41zokt6w-6HPPv77FQAA___0jY3c
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMll1v2kwQhe_fX7GaK1AWmV2bL1_B25AWieDUELVRiqINXhEkgunaSERR_ntlb1I-3OyYYqXcge3Hc2bPmZGfIfo5BxeG3X7304is1Jxc-N4lue1-v-p3egNSOu8NR8Ov_TJ5fSRaPZbWZf1U6fWaoOTedS_6XmfUJGdkQjpDstaPBCIWZfLtS9fvEkF-rKpVW5I1-ex711fk_xsiiOefd_305xgoLMJADsSjjMC9BQYUOFCwgYIDFGowprBU4URGUaiSR55ToBeswa1SmC2Wqzi5PKYwCZUE9xniWTyX4MJI3M-lL0UglVUFCoGMxWyellmq2aNQT-1EK1AYLsUicknFYkQsAsJJGD9IFQEFXy4CqVzSts_a_K1hStoMxi8UwlW8KR_FYirBZS80v8RBWAmXVm1X3MVsHqc1-dvpGcrxQ8p1plMlpyIOlcX2TqSdnLqnAqlkkJQGCp3Bzd3AG90Nrvv9UpuXk4O6viy1WXlPzabA_RN5ENHD3qsT9RvF9ruKN-8JtZD995zpF5naqmVqb7fFMm2x322lDXqrOOmeGk7c-Wv9_B39OgV815H3ytd2yrP8I8DyjIDFKhZPh4DpIShgBhCNuvt6YTOAlNsOCzuNGWAFz0D9g2eA5w8hzxVCXrHsgkOIaNQhbBQWQqTctlv8NELICw5h44NDaOcPoZ0rhHbFcgoOIaJRh7BZWAiRcttu2acRQrvgEDY_OIRO_hA6uULoVNKvw2ODh-jSwWsVFjyk3LZDzmkEzyk4eK1_-Bn6B2m-jJbhIpK5vjCrSXMymEp9GFG4UhN5pcJJWkb_9VIuvRDIKNZ3mf7TW-hbicBtmBlhbob5Psy2YXsHZofBzWNgxo-i68fQvGqmbeOBO2bYMbuFeF0z0nUzXDfCDTPcOCYoZhgJihnGgoLQSFDMNBaU5jFBaZl3QhVZCshKwXZKZqkcYjdCI34jNGY4hiOOIzhmOcuslkM8Z-bVwhzENfNyYTUEz2yXg0w305jpZho1HcEx0804arp5s2KmZ5bMrmtNxDXzlmEtBM_smYNMN9OY6WYaNR3BMdPNOGY6N2_YfdPHL__9CgAA__--oLSZ
 
 # Ensure that an interesting input ordering that causes an ordered group by
 # forces an ordered synchronizer. We create an index on b even though it's
@@ -369,7 +369,7 @@ group           ·            ·              (b, count)  ·
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT b, count(*) FROM data2 WHERE a=1 GROUP BY b];
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlFtr3DAQhd_7K5Z52lAFW9pLQU8OfVpI7bIXSilmUazBMWwsI8nQUPa_F1sBX7pR1m0pfZRnvplz5oB_QKkkxuIJDfBvQIEAAwIrSAlUWmVojNJNyTVu5HfgIYGirGrrPtvCnhA41KXSEjVKICDRiuLU1NNzSiBTGoF3rbG6VVWwHjUSULV9GZsSMFbkCHx5Jr3VtLf6wuC9eDjhFoVEHYSD8VDp4kno50gKKxqHu0qUhs8CehvQoLGd1JbPIgavCaFThNzlucZcWKUDNtQRtbvcpfisfd3FX49xsj_Gh_v7eURvgMDH5BDvj9vky25-M1LULXl4nj0K8_jL_PbmL6rZq6q7OZdyg4i-h4vh9awtf8fa7vDpuIn384iNnXWqFwPV7PrQ6ZWhN7GzyaG_IaR3mcV_FDr7u6Gv_k3oof_WWzSVKg1e9Q8JG0soc3QnMKrWGX7WKmvXuGfScu0Hica66gf32JSu1Ajsw9QLMz_MxjDtw4sBTKfBaz-88MoO_fDSC6_8nld_4tkPv-F5Pclzen73MwAA__-UYket
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlF-Lm0wUxu_fTzGcq-TtLGYmfwpCwXRrW8HVVA3bZZEw0cENuI6dGaHLku9e1EBMmnWTtpRejuf8znme84DPoL7lYEJou_Z1hCqZo4-Bf4Pu7a8Ld-54aPDBCaPwiztEu5Y1RomoCj34f9i2pkwzim4_24GNGHqHCPoU-MsFen-H1jFgKETKPfbIFZj3QAADBQxTiDGUUiRcKSHr0nPT6KTfwRxh2BRlpdvPeqNzDiZUhZAplzwFDCnXbJPX9XgbY0iE5GDuWz1xJUpjdtSIQVR6NzbGoDTLOJiTLe6sJp3VJwZHbJ3zgLOUS2N0MB5KuXlk8slqzgEYwpIVykQGuTKIUdv2K20ii8JLQsglQuZZJnnGtJAGPdRhNbvaS5moec29u5XnRytv6boDiwwBw7W_9KJV4N-Gg-GRov2S9RN6YOrhp_nNzXeq6Yuq93NO5QYWeQMnw-tYm_yKtXB5s3K8aGDRY2d71eMD1fT80MmZodex04tDf0VI5zLjfyh0-mdDn_6d0Ef9tw64KkWh-Fn_kFFtiacZb0-gRCUTvpAiada0T7_hmg8pV7qtvm0fTtGWaoFdmPTCtB-mxzDpwuMDmFwGz_rhca_sUT886YWn_Z6nv-O5H37F8-wiz_H2vx8BAAD__0AqYjY=
 
 statement ok
 CREATE TABLE uv (u INT PRIMARY KEY, v INT);
@@ -379,4 +379,4 @@ INSERT INTO uv SELECT x, x*10 FROM generate_series(2, 8) AS g(x);
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(v) FROM data INNER LOOKUP JOIN uv ON (a=u) GROUP BY u ORDER BY u]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMll9vmzAUxd_3KdB9ajVHxDb5xxN97NQlU9c-TFNUucFKs7UYGTKtqvrdJ2BqCDT3wohYHgn52cc-5x7xApEJ9Vw96QT878CBgQAGEhh4wGAESwaxNSudJMZmfymAy_A3-EMGmyjeptnPSwYrYzX4L5Bu0kcNPtyo-0d9rVWorTsEBqFO1eYx3ya2mydln4NQpQoYfI1VlPjOwOWOikJHOCZ90DYBBott6jsBh-UrA7NNd5slqVpr8Pkray7ok9lEf_WM3tez_QUMroz5uY2dH2YTOSbKt38TwgLBAnlQjmgj52K9tnqtUmNdXrmfIPNgYUNtdeg7-dPF_NvdfHFzN7-9ujoLxHl2bbefzwJ5XlGz2-D-2XlQyUNl6ewyd4rlQcW7dUwhpLrOx2Ih7Fij2t7lY_HasfjbsfIDFpcuGBIA75_1iwP652ZgYlfsO3Jo-9He9rz5QPAmA-HygSvykeDFSLSeCEJRaSLGfUwEIaccHX4aE8GPPBHjnidCNI-kaBRJMXBlp0gSikqRnPQRSUJO2TtxGpEUR47kpOdIyuaRlI0iKQeu1ymShKJSJKd9RJKQU_ZOnkYk5ZEjOe05kl7zSHqNIukN8k_MdjEkVJRiOOsjhoScsl_eacTQO3IMZ__x8_Udadc6iU2U6EZfpsPscDpc6-IyErO1K_3FmlW-TfG4yLn8h1AnafGWFw-XUfEqE1iGOQoLHBZVmJdhuQfzdvC0C8xFJ3rchRZDnJbohXs47OFuEV6PUHqMw2MUnuDwpEtQcJgICg5TQSFoIig4TQVl2iUoM7wThkQpEJVCdUqtVNrYTdCE3wRNGU7hhOMETlnOa9XSxnOOVwv3CNfwcuEjAq-1SyvTcZoyHadJ0wmcMh3HSdPxZqVMr5XMvmtTwjW8ZfiMwGs908p0nKZMx2nSdAKnTMdxynSBN2zV9OXrhz8BAAD__2dkrLM=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlttv2kgUxt_3rxidJ9AOMjM2N0srkd2wFSmxKRepUYQiB48ILfFQX6JGUf73ynYUDIQ5dkEubxj7N-eb-b5zNC8Q_FiBCePeoPffhET-ivw_sq_Jbe_rcHDRt0jlsj-ejL8MquTtkyB6rDxV069cJ3RI37J6IzKw7c_TIbmy-xaJnohtkYpD_iFRlXwa2dMh-feGRMQeXfZGyc8ZUPCkKyznUQRg3gIDChwo6EDBAAoNmFFY-3IugkD68ScvCdB3f4JZp7D01lEY_z2jMJe-APMFwmW4EmDCxLlfiZFwXOFrdaDgitBZrpIya3_56PjP3Vg5UBivHS8wSU1jxPFcwokMH4QfAAU7Ck3SZTB7pSCjcFMsCJ2FAJO90vyCruTSe9PT-FhP9AQUBlJ-j9bkm1x6RHpJ-XchtMtpVz8ohxeRc7FY-GLhhNLX2M75dGMPbN8VvnBNkjxdWDd3lj25s6aDQaXLq_GxTa8rXb26o2ZT4P6ZPDjBw87S8WFuFOsHFW_WkamQ3XX-ThdSbauxVzu7Lba3Lfa-rWSD6aFzqgiA8dv6-QH9lqzJtca3HTlUvrFVnuVvCJanITRW03jSEixticIdgSjKdESzjI5A5GSjw86jI9iJO6JZckfw_JHkuSLJa5p-VCQRRZlItsqIJCIn6x0_j0jyE0eyVXIk9fyR1HNFUq9pxlGRRBRlItkuI5KInKx3-nlEUj9xJNslR9LIH0kjVySNWnLFLBZDREUmhp0yYojIyfplnEcMjRPHsPMHr68fSBuJYC29QOS6mdbjzQl3IdLDCGTkz8XQl_OkTPpoJ1zyhyuCMH3L0oe-l76KBWZhpoS5Gua7MMvC-hbMisHtY2DGj6Kbx9C8rqZ15YEbathQu4V43VDSTTXcVMItNdw6JihqGAmKGsaCgtBIUNQ0FpT2MUHpqGdCHRkKyEjBZsreUCliN0IjfiM0ZjiGI44jOGY52xstRTxn6tHCDMQ19XBhDQTfmy6FTFfTmOlqGjUdwTHT1ThqunqyYqbvDZlt19qIa-opwzoIvjdnCpmupjHT1TRqOoJjpqtxzHSunrC7ps9e__oVAAD__7N8zns=
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_auto_mode b/pkg/sql/opt/exec/execbuilder/testdata/distsql_auto_mode
index 4af527330a55..33710411f6e4 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_auto_mode
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_auto_mode
@@ -13,7 +13,7 @@ query BT colnames
 EXPLAIN (DISTSQL) SELECT 1
 ----
 automatic  url
-false      https://cockroachdb.github.io/distsqlplan/decode.html#eJyMj7GKwzAQRPv7CjO14ORWf-DmLqQNKoS0GIOiNVopBIz-PVgq0rqcNzM77IHEgf7ckwTmgRlWYc_sSYTziUZgCW8YrbClvZYTWwXPmWAOlK1EgkFk7-L0crGSTPpXQyFQcVvs-abAtXzbUtxKMHNT1xfuJDsnoUuXdbMKFFYaXwjX7OmW2feZIf97r4NAUoY7D7GkYTXbfj4BAAD__xM4YY8=
+false      https://cockroachdb.github.io/distsqlplan/decode.html#eJyMj0FLxDAUhO_-ijAnhYDtNTfRHgplXe0eBOkhJI-lEPtqXipCyX-XTQ5ee5xvZt7wdsh3gEH3cR6e-pO6f-nHy_g2PKixG7rni2qhsbCnk_0igflEi0ljjexIhOMN7SXQ-1-YRmNe1i3d8KThOBLMjjSnQDAI7GxQPzZsJKp5bKDhKdk5lHzW4C39tyXZK8G0WR9feCdZeRE6dLnJkwb5K9UvhLfo6BzZlZkqX0uvAE-SqttW0S_VylO--wsAAP__NiFqpA==
 
 # Check the JSON column is still there, albeit hidden.
 query T colnames
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_distinct_on b/pkg/sql/opt/exec/execbuilder/testdata/distsql_distinct_on
index 230baea8d991..015bcdef4c52 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_distinct_on
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_distinct_on
@@ -78,7 +78,7 @@ distinct   ·            ·            (x, y, z)  weak-key(x,y,z)
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT DISTINCT ON (x,y,z) x, y, z FROM xyz]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslMGuojAUhvfzFOasS6ClorJiMRs348SZ3YQFQ08MiVLSlkTH8O4TIMGL0dILdwn49_u_Y3PuUEqBP7ILaoj_AAUCDAiEQIADgTWkBColc9RaqvYnfWAvrhAHBIqyqk37OiWQS4UQ38EU5owQw-_s7xmPmAlUfgAEBJqsOHeYShWXTN2S6-0fEPhVZaWOV57fkg-1iVcJI0lIEg5pQ0DW5gHRJjshxLQh7kW-F9oUZW789bhFQkkHekthbymPw-tSKoEKxejstLH1oMEni4SjItR97tRh7j7zfD5z8hNVBuNo0eSZuzBzEeZeV2iO8ESVQXizSDh0Fw5dhCOvKzRHeKLKILxdJMzdhbmL8MabqTtRZNDdfdkqeUE5oq5kqfFppbw-OWhXDYoT9ntJy1rl-FPJvMP0j4cu170QqE3_lfYP-7L_1Bb8GKbWMBuF6XOY2ckT6NCa5vYwX9J7bQ1HdnK0hLyxhrd28nYJeWf_r4KJa2K_ZM_stPn2PwAA__8GTroO
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyslF1vmzAUhu_3K6xz1UpGYCAf5YqpzSSkLOmSXEyquGBwVCFRzGwj5UP57xNQpUvUGC_sLgZeP-_jWOcA8ncBAaxn89njhtSiIN9Wy-_kZfbzef41WpC7p2i9Wf-Y35P3T5p1tHjckOWC3G0p2VGyvyfvP7rwdrePgULJM1wkbygheAEGFFyg4AEFHyiMIKZQCZ6ilFw0nxzaQJRtIXAo5GVVq-ZxTCHlAiE4gMpVgRDAJvlV4AqTDIXtAIUMVZIXLaYS-VsiduF2twcK6yopZUAsuyEvaxWQ0KWhR0Mf4iMFXqsPiFTJK0LAjtS8yFMuVV6myh6dtwgZbUFXKe5VysfmdclFhgKzs73jo64Hc_6xiHdWhJmfOzM4d9u1bP_Gk--pcjIeDzp511zYNRH2rbbQLcI9VU7Ck0HCnrmwZyI8ttpCtwj3VDkJTwcJ--bCvonwxLpRt6fISffhv42STygrlBUvJV6MlM93dppRg9krdnNJ8lqk-Cx42mK65bLNtQ8ylKp7y7pFVHavmoJ_h5k27J6F2WXY1ZN70J427evD_pDeI214rCePh5An2vBUT54OIT_o_yun55roL9klOz5--RMAAP__gO7S5g==
 
 # Ensure that ordering propagates past local DISTINCT processors.
 query TTTTT
@@ -98,7 +98,7 @@ distinct        ·            ·            (x, y, z)  weak-key(x,y,z); +x
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT DISTINCT ON (x,y,z) x, y, z FROM xyz ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lT9v2zAQxfd-CuPWUpCPov9p0tAlS1Mk3QoPqnQIBDiiQNJA0sDfvZBkQLUbHxnaGfXn3Xv83QP4Bq2u6Xv5TBbyX4AgQIKADAQoELCArYDO6Iqs1ab_ZRTc1S-QzwU0bbd3_eutgEobgvwNXON2BDn8LH_v6IHKmkw6BwE1ubLZDTadaZ5L81q8vP4BAY9d2dp8lqS98_3e5bNCiiIThYLtQYDeu8nEuvKJIMeDCA_yqI0jky5OMxT49eJ4-ZHx3xrrmrZyKc7PHcRwkP5UpiZDdT4r8KJpdtF08tLjnPdOwib77-wfSqZOkmH42jFg7alMUhW5eE-U4-KXsYv3jJ_w4g0XL8PxyhC8KhkAxOD1RDniXcXi9Yyf8Mob4s3C8WYheJfJACAGryfKEe86Fq9n_IQ3uyFeFY5XheBdJZFwPUGOcDexcD3jJ7jqk-6Ed0wfyHa6tXTieGnyvL8wqH6i8YKxem8q-mF0NdiMj_eDbnhRk3XjVxwf7trxUx_wXzGyYsmLJSvOTsR4Ls742EveWrHqBS9esGKP8_KaQ69Y8Zp3XrPiDS_eXBMbPR3zlYxvGXpqhlf1DD1FUx5zvmnoqRryXTvPvj18-RsAAP__agfTvw==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lU2P2jwUhffvr7DuakavUXBivrJKO1AJicIUWLQasUgTaxQpE6e2IwUQ_73Kh5RCBzsT6C5Ocu4597lX8hHkrxhc2MwWs6ctykSMvqxXX9HL7Pvz4tN8iR6m8812823xiOpfivN8-bRFqyV6yDHaY3R4RPVDJc73B7RaT2dr9PkHyneAIeEhW_pvTIL7AgQw2IDBAQwUMAxghyEVPGBSclH8ciwF8zAHt48hStJMFa93GAIuGLhHUJGKGbiw9X_GbM38kAmrDxhCpvwoLm1SEb35Yu_l-wNg2KR-Il3UswrnVaZc5NnYc7BHYXfCwDPVmEjlvzJwyQm3D7LhQjFhDc4zeOT_q-Xtj5SfRlJFSaAs0r90wGUjRVciZIKFLvLIVVPnqmnjxas673WiTfZX7x9KRs-SkfZjJy3Gbtk9i3YcvCFKPfhh18Ebyjd4yR0Hb7fHa7fBS3slgC54DVFqvKOueA3lG7z2HfE67fE6bfAOeyWALngNUWq84654DeUbvM4d8dL2eGkbvKNeR7iGIDXcSVe4hvINXPqP7oR3TNdMpjyR7MzxWuV-cWGw8JVVF4zkmQjYs-BBaVMdV6WufBEyqaqvpDrMk-pTEfBPMdGKbb3Y1oqdMzG5FDv62EO9NdWqB3rxQCs2OA9vaXqkFY_1zmOteKIXT26JTQw7Zloy_ZYRw5qRm_aMGBaNGsz1m0YMq0b0u3aZfXf673cAAAD__1cN74Y=
 
 # Ensure that even with more ordering columns, ordering propagates past local
 # DISTINCT processors.
@@ -119,7 +119,7 @@ distinct        ·            ·            (x, y)  weak-key(y); +y,+x
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT DISTINCT ON (y) x, y FROM xyz ORDER BY y, x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslU1vm0AQhu_9FdFcswjPsv7ixKGXXJoq6a3ygbKjCMlh0e5aShr5v1eAJWq3zK6Dj4BfnneeHZkPaIymb-UrOch_AoIACQIyEKBAwBJ2AlprKnLO2O4nQ-BBv0G-EFA37cF3t3cCKmMJ8g_wtd8T5PCj_LWnJyo12XQBAjT5st73mNbWr6V9L97ef4OA57ZsXH6XpB358eDzu0KKIoPdUYA5-JHgfPlCkONRxLd4NtaTTZfnBQp5Lwq8n0TIaxBfa-frpvIpLi4p3UBWkyXdDTWJyyZxI8UM75mag-31z_SRvdRZL4w_b4w471QmqfrMiQd6nE58NefEA4jRLN7kxGW8WRljViX9-FebDfQ4mV3PMRtAjGblTcxm8WazGLOrpB__arOBHiezmzlmA4jRbHYTsyrerIoxu04-4zXQ4uR1O8drADF6VTf_9_8P7olcaxpHZ6ypNy-6zwLpFxo-Jc4cbEXfral6zHD52Of6G5qcH57icPHQDI-6gn-HkQ1LPizZcHYWxstwxtde8WjFppd8eMmGA-TVnKHXbHjDkzdseMuHt3NqY2DHQkvGbxkG1gxn7RkGFk0F4PymYWDVkN-1y-6745c_AQAA__9DNc3z
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyslV9v2jAUxd_3Kaz71KpGwU6gkCe2wiQkBh3wsKniISNWFYnGme1ISRHffcofKYMttml4dJKTc-7vHiVHkL8P4MNmtpg9bVEqDujrevUNvcx-PC8-z5fobjrfbDffF_eofqQ4z5dPW7Raorv8HmUY5ZUmy9_Raj2drdGXnyjHKNsBhpiHbBm8MQn-CxDAQAGDCxg8wDCAHYZE8D2TkovikWMpmIcZ-H0MUZykqri8w7DngoF_BBWpAwMftsGvA1uzIGTC6QOGkKkgOpQ2iYjeApFPsvwdMGySIJY-6jmF8ypVPppQPHFhd8LAU9U4SBW8MvDJCdun2HChmHAG5wEm9AFPyEOrBb3GYhpJFcV75ZD-pUsxkAiZYGExVKud22rXuPDqPW1zaHP9M71lLu8sF7HfN7HYt0N7jveRjRty1Bsfdtm4waIhS26ycWpPltqQ9Xrl-FeTNeSoyT52IWuwaMjSm5B17cm6NmSHvXL8q8kactRkR13IGiwasu5NyHr2ZD0bso-9j3A1pKi5jrtwNVg0XL2bf_3_Y7dmMuGxZGdebW_uF78FFr6y6lcieSr27FnwfWlTHVelrrwQMqmqu6Q6zOPqVhHwbzHRiqleTLVi90xMLsWuPvZQb-1p1QO9eKAVG5yHXYZ-1IpHeueRVjzWi8ddYhNDx0wl07eMGGpGOvWMGIrmGcz1TSOGqhF91y6z706f_gQAAP__dR3oLw==
 
 # Distinct processors elided becaue of strong key.
 query TTTTT
@@ -134,7 +134,7 @@ scan  ·            ·            (a, b, c)  ·
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT DISTINCT ON (a,b,c) a, b, c FROM abc]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJykk01r4zAQhu_7K8x7lvH3HnzaayBkS9qeah8Ua0gNiWQkGVqC_3uxDI3jpkVpLgMj6fH7MIxPkErQhh_JoHxBAoYUDBkYcjAUqBk6rRoyRunxyQSsxBvKmKGVXW_H45qhUZpQnmBbeyCUeOK7A22JC9LR-F1BlrcHF9Pp9sj1-z--a8Dw2HFpyiDaPK_X5xJGFZIKnzWtgHpgUL09ZxrL94QyGdg3XmedXiotSJO4UKmHK-YbFaouKhYPr0enF9GJ_0hSn5F8GUE4b26aSuqvlt2ils7VpiZzNfdWy_zVcj-1hUc4b6IKhbda7q8We6iFiyUPuBRBEij7SvoX233FaEumU9KQ1_LG4_aT2NP0qxjV64YetGpczNT-d5w7EGTsdJtMzUq6Kyc4h5Mf4b8XcLyE03uSs3vg_B64uAmuhz8fAQAA__9FDr-I
+https://cockroachdb.github.io/distsqlplan/decode.html#eJykk0-L2zAQxe_9FOKddkHG8Z_04FPLNgWD62yTFAobHxRr2Aa8livJ0BLy3YvlpfnTtCjNZfCT5vn9GEY7mO8NMixnxexhxXrdsI-L-Sf2NPv6WLzPS3b3IV-ulp-Le_baMui8fFixecnuBGcbzup79voxmsWmrsDRKkmleCGD7AkROGJwJOBIwTFFxdFpVZMxSg8tO2fI5Q9kE45t2_V2OK44aqUJ2Q52axtChpXYNLQgIUmHw38lWbFtXEynty9C_3wnNjU4lp1oTcbC8ktRHEoQrhGt8bvGa6Dac6jeHjKNFc-ELNrzv3AdcPpWaUma5AlKtb9AXqpAdeH0rPFydHwSHfmPJPYZyR8jCI7FVVOJ_dGSa9DiY7RRJK6m3miJP1rqh3bGERyLcI2pN1rqjzbxQAvOlpyJVrKIKfuN9H9s9wWiBZlOtYa8lncybD_JZxqfilG9rulRq9rFjHLufO5AkrHjbTSKvHVXDvDYHP3T_PbEPDk3x7ckJ7eY01vM06vM1f7NrwAAAP__f9DXkQ==
 
 query TTTTT
 EXPLAIN (VERBOSE) SELECT DISTINCT ON (a, b) a, b FROM abc ORDER BY a, b, c
@@ -154,4 +154,4 @@ render          ·            ·            (a, b)     +a,+b
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT DISTINCT ON (a, b) a, b FROM abc ORDER BY a, b, c]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lMFvmzAUxu_7K9C7xhHYkDTlxGGXSlUzddtpcHDxU4eUYmQbaVPF_z6BJQJsMa6SXSw9w-fv8-9Z7x1qKfCJv6GG9AdQIMCAQAwEEiCwg4JAo2SJWkvV_2IFD-IXpBGBqm5a028XBEqpENJ3MJU5IaTwjb-c8Bm5QBX25wo0vDoNNo2q3rj6nfGXEgh8bXit0yB8-v74eF62YQ40h3FlOUDREZCtOXtqw18RUtoR_1yfK22qujThfh4qoyTr735UAhWKNLAblzzZRc-zlbRHLX02JGMbksUbKDpXQBp5JSRwbM1a3HgWl_q3jvm07q9WbafFh7q3Em2Ec3fD7jF_HPFHcLApDlvEw5p441iJNuI43BBH7I8j8cOxuPt2WoQ57LxxrEQbcdzfEEfijyPywLFdDLqA1yKggTQ_UXlSWEk0Utj9pwn3D89n1I2sNc4cL50c9WMPxSvacallq0r8omQ52NjyOOiGDYHa2K_UFg-1_dQHnIqpU8xmYroUM7fzinXsVCducXJN7p1TvHc7769xvnOKD27nwzXO9-5eRSvPxP3Ilt5F9-lPAAAA__-Unui8
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lFFvmzAUhd_3K6z71KqOEgNJU56yNZkUiUFHMmlTw4MDVodEMbONtCnKf5-AiSRsMa6SvVi6F47P4bvo7kD-yMCF1cJbPK5RKTL0MQw-oefF1yfv_dJHN_Plar367N2iP69U9dJ_XKPARzcUo-0tqs5GRrcxCsL5IkQfvtVtjOIIMOQ8YT59ZRLcZyCAwQIMNmBwAMMYIgyF4DGTkovqlV0tWCY_wR1hSPOiVFU7whBzwcDdgUpVxsCFNd1mLGQ0YWJY3ZswRdOstilE-krFrxndxoBhVdBcumjof_G8wzEYboBsoD2tDUC0x8BLdfCUir4wcMkem-eap1KleayGk9NQM4Jn1bcHImGCJS5qGuc8rbOeByveXNX1ucMz6w7P7DuI9rqAZGSUEENQqr649klcYj46y2R0f41qcFy8aXo90Vo491ecnmWOw34LDusYR1PY9ekY4-iJ1uKYXhGHbY7DMcPR-fbBcTHcwNgYR0-0FsfDFXE45jhGBjgGnUWHaJ4ggrj6zoQhhZ5ELYXxf9pw__AMmSx4LtmJ47mbR9XaY8kLa9al5KWI2ZPgcW3TlEGtqxsJk6p5SppimTePqoDHYqIVWydi0hVbeucea1urdvRi55LcY614oneeXOJ8rxVP9c7TS5wf9LMa9fwm-p-s6x3t3_0OAAD__zbeA6s=
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_indexjoin b/pkg/sql/opt/exec/execbuilder/testdata/distsql_indexjoin
index ccf010292c79..34af0570e44d 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_indexjoin
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_indexjoin
@@ -25,21 +25,21 @@ NULL       /10      {1}       1
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM t WHERE v > 10 AND v < 50]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyMkMFKNDEQhO__U4Q6_ULEjCJIn1YQYS6jrHvTHGLSLIHZJCQZUJa8u-wEXDwIHqu-7uqijwjR8WQOXECvGKAlUo6WS4n5ZPWB0X2AlIQPaaknW0vYmBl0RPV1ZhB25n3mLRvH-UpBwnE1fl5jU_YHkz83FRIvyYRC4hISj36unEn831yLt0WpGxaDIqJx2t1diPvp4UysuP0m0E0iLvVcpVSzZ9DQ5N_rbrmkGAr_aPpbsmpagt2e-0tKXLLl5xzteqbLp3VvNRyX2unQxRg6arr9-woAAP__3cR1-A==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyMkEFr4zAQhe_7K4Z3ShYtK-9SKDolNA41pE5qG1pIfVDtIRgcy5Xk0hL830vspKGHQo_zvqfRxxzgXmoopOEqvMmoszUtk_UdbcPHzWoexTRZRGmW3q-mdKr8HgueHm7DJKTJKz11Uv5nCuSU5vHiMynoSk5zCDSm5Fjv2UFtESAXaK0p2Dljj9FhKETlG5QUqJq288c4FyiMZagDfOVrhkKmn2tOWJds_0oIlOx1VQ9rW1vttX2feQikrW6coj8QWFa1Z6toMvt30VRKRXF2fbI9k6PumSDvBUznLyrO6x1DBb34uW7CrjWN4y-m322WfS7A5Y7HkzjT2YI31hTDN-O4Ht4NQcnOjzQYh6gZUZ_3vz4CAAD__x43j38=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM t WHERE v > 10 AND v < 50 ORDER BY v]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkEFL_DAUxO__TxHm9Bcjm1QEyamCCL1U2d2b9hCbx1LoNuElBWXpd5c24LrCih5nJvPL8A4YvKPa7inCPEOjkQjsW4rR82zlB5V7g1ES3RDGNNuNROuZYA5IXeoJBlv72tOarCNeKUg4SrbrF2zgbm_5vUyQ2AQ7RCOuIPHQ9YnYiP9lIV5Gpa5JaGWMqert7YW4q--PSStuPhM0k4Qf03FKTHZHMHqSv5-78ZyIV_p0aVlcnsUXf8GvKQY_RDrBnyOrqZEgt6N88ehHbumJfbt8k-Xj0lsMRzHlVGdRDTmaB34t6x_LxbdyM_37CAAA__9jJKj1
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkM9L40AUx-_7Vzzeqd2dpZMsCzKnVptioKY1CajUHMbkUQJpJs5MilLyv0uS1lqhosf3_TUfZofmuUCBkTf3rmKodQGzcHEDK-9-OZ_4AQymfhRHt_Mh7CO_-4CFu2sv9GCwhcea838EDh_CJJi-Kyn850NYhFMvhMsH2CbIsFQZBXJDBsUKHUwYVlqlZIzSrbTrAn72goIzzMuqtq2cMEyVJhQ7tLktCAXG8qmgkGRGesSRYUZW5kU3W-l8I_Xr2CLDqJKlEfAXGc7ywpIWMBi7R2IhhB_EF3vwg9OSHxxMGoaqtkcUY-WaUDgN-z5upLQlPXJOScfun7Pz7k_mQzKVKg2dzJ9b5k3CkLI19T9uVK1TWmqVds_056LrdUJGxvau0x9-2Vst4Mey82XZ_VROml9vAQAA__9mWsVp
 
 # Here we care about ordering by v, but v is not otherwise used.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT w FROM t WHERE v > 10 AND v < 50 ORDER BY v]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkUFL_DAUxO__TxHm9Bcjm3QRJKcKIvTSld29aQ-xeSyFblOSV1CWfndpA9YVVvT4ZjLzG8gJnXdU2iNFmGdoVBJ98DXF6MMkpQeFe4NREk3XDzzJlUTtA8GcwA23BIO9fW1pS9ZRWClIOGLbtHNtH5qjDe85Q2LX2y4acQOJx6ZlCkb8zzPxMii1JqGVMaYo93dX4r58WJxa3H46kNgMbESeyXyNapTwAy-7ItsDwehR_n77zgemsNLns3N9vbAugrK_gLYUe99FOgNdalZjJUHuQOkjoh9CTU_B1zMmnZs5NwuOIidXp6PokjUN_BrWP4azb-Fq_PcRAAD__0r3rns=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkd9Lg1AUx9_7Kw7naaMbU0cQ98nVHAlLlwoVywfTwxCc1-69rmL4v4e6tRYs6vF-f5zvB-4W1WuBHENn7txEUMsCZoF_B0vncTGfuB4Mpm4YhffzIewib31Aw8OtEzgw2MBzbRhjAtMYwsSbfikpXBpD8IOpE8D1E2xiZFiKjLxkTQr5Ek2MGVZSpKSUkK207QJu9o7cYJiXVa1bOWaYCknIt6hzXRByjJKXggJKMpIjAxlmpJO86M5WMl8n8sPWyDCsklJxuECGs7zQJDkMbOtAzDl3vehqB753WvK9gwz9WnOwLWaPMW4YilofuJROVoTcbNjf2UMhNcmReYxtm-eHrZND1n-GAlKVKBUdDZ26bDQxQ8pW1H-EErVMaSFF2s30T7_rdUJGSveu2T_csrdawO9l89ey9aMcN2efAQAA__-T88s8
 
 # The single join reader should be on node 5, and doesn't need to output v.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT w FROM t WHERE v > 40 AND v < 50 ORDER BY v]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkbFOwzAQhneeovpnV4kTunjqWoYWFTaUwcSnKlLqs2wHgaq8O4qNRIPUAKPv7vu_0_kCy4b2-kwB6gUSAhs0As5zSyGwn8p5aGfeoUqBzrohTuVGoGVPUBfELvYEhT2v2RUVBAxF3fVpbBTgIX5DIeoTQdWjuAqWy8HP-rWnI2lDvihn8XjbRgg8OW2DWhX3cl1sponDENVqK3FLL_-jf-DOftnl3O58d9b-I-2QlfVNZTVT_nLKIwXHNtCfblmOjQCZE-XvCjz4lh49t0mTn4fEpYKhEHO3zo-dza1pwWtYLsLVMlwtwuUPuBnvPgMAAP__G4vUxQ==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkcGOmzAQhu99itGcEskRBpKLT0kbqlKlkEKktko5UBhFSART26RdRbz7Coh2k5XC7h79-__ms8Zn1H9LFBh7G-_TDhpVwuco_AZ77-d2s_IDmKz9eBd_30zhUvk3FAz8-OJFHkxO8Lvh3CWY8ymsgvVTksGCTyGM1l4EH3_BKUGGlcwpSI-kUezRRoYLTBjWSmaktVRdfO5Lfv4fBWdYVHVjujhhmElFKM5oClMSCgzkTNaWgwxzMmlR9rWWoWzMM6RNeiAUbsuuBtvjg3fpn5IiSnNSFr8Zj6elQYZxnVZagDW3Z9aia4SNEbC08Z7efo_-qyyqi92-tdeqOKbqoX_DoHTvKp0b5SurjEjXstL0pl3yNmFI-YGG79KyURltlcx6zXAMe64PctJmuHWHg18NV90Dr2F7FHbGYWcU5i_gpP3wGAAA___-4PGJ
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_interleaved_join b/pkg/sql/opt/exec/execbuilder/testdata/distsql_interleaved_join
index 31a698716d5a..d0327b387acd 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_interleaved_join
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_interleaved_join
@@ -189,13 +189,13 @@ SET CLUSTER SETTING sql.distsql.interleaved_joins.enabled = true;
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM parent1 JOIN child1 USING(pid1) WHERE pid1 >= 3 AND pid1 <= 5]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMkkFr6zAQhO_vVzzm9B7dEstpL4aCryklKbkWH4S1SQSOZFZyaSn570VWoU5oQ9tTb5ZmZscf2hc4b3ip9xxQPUCBUIIwR0PoxbccgpckZePCPKEqCNb1Q8zX0caOUWFwXgwLGxAMR227pDeHhtB6YVTv1qW_9P2sPDES_BDfxjaEEPWWUZUHmlSrSfUHgxcusnSsH3nN2rDceutYZsVRE-54E5Hw7F7Lc91rYRcT-dpud1Ol3dnOJCHPAaHjTfxXq4v_N5K84ycIqyFWf2tFdUn1FdXX-IxGHdGUP6JRv5SmOE-z5tB7F_hLr16ktWGz5bxjwQ_S8r34dqzJx9WYGy8Mh5jVeT4sXJbSD07D6my4OAqr03D5rXBz-PMaAAD__y7yGHk=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMUsFu00AQvfMVq3eKYVC9Dr1YiuSKGnAVnOIUgVR8sLzT1JLrNbtrBKry78jeSDgVVMCpN8-89-b5zc497NcWMbbpOn19JQbTijfF5r24Tj9frs-yXCzOs-3V9sM6EAfKc0_oK8Odk-Jik-Wivm1aJcXHbZa_FYu-UTIQn96lReoL8WUIwyWvxDIQZ_n5vFmvxGlQgtBpxXl1xxbxNSQIEQhLlITe6Jqt1WaE7idipr4jDglN1w_Ot13jWkaModNGsWEFgmJXNe2Il_uSUGvDiH9Rc_1S9yfRAyJBD-4wtiRYV-0YcbSnmbWcWf9mcNY5Ni1X37jgSrG50E3H5iQ8csKabxzGeM1dZX4kh4WCUDS72znitwuCnwNCyzdukcgXwcqM3OkThM3gYpFISiJKXlFyij-lkUdpov9KI59omvDxNAXbXneW_-rVw_FsWO3Y35jVg6n50uh6svHlZtJNDcXWeXTpi6zz0PiDc7F8VBweieVDcfRP4nL_7GcAAAD__-nTPX0=
 
 # Swap parent1 and child1 tables.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM child1 JOIN parent1 USING(pid1) WHERE pid1 >= 3 AND pid1 <= 5]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMklFL-zAUxd__n-LPeVK8sqbDl4LQ14lsslfpQ2jutkCXlJtUFNl3lzSC3dChPvnW5JxzT3_kvsJ5w0u954DqEQqEEoQ5GkIvvuUQvCQpGxfmGVVBsK4fYr6ONnaMCoPzYljYgGA4atslvTk0hNYLo_qwLv2172fliZHgh_g-tiGEqLeMqjzQpFpNqj8ZvHCRpWP9xGvWhuXOW8cyK46acM-biIRn91pe6nZnO5PA13a7mwq9FnYxKXkOCB1v4kWtri5vJZnHTxBWQ6z-14rqkuo51Tf4ikYd0ZS_olF_lKY4T7Pm0HsX-FuvXqS1YbPlvGPBD9Lyg_h2rMnH1ZgbLwyHmNV5PixcltIPTsPqbLg4CqvTcPmjcHP49xYAAP__IiwYdw==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMUtFulEAUffcrJuep6DVlIH0h2YTGotKsbGVrNKk8EOZ2S0IZnBmMptl_NzCbyDbaqE--ce855x7OnfsA-6VDgm22zl5di9F04nW5eSdusk9X6_O8ECcX-fZ6-34diAPluSc0d22npLjc5IUYasO9k-LDNi_eiJOhVTIQH99mZeYL8XkMw5hXIg7EeXGxbDYrcRZUIPRacVHfs0VyAwlCBEKMijAY3bC12kzQw0zM1TckIaHth9H5tmtdx0gw9tooNqxAUOzqtpvwal8RGm0YyU9qoV_q4TR6RCTo0R3GVgTr6h0jifa0sJYL618MznvHpuP6K5dcKzaXuu3ZnIZHTljzrcMUr72vzffULxSEst3dLYHDdkHwc0Do-NadpPJFsDITef4EYTO6RKSS0ojSmNIz_C6NPEoT_VMa-Z-mCZ9OU7IddG_5j149nM6G1Y79jVk9moavjG5mG19uZt3cUGydR2Nf5L2Hph9ciuWT4vBILB-Lo78SV_tnPwIAAP__2mo9ew==
 
 # Select over two ranges for parent/child with split at grandchild key.
 # Also, rows with pid1 <= 30 should have 4 rows whereas pid1 > 30 should
@@ -203,7 +203,7 @@ https://cockroachdb.github.io/distsqlplan/decode.html#eJzMklFL-zAUxd__n-LPeVK8sq
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM parent1 JOIN child1 ON parent1.pid1 = child1.pid1 WHERE parent1.pid1 >= 29 AND parent1.pid1 <= 31 ORDER BY parent1.pid1]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzUUcFq6zAQvL-veOypJSqxnOZiKOiaUpKSa_FBWBtH4EhmtS4twf9eJB0Sl6S0vfVm7czs7IyP4LzBtT5ggOoFJAhYQi2gJ99gCJ7iOJNW5g2qQoB1_cBxXAtoPCFUR2DLHUIFK8dIHepX3KI2SI_eOqR5XGuQte2SyxPuGKKHPWh6V70mdBw5W9vuz5FmbzsTgbwHBHS44xslZ7cPFLnpEwRsBq7-KylUKdRCqHuhllCPAvzAp2MD6xahkqO4EuiUw5NBQjM9W8kZ1OOF1Gt_5_t5OWFfcy8n7vJXdRZ_o84LgbYYeu8CfquqInaNpsX8b4IfqMFn8k2yyc9N0qWBwcAZlfmxcglKB56L5ZfixURcfBaXP3Kux38fAQAA__8x_hkU
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzUUdFu0zAUfecrru5TywyLU_ZApEoeNIhMJRnpJEAjD1F811nK4mA7CFT131Hsoi2oQ8Abb7n3nONzz8kO7ZcWE9yk6_T1FQymhTdl8Q6u04-X6_Msh9kq21xt3q_ncKA8DYS-NtQ5DhdFlkNzq1rJoch_rp_3SnJYHoAwfXiblinMJozPQxQtaAnxyzmc56tjaLOEBZ9DUa7SEl59mjhUyLDTkvL6jiwm18iR4RlWDHujG7JWm3G986RMfsMkYqi6fnDjumLYaEOY7NAp1xImmHWOTEv1VyqplmQutOrInI7PSnK1ar3Lmm4cjh7qrjbfxeEiZFiq7e1DJMRHhuEdZNjSjZsJfjJfmpHrP5FhMbgEBGciZmLBxAsmzrDaM9SDuz_WunpLmPA9eyTQfQ5tJBmS07MFP8FqfyR1rp_p_jSesB9zjyfu_J_qjP6POo8EKsn2urP0R1VFY9cktxT-jdWDaejS6MbbhLHwOr-QZF1AeRiyzkP-wIdi_lvxYiKOfhXHf-Vc7Z_8CAAA__8HAVEc
 
 # Parent-child where pid1 <= 15 have one joined row and pid1 > 15 have no
 # joined rows (since child2 only has 15 rows up to pid1 = 15).
@@ -215,13 +215,13 @@ https://cockroachdb.github.io/distsqlplan/decode.html#eJzUUcFq6zAQvL-veOypJSqxnO
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM parent1 JOIN child2 USING(pid1) WHERE pid1 >= 12 ORDER BY pid1]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlD1rwzAQhvf-ivJOLbkSyx8ZDAWtKSUpWYsHY10Sg2MZSS4twf-92B4Sl6YfzuLN0t3j9x6BdESpFa_SA1vErxAg-CAEIIQgREgIldEZW6tN29IDS_WO2CPkZVW7djshZNow4iNc7gpGjGXp2BScvvGGU8XmSeclm7kHgmKX5kWX-MxbhzYjP6TmQ1ap4dK1Y2zy3f68ku3zQrWz9f8BoeCtu5Nidv9o2t7uE4R17eJbKUj6JEOSEckFkoaga3ca1rp0x4hFQxeETh7aKDashmNLMUPSfGO90g-6mkeD7kvp_iBdjDpOMd3j9EcJ-dMVCkYJBdMVCkcJhdMV-uVJ2rCtdGn5T7fTa683qx33z4HVtcn4xeisi-mX647rNhRb11dFv1iWXakb8BwWP8KLAex9hf1rkoNr4PAaOPoXnDQ3nwEAAP__9wcgdA==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlFFv0zAUhd_5FdZ5atlFi9N0D5EmBViATCUZ6RCgkYcovusiZXFwHASq-t9RkklbEQPWvvTN9j3H536WfNdov1XwsQwX4etL0ZlKvEmT9-Iq_HyxeBnFYnIWLS-XHxZTcSd5Pgqa3HBtpThPolgUN2WlXPFxGcVvxaQplZyKT-_CNBT9WnztHGfGp0K6IknPwlS8-jIUMhBqrTjOb7mFfwUJggvCDAQPhDkyQmN0wW2rTS9ZD4ZI_YDvEMq66Wx_nBEKbRj-Gra0FcNHVFs2FeffOeVcsTnXZc3m2AFBsc3Lakhc8LVFn1He5uZncEcFQlqubh5WRkQQxntAqPjaTgJ5ND01vXZYgpB01heBpMClwKNgTsEJsg1Bd_a-2dbmK4YvN_QI0D2HNooNq-22A3mEbPMH6li_0M3xfEv9WLq7lS53ek55uM_p7gTkHi7QbCeg2eECeTsBeYcL9I-RlHLb6Lrl__qdTv-9Wa14HAet7kzBF0YXQ8y4TQbfcKC4tWNVjpuoHkpDgw_N8q_mky2z87vZ3Sd5to_Z28c8f5I52zz7FQAA__8hjUPy
 
 # These rows are all on the same node 1 (gateway).
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM parent1 JOIN child2 USING(pid1) WHERE pid1 IN (1, 11, 21, 31) ORDER BY pid1]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyMUE1LxDAUvPsrZE6KD9ws6iEg5LoirvQqPYTmbTfQTcrLqyhL_7u0OagHwVvmIzOZnJFy4Bd_4gL7BoOWMEruuJQsC1UNu_ABuyHENE660C2hy8KwZ2jUgWGxS8oysH_nhn1gecoxsdxuQAisPg5rwzMfFEtHPHn5dKMXTmpAaGJ__Kl0xziELQg1B4SBD3rlzM31oyze9QjCflJ76Qy5Lbk7cvfkHtDOhDzp92OL-p5hzUz_H9RwGXMq_GvAX8mbuSVw6Ll-WsmTdPwquVtrKtyv91YicNGqmgp2qUpzO198BQAA___Vk4P-
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyMUE2L2zAQvfdXDHOK24FG6cfBUHDbuK2Da6d2SluCD8aaJALHciV52SX4vy-2Art7WNjbzHtP7-nNBe3_FkMs4zT-uoPBtPCtyH_CPv67TT8nGSzWSbkrf6UBXCWvvaCvDXdOwCZPMmhOqpUr-F0m2XdY9EqKAP78iIsYphkmG0EgBMFKELwTAeTFOi7gy79ZUCFhpyVn9ZkthnsUWBH2RjdsrTYTdJkFibzFcEmoun5wE1wRNtowhhd0yrWMISadY9NyfcMF15LNRquOzdslEkp2tWrnhJQPDqcMda7NXXRtg4SFOp4eM74aEnofJGz54BaReBN8MpN2HpEwH1wIkaBoRdF7ij5Q9BGrkVAP7uGz1tVHxlCM9PJCBdted5afFHjOeTlWhCyP7I9m9WAa3hrdzDF-zed3MyDZOs8KvySdp8ZqfHUfAAD__0Q3qDk=
 
 # Parent-grandchild.
 # We add the pa1 > 0 condition so a lookup join is not considered to be a better plan.
@@ -234,7 +234,7 @@ SELECT url FROM [EXPLAIN (DISTSQL)
     OR pa1 > 0
 ]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzslc-K2zAQh-99CjEnh05Zy3K2rSCgQimklKSE3lofjDWbFXglI8mlZcm7F9ndPwlJaRNIL7lFGn35yfoG5h6s07So7yiA_AocEApAEIBQAsIUKoTOu4ZCcD4dGYG5_gEyRzC262ParhAa5wnkPUQTWwIJcxvJt1R_pxXVmvxHZyz5qxwQNMXatEPiJ7qJkDLMXe1_qq72ZGO6RiqwD6aN5CXLsixTnH3r81zQjHEupZwvvryZsHeL9-yx1MwYFw-lCVuu2Db29iBWPP7jHk4cjhNih1PFb4zlDxVAWJn17fPPXPva6ubWtDq99vgygNDSTcwUfzmZ-QQMPwFh2UfJFEdVoCpRTVFdo3oN1QbB9fHJQIj1mkDyDR6w9CSnt85r8qS3bFSbPR4X7pXrrqY7B_dHF1vR_KgG4ZcGOWuDFEdZKi6WzmpJHGVJXCyd1VJ5lKXyYum_jcQ9llYUOmcD_dXEy9PIJL2mcb4G1_uGPnvXDDHjcjlww4amEMcqHxdzO5SGCz6H-R_h6y0434WLU5LFKXB5Cjz9J7javPgVAAD__z6yII8=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzsldFv0zAQxt_5K6x7SsBocdwOFqlSJtZBppKOtAikkYcovnWRsjg4DgJV_d9RnXZLqxRBK5WXvtW-78vV3--km0P1PQcPJsPR8N2U1Con19H4I7kbfr0dXQYhsa6CyXTyaWSTleRlIygThYVm5GYchGSmkkKkD1kuXPJ5EoTviVVmgtnky4dhNCSWZZkz-VY7DscBYcwml-EVad2mA8K4bZNxRLbFF11il9mdat75ac7X6jJZa4ljx0ChkALD5BEr8O6AAQUXKHCg0AMKfYgplEqmWFVSLSVzYwjET_AcCllR1np5HVNIpULw5qAznSN4EBQaVY7JD4wwEahuZFagOnOAgkCdZLnpOMJ7Dcse2WOifvmrWIGaArnOco3KMwn67fw8zwvC6dvVW_12iOvSKp227WKnzX36YoeP727H-ZbPd5_iXVeAQpTNHtrPbA0MUGiSAQo53mvLZ6_sgVoazE-gMK61R3xGfZf6Per3qX9O_TcQLyjIWj8TqHQyQ_DYgu6g9AynLqQSqFBs0IgXHRxD-VqWZ_0tYXdrd6M122tA2GlAjjog7l6U3BOlo1Lie1HiJ0pHpdTbi1LvROm_rcQOShFWpSwq_KuN5yxXJooZNvu1krVK8VbJ1LRpjmPjMxcCK91UWXMIClMyf7BtZn80n2-YnW2ze0hnfoi5d4i5_0_mePHidwAAAP__aOtjjw==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL)
@@ -245,7 +245,7 @@ SELECT url FROM [EXPLAIN (DISTSQL)
     OR pa1 > 0
 ]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzslU2L2zAQhu_9FWJODp2yluX0QxBQoRRSSlJCb60PxprNCrySkeTSsuS_F9vNbhKS0iaQvfgW6dWTV8kjmAewTtOivKcA8htwQMgAQQBCDghTKBAa7yoKwfnuyADM9U-QKYKxTRu77QKhcp5APkA0sSaQMLeRfE3lD1pRqcl_csaSv0kBQVMsTd03fqbbCF2HuS_9L7X2pdXVnal1d42VWd_tpk3pyUa-TdhHU0fykiVJkijOvrdpKmjGOJdSzhdf307Y-8UH9hhVM8bFNpqw5YrtY-9OYtnjNx7hxOk6IQ44lf3BWLpNAGH4awChptuYKP5yMvPdD-w_AsKyjZIpjipDJVDlqKao3kCxQXBtfFIQYrkmkHyDJzQ92Wmt85o86T0dxeaIyIV75Zqb6cHB49XZXjU_64Xw8YVc94VkZ2nKRk3X1STO0iRGTdfVlJ-lKR81Pd9YPKJpRaFxNtA_Tb20G5uk1zTM2OBaX9EX76q-Zlgue67f0BTikPJhMbd91F9wF-Z_hV_vwekhnF3SLC6B80vg6X_BxebF7wAAAP__2ZQivw==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzslVFv0zAUhd_5FdZ9SsBocdwCi1TJE-sgU0lHWgTSyEMU33WRsjg4DgJV_e-oSbulVYqglbqXvtW-5_g057PkOZQ_MvBgMhwN309JpTNyFY4_kdvht5vRhR8Q69KfTCefRzZZSV42gpmOc5ncp5l0yfXYD0gRa8wNI18mfvCBWEUqmU2-fhyGQ2JZVr0m3yvH4TggjNnkIrgkrd1kQBi3bTIOybb4vEvsMrtTzTuP5nytLuK1ljh2BBRyJTGIH7AE7xYYUHCBAgcKPaDQh4hCoVWCZan0UjKvDb78BZ5DIc2Lyiy3IwqJ0gjeHExqMgQP_NygzjD-iSHGEvW1SnPUZw5QkGjiNKsTR3hnYJmRPsT6t2jVChTCdHbfnq46Xk_IVZoZ1F5dsGjX63meH0zfraoQ7Y7Xo1V5bdv5Tpv7eGKHj--O43zLJ9zH9tcToNBUAxQyvDOWYK_sgV5-YP0TKIwr4xHBqHCp4FT0qOhT8RaiBQVVmScEpYlnCB5b0B2YnuhUudISNcoNHNGiA2SgXqvirL8l7I52N6LZXjeEnW7IcW-Iuxcm94TpuJj4Xpj4CdNxMfX2wtQ7YXq-Z7EDU4hlofIS_-nVc5bPJsoZNm9sqSqd4I1WSR3TLMe1r96QWJpmypqFn9ej-g-2zeyv5jcbZmfb7B6SzA8x9w4x9__LHC1e_AkAAP__Vhplvw==
 
 query TTT
 EXPLAIN SELECT * FROM grandchild2 JOIN parent1 USING(pid1) WHERE
@@ -285,7 +285,7 @@ SELECT url FROM [EXPLAIN (DISTSQL)
     OR gcid2 >= 49 AND gcid2 <= 51
 ]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzslU2L2zAQhu_9FWJODpmylizvhyCgQimklKSE3lofjDWbNXitIMmlZcl_L7ZZ7zqkpU0gvfhovXp4JT-CeYLaGlrlj-RBfQUOCAIQEkCQgJBChrBztiDvrWu39MDS_AAVI5T1rgntcoZQWEegniCUoSJQsKwDuYry77Sh3JD7aMua3FUMCIZCXlZd4ye6D9B2lI-5-6mLh7Iy7Qk25fbhdbB1eW3GKftQVoGcYlEUac6-NXGc0IKlSqnl6svtjL1bvWdDUizYzXMyY-sNiyItBoiLA0oMFJcD9szJgZN3B5wcuJQPHCD0tweEiu5DpPkctZijTuazhWsvM1oChHUTFNMctUCdoJaoU9TXqG9Q36K-g2yPYJvw8vt9yLcEiu_xN4pezDS1dYYcmZGKbH9E4sq-tbur9GDj8WoxquYnvQ4-vY7LvQ5xkiIxKbqcouQkRcmk6HKK5EmK5KTo_4zBI4o25He29vRXUy5uxySZLfUz1dvGFfTZ2aKr6T_XHdctGPKhT3n_say7qDvga5j_Eb4ewfEhLM5pTs6B5Tlw-k9wtn_zKwAA__9OgRn6
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzslU9r20wQxu_vp1jmZL2ZNl5Jzh-BYUPjUAVXTp1AC6kOQjtRBIrWXa1KS_B3L5KsWHLc0jqQXnyzZp6fZ_d5FuYRiq8ZeHA9mU7e3bBSZ-xiPvvAbiefr6ZnfsAG5_71zfXHqcVWkv8bQXyfZtJmlzM_YImOcrkqzAI2GDS_3y5Sydm4265LFjsLzlkrilNpb4iqkvVM5TxXORb79H4yn7BBf-aXcjh0aMxG_T9Z9-IxO7YsNpuvD1ufowW5veWQLcldq2WTHuWerqikpx9xywoBIVeSguiBCvBugQOCDQgOILiAMIIQYaFVTEWhdCV5rAFffgdviJDmi9JU5RAhVprAewSTmozAAz83pDOKvtGcIkn6UqU56cMhIEgyUZrVE6d0Z6CakT5E-odobgYI8zS57zY6HrdddpFmhrRX-Sw69nqe5wc3J6tbi465bWflk-hau0F1jX3CWs7tmLvBuR2DnzhAaG4PCBndmYHgByjsAxTOgTXW1WV6JUCYlcZjgqOwUTgoXBQjFEcojlGcoDiFcImgSrO2vzBRQuDxJf4ionUyZa60JE2yF0W43BJioN6oxeFoQ7h9tN0bzXd6HXz_Ol7vddg7RWTvI3q9iJydInL2Eb1eRO5OEbn7iP7NGtwS0ZyKhcoL-qMtN6zWJMmEmp1aqFLHdKVVXI9pPmc1VxckFabp8ubDz-tWfcAuzH8LH_Xg4SZsv2Sy8xLYfQk8-is4XP73MwAA__8gC4Cq
 
 query TTT
 EXPLAIN
@@ -320,7 +320,7 @@ SELECT url FROM [EXPLAIN (DISTSQL)
     pid1 >= 10 AND pid1 <= 39
 ]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlVGrmzAUx9_3KS7n6V4WuEZtbysM3GPHto6OPQ0fgjm1gk0kiWOj-N1HlLVa2jisL74lOefv75z_CeYEQnL8yo6oIfoJFAj4QCAAAiEQWEBCoFQyRa2lsimtYMN_Q-QRyEVZGXucEEilQohOYHJTIESwEQZVgewX7pBxVJ9kLlC9WgRHw_KiIX7GvQHLyI9M_YlLplAYm2MDT9vKRE-x3e7y7NBNTA95wc-Bf4kkttW3JCBQ4N48x_T9ywdls5olEDgnB5DUBGRlLl1owzKEiNbk_zv9mGUKM2akel32u_v-48tzTC2zWfkvd4H-XeCFUwmpOCrkPUhSu0ui3tiagl5NdNS4_RmOe6DTjrdv04zbH2VtMENrBzrtWLuaxtpglLXhDK0d6LRj7Xoaa8NR1noztHag0461i-n__zeAO9SlFBqv3oHbX_bs-4A8w_Yx0bJSKX5TMm0w7Xbb6JoDjtq0UdpuNqIN2QK7YuoU-z0xvRb7bvIAOnCqQ7c4fKTuhVO8dJOXj5DfnOKVm7x6hLx2z8obuCbuS3bNTup3fwMAAP__hy1jzg==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlVFv2j4Uxd__n8K6T0R_q40ToBAJCbSyLRWFDlptUpeHKLlNI4WYOc60CfHdJ8d0Dah1JuCFt9j3nvzuOY7iNRQ_MvBgMZ6MP9yTUmTk43x2Sx7H3-4mI39KWtf-4n7xZWKRbUtRLlurUGAu2cUqjZlFq63oOc1idhGpHf2KbRO5mflTosvkYeFPP5FWpSNfP4_nY70g30vbdnFAmG2R0fS6vhsNiNu3AqCQ8xin4RIL8B6BAQUHKLhAoQ0UOhBQWAkeYVFwoVrWlcCPf4FnU0jzVSnVdkAh4gLBW4NMZYbggZ9LFBmGP3GOYYzihqc5ikuFiFGGaVYRJ_gkQTHSZSh-D7f-gFYFMiulR4ZqOU-T53qj9v5SeGmkQzW9JgGFDJ9ka8j-twZCdVWPQOFvswvBhgIv5auLQoYJgsc29N-djpJEYBJKLi67u-4WD7etIVPM6smx3gU67wJfOWXORYwC4x1IsDGPxOxDZ3J3ZmIHHbdzhsfd4LSW7dVpjts5KFr3DKNtcFqLtneaaN2Dom2fYbQNTmvR9k8TbfugaO0zjLbBaS3azun__28A51iseF7g3j3w9pttdT9gnKC-TApeigjvBI8qjF7OKl21EWMhdZXphZ_rkhqwLmZGsbMjZvtix0xuQLtGddssbh8zd8co7prJ3WPIV0Zxz0zuHUPum8_KbvhMzB_ZPjvY_PcnAAD__4AGlMA=
 
 ###############
 # Outer joins #
@@ -391,22 +391,22 @@ NULL       /0       {5}       5
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM outer_p1 FULL OUTER JOIN outer_c1 USING (pid1)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzclE2L2zAQhu_9FWJOu3TK-nMPhoLKkoIXExd3cyqmGGuSGhzJSHJpCP7vRfYhTZp-rHPzzdLomdfPHOYIUglaV3sykHwBHxACQAgBIQKEGEqETquajFHaPZmAVPyAxENoZNdbd10i1EoTJEewjW0JEkilJd1S9Z0KqgTpZ9VI0g8uQpCtmnZMzGhrwWU0-0ofuOot6a-de1Q0u2-_l2pXmloBwsuho4R93GQZyzcvq4I95-kaEFra2jvuv71_r12X8dO1JClIJ-wp_5CtPj-t7riPPLxHxgNkPELGY2T8EcoBQfX25GZstSNI_AH_4H_S7qXSgjSJM89yuDKhtXqnuof44uH16OAs2p81-mAxow9m-YeL8Q9n-UeL8Y9m-XuL8f_H6i3IdEoa-q_N4rnVRGJH0x4zqtc1fdKqHmOmYz5y44UgY6eqPx1SOZbGH_wV9v8KP57B3iUc3JIc3gJHt8Dxq-ByePMzAAD__9hCYKA=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzclM9q20AQxu99imVOdjslXknOQVBQcJWioEqpZEMhiCK0E1egaNXdVWkwfveiVUrqNP1n33TbnZlvvvnNYXagvzTgQx7G4WrNetWwyyx9z27Cj9fxRZSw2dsoX-cf4jl7KHk5FsjekPrUcXa5iWN2lUbJQ6jibJNHyTs262rB5wUgtFJQUt6RBv8GOCA4gOACggcISygQOiUr0lqqoWRnBZH4Bv4CoW673gzhAqGSisDfgalNQ-BD1BpSDZVfKaNSkLqSdUvqbLAQZMq6sY4x3RoYPOq7Ut0HPyYHhKzefv41VQ2psRUgrO878kfKdLMOM8sKCA3dmlnAX83fqKGLfQ4tqRWkfLZKL-IwX4WzgGPgzpEFDrLAQxYskQXnUOwRZG8e2bQptwQ-3-Nv-B-x-1YqQYrEAWexf2ZDiXwtu7Plk8LnrZ0Da37U6p3JrN45it-dDL97FL83GX7vKP7FZPj_cnoz0p1sNf3TZVkMp4nElsY7pmWvKrpWsrI24ze1OhsQpM2Y5eMnam3KDvizmP9RfH4gXjwVO6c4u6eIvVPEy_8SF_sX3wMAAP__E6R9Gg==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM outer_gc1 FULL OUTER JOIN outer_c1 USING (pid1, cid1, cid2)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzklU2LnEAQhu_5FVKnHabC-rlJhECHZQIuMgazewoSxK41gtst3W3IsvjfQ-thxsnkyzl67Kp6-pWnoXwBITntyyfSEH8BDxB8QAgAIQSECAqETsmKtJbKjkxAwn9A7CI0ouuNLRcIlVQE8QuYxrQEMSTCkGqp_E45lZzUnWwEqWsbwcmUTTsmpvRowGY0T6V6ZrI3pL7WlZ3Km_rbr72xNd0FCPfPHcXOx4c0dbKH-13u3GXJHhBaejRXzNsi87fIgu3mvbK3zUo2ggQnFTu32Yd09_l2d8U8ZDcbPCr4yN7MCgGytxt0WIgOi9Bh76AYEGRvDiq0KWuC2BvwN7oOlnohFSdFfKalGM4I3cvXsruOTgbPR_uzaG_RS_lrfSl_ka5grbqCRbrCteoKF-ly16rrL3-ZnHQnhaZ_2oquXavEa5p2sJa9quiTktUYMx2zkRsLnLSZut50SMTYGj_wGPb-CN_MYPcU9i9JDi6Bw0vg6L_gYnj1MwAA___oe5X8
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzklU9r20AQxe_9FMuc7HpKvJKctoLCBlcpCqqUSjYUgihCO3EFilZdrUqD8XcvktImStN_9tEXw76Zt8_zWxhtoflSgguJF3jLFWt1yc7j6D278j5eBmd-yCZv_WSVfAim7K7l-dCgWkP60ybn7HwdBOwi8sM7LedsnfjhOzapC8mR5T9-rWkKCJWSFGY31IB7BRwQLECwAcEBhAWkCLVWOTWN0l3Ltjf48hu4c4SiqlvTySlCrjSBuwVTmJLABb8ypEvKvlJMmSR9oYqK9EkXIclkRdknBnRtoMsobjJ9K36OAQhxsfn8a60vDXcBwuq2JncYOVqvvLgfHBBKujYTwWcorBkKezZ9o7vbRlIXQZUk7bJldBZ4ydKbCI7idIoPBAvFy5Fgo3g1RSYcZGKBTLyGdIegWnOPojHZhsDlO_wNrntKbaW0JE1yhCXdPQE0VC9UfbJ41Ph0tDWK5nu9lHWsL2Xthcs-Vlz2XricY8Xl7IVrfqy4_vKViampVdXQP23FebdWSW5o2MGNanVOl1rlfcxwjHpfL0hqzFDlw8Gv-lL_Bx-a-R_NpyPz_LHZOiTZPsTsHGJe_Jc53T37HgAA__8UBrYr
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM outer_c1 LEFT OUTER JOIN outer_p1 USING (pid1) WHERE pid1 >= 0 AND pid1 < 40]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlE-Lo0AQxe_7KeSddtlaYqu7B2HBSwYMIQ6SOQ0yiF3JCMaW7naYEPzug3rIJJP5l5xys_v1q1e_gnKHWkle5Bs2CO8hQPBA8EEIkBEarQo2RuleHh_H8hmhSyjrprX9dUYolGaEO9jSVowQcW1ZV5w_ccq5ZD1TZc164oIg2eZlNaTNeWXRZ5SbXG8j1VrWD0XfQ1quH99KTS-NpUBYbhsOnfn0Zukkd8tp6sySeAFCxSv7MxK_f_3XfZXhE4SktaETCYo8inyKAor-IesIqrV7DmPzNSMUHb3Dukdsa6Ula5YHTFl3YhoL9Uc1k-Do4elo7yBanDVmcZVj9s5i9a6S1T-L1b9K1k9-FSmbRtWGv7Qdbr9eLNc87qJRrS74VqtiiBmPyeAbLiQbO6piPMT1IA0NvjaLD81_D8zusdm7JNm_xBx8y5x1P14CAAD___ca6HA=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzUVF1vlEAUffdXTM7TomPKAPpA0oTGUqVBqCyNJpUYArcrCWVwGIzNZv-7Yahpt9aPbp_2jXvPPfdwTnJnjeFbCx_LMA7f5GxULTvJ0vfsIvx0Fh9FCVscR8t8-SG22M3I83lAjprUl0qwODzJ2WkaJTetXrDzZZS8ZYu-qYXFPr4Ls3Au2OfRtl06ZLbFjpLju82KebZVgKOTNSXlFQ3wLyDA4YDDBYeHgqNXsqJhkGqC12Y4qn_Atzmarh_11C44KqkI_hq60S3BR9RpUi2V3ymjsiZ1KpuO1IENjpp02bRGLaZLjUmjuSrVdfDLITiyZvX1d6ifoHkVOPLrnvw5jfQ8DzOTCThautSLQLywDtW0xXyCIx21zwLBA4cHLg88HrxGseGQo771MehyRfDFhv_B663FsZOqJkX1lqdi80AaiXwp-wPv3uDD0s6WtNgpZrGXMTs7eXX20qu7k1d3L73-46nIaOhlN9B_XYc9nRfVK5pvcZCjquhMycrIzGVqeKZR06BnVMxF1BnI_OBdsvgr-dUW2b5Pdp6i7D6F7D2KXGye_QwAAP__qyUQHg==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM outer_p1 RIGHT OUTER JOIN outer_gc1 USING (pid1) WHERE pid1 >= 1 AND pid1 <= 20]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlE9r20AQxe_9FOKdWjrF-ucWBIW9lFamWEW4pyCC0I4VgawVu6sQY_Tdg6SDY8f5Z5980-7bN29-A6MdGiV5mW_YILqBB4IPQgBCiIzQalWwMUoP8vQ4lg-IXELVtJ0drjNCoTQj2sFWtmZEiBvLuub8nlPOJeuFqhrWMxcEyTav6jHtL68thoxqk-utUJ1lfdsOPaRVefdcKotBm2qBsNq2HDlp_PvPykn-r36lziKJlyDUvLafhff1y0891Bk_QUg6GzkiIOGTCEnMSXwn8QNZT1Cd3cMYm5eMyOvpBeA9Z9coLVmzPADL-hMjWapvqp2FRw9PR_sH0d5Zs_aud9b-WcD-9QIHZwEH1wv8xu8jZdOqxvC7lsUdto1lydNqGtXpgv9pVYwx0zEZfeOFZGMn1ZsOcTNKY4NPzd6r5vmB2T02-5ckB5eYww-Zs_7TYwAAAP__Vjbt9A==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzUVO9rnEAQ_d6_YplPsZ0SVy8tCAeGxiaGq6aeoYVUirgTKxjX7q6l4bj_vbheSS5Nf10-3Tdn3rx5vgezK9BfWwhgGS2iNzkbVMveZuk7dhV9vFgcxwk7OImX-fL9wmGbkefTgBwMqc89Z1l8epaz8zRONr264uxyGSen7KBvBHfYh7Moi6aCfRpc16c54w47Tk7uN6s581ynAIROCkrKG9IQXAEHBA8QfECYQYHQK1mR1lKN8MoOx-I7BC5C0_WDGdsFQiUVQbAC05iWIIC4M6RaKr9RRqUgdS6bjtShCwiCTNm0Vm1B1wZGjeamVLfhT5OAkDX1l1-huhqxaRcg5Lc9BZtE0ss8ymwugNDStTkI-QtnrsY99hMQ0sEELPQx9DCcYXiE4SsMX0OxRpCDuTOjTVkTBHyNvzF853PopBKkSGwZK9aPRJLIl7I_nD0YfFza25LmO2XN9zdrbyfD3v4a9ncy7O-v4b88HxnpXnaa_ulY3PHaSNQ0naaWg6roQsnKykxlanm2IUibCeVTEXcWsj94n8z_SD7aIrsPyd5TlP2nkGf_RS7Wz34EAAD__3H4Fpg=
 
 ########################
 # Non-interleaved joins #
@@ -417,31 +417,31 @@ https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlE9r20AQxe_9FOKdWjrF-u
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM child1 JOIN child2 USING(pid1)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll9vmzwUxu_fTxGd92ZTjYzNnyZIk7jtpLVTt7uJCxq8BCnFyBBpVZXvPhG6tSXgY8-CO5Lwy_Hj87t4nqGShbjNH0UDyQ9gQIADgQAIhEAggoxAreRWNI1U3Ss9cFP8gsQnUFb1se2-zghspRKQPENbtgcBCXzPHw7iXuSFUNQHAoVo8_JwHlOr8jFXT-l2Xx6Kbua3Oq-aZOVRTv-nUUwZDXn_vKaM8lVeFatgJdu9UA1kJwLy2L5Mfh348LTa583-_aiUQXbKCDRtvhOQsBP5twSRJgFfMgGfTPD6P1IVQoli-D9X3WCjt0Yu44tQO_FZlpVQlA32eRA_2w8pu_r4SZW7ff8IBO6ObbJKGUk5SQOSRiSNSXo9SP-aLDBIdqzGTj164FvpyZqyaPDm-Ozw3Wxm7gUzM3tCC4-G3XPUfR_OZblFmtjM8mXT8Mk0CxrP5jeem--JG1r3Zh8ejf8uLe6fu6XFc1lnkeba0LpF0_DJNAtax-e3LjDfU2Bo3fhqPLqeyzWLDGtD1xbIwCczLGhYML9hofl2QkPD1h5l_p8NRf7Lh25FzJ9LMosYG0PJlonBJ2Ms6Fm4bGMcOc69aGpZNcKoD_pdIFHsRH9NjTyqrfiq5PY8pv94d-bOjaQQTdv_yvsPN1X_U3dAczh2gTcuMHM6N4v0NLO4Mm4Hxy7wxgVmTuceXNkFzYe0_5YO9PcdaGH2_s78IR26CK6HEcH1MCK4HsYER2hE8MhFcD2MCK6HEcH1MCY4QiOCxy6CX7soqocRRfUwoqgexhRFaETRtYuiehhRVA8jiuphTFGERhTduCjKnHoCQiOSIjRiKUJjmmI41hXcyoJbW3CrC459wa0wMKfGwC4qg5WtehqzVU9jtupp1FYEx2y1KUuXO7NpS7Y0ZqtVX7LGMVsvyoPW1uz03-8AAAD__6i7nUQ=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lk1v2zgQhu_7K4jZS7KhQZH6iC1gAS22aeEgsdM4BQoEPigWawtwJJeSgQaB_3shK20Sf3CoEtKNkvho-HKewzxD8X0JIUwuri7-vyNrtSQfb8fX5P7i683Vf8MROfkwnNxNPl-dkpct_9QbZot0mXByOR6O6rUgXybD0SdyskoTfjoFClmeyFH8KAsI74EDBQEUXKDgAQUfphRWKp_JoshVteV5CwyTHxA6FNJstS6r11MKs1xJCJ-hTMulhBDu4oelvJVxIhVzgEIiyzhdbsusVPoYq6eoPh5QmKzirAhJjwn2N_MDxpkn6nWfcSZInCXEJXm5kKqA6YZCvi5fKr8WfHgii7hYvC8VcZhuphSKMp5LCPmG_lkCX5NAdJlAHE3w-p9cJVLJZPc_Z1Vho10HLuNaqrm8zNNMKsZ3-rmU38qTiJ-d_qvS-aJeAoXxugxJxGkkaOTSyKdRQKPznfSvyVyDZOvs0KkPHniU9_IV4_7OzsO1vXe1ubkX3MzsI1r0mFet_eq915blDdIEZpZ3m0YcTdOh8bx944V5n4ShdW_60WPB76YF9bpqWtCWdQ3SnBta12kacTRNh9aJ9q1zzfvkGlp3uDU91m_LtQYZ-oaudZBBHM3QoWFu-4Z55t3xDA3r9xh3fnXId14eqhZxpy3JGsQYGErWTQxxNEaHnnndTowHjnMri1WeFdJoHnSqQDKZy_qainytZvJG5bNtmfpxvOW2E0kii7L-KuqHYVZ_qg5oDgc28MAG5lbn5r6e5g2uTDSDAxt4YANzq3PvXNkeLXZp5y3t6u_b1cL8_Z05u7RnI7geRgTXw4jgehgTHKERwX0bwfUwIrgeRgTXw5jgCI0IHtgIfm6jqB5GFNXDiKJ6GFMUoRFF-zaK6mFEUT2MKKqHMUURGlF0YKMot5oTEBqRFKERSxEa0xTDsVnBbliwmxbsxgXLecFuYOBWEwPfGxka2aqnMVv1NGarnkZtRXDM1ibD0n7PmkxLTWnM1kbzUmMcs3VveNDaOt389TMAAP__xGu2hQ==
 
 # Join on non-interleaved tables (with key) uses merge joiner.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM parent1 JOIN parent2 ON pid1=pid2]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lV9r2zAUxd_3Kczdy0ZlZMl_6hoGfu1g7ej2NvzgxneJIbWM7MBKyXcfjrslMYmugnDepFg_XZ1zLrlv0KgKH8oX7CD7BQIYSGAQAoMIGMRQMGi1WmDXKT0cGYH76g9kAYO6aTf98HPBYKE0QvYGfd2vETL4WT6v8QnLCjUPgEGFfVmvd2VaXb-U-jVvS41NPxT90ZZNl3k-l_wjjxMueCTHdcoFl17ZVF7oqX6FuoNiy0Bt-vfS-4rPr96q7FbHtXIBxbZg0PXlEiETW3ZGwv4epSvUWE3vuRkK709tmlPndrWmVnxDvcSvqm5Q8-T42jX-7j_l4ubzF10vV-MSGDxu-szLBcsly0OWRxPNez2hhZ4LXvqgfNVyISYnT9eOjmoL-3YQlu1wpht8Hg3rePg9mqs1xPVb43bO1pD28UjbeA5i8HnyP6tkXA9ZJXPFI68fTzpnPKF9PKFtPKcT8Xk6Vyjh9UO5mzOUyD6UyDaU1Oci-BdMHLxvhmREMFcuF-iITTrkwaR2ep48-7wrtY0IrjWGTzzkCbtWNR1aDdlgkILVEkd3OrXRC_yu1WJXZtw-7rjdzKqw68ev75v7Zvw0PNAejlzgxAVOXWBBiBZTOjikpRmWRlgc08GUDl3CMsNEWGaYCMsME2ERmgnRkUtYsYvdZpiw2wwTdpthwm5CMyE6cbH71sVuM0zYbYYJu80wYTehmRCduth952K3GSbsNsOE3WaYsJvQTP3zXzIs5YV05EQnTnTqRAtK-GUTs9h--BsAAP__Ppb2Og==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lVFr2z4Uxd__n0Lc_0u7KsiSHdc1FDy2DlLapGv6MCh-cOO7xJBanuzASsl3H46zpQmJ5CCcp0i2fr4651xy36H8NYcQxjd3N1-eyELNybfH0T15vvnxcPd5MCRnXwfjp_H3u3OyPvKpOVAkCvOKk9vRYLjeCDIakiJLObmuf0QMFHKZ4jB5xRLCZ-BAQQAFFyh4QKEPMYVCyQmWpVT1kfcVMEh_Q-hQyPJiUdWPYwoTqRDCd6iyao4QwlPyMsdHTFJUzAEKKVZJNl-VKVT2mqi3aH1FoDAukrwMSY8J9j_r-4wzTzTrgHEmSJKnxCWymqEqIV5SkItqXXpT8eWNzJJytl0r4hAvYwpllUwRQr6kByRsviNVigrT3e9c1IU3pxb5vnOrWrtW3KOa4q3MclTM3_7sHH9WZxG_OL9W2XTWLIHCaFGFJOI0EjRyaeTtaN7ocVvoOeKmQ9mTBeN85-T-2t5Wbd6-HXjLdjjQDT3m1et-_dzrqjX46VvjssvWEO3jEW3j-RBDj_n_svKbdZ2V31U84vTxBF3G47aPx20bz_5EeizoKhT39KFcdRmK1z4Ur20oQY9x528wfWe9qZPhTle5HKGjr9MhPkxqq-uJg9c7Udtw51RjeM9FHrEsZF5iqyHr1FIwnWLjTikXaoIPSk5WZZrtaMWtZlaKZdW8XW8GefOqvmB72LOBfRs4sIG5QTTfpZ2PtNDDQgvzbdrZpV2bsPSwISw9bAhLDxvCMmg2iPZswurb2K2HDXbrYYPdethgt0GzQbRvY_eljd162GC3HjbYrYcNdhs0G0QHNnZf2dithw1262GD3XrYYLdBs-mf_5hhKY6kPSvat6IDK5qbhB83MePlf38CAAD___svEUg=
 
 # Join on non-interleaved column uses hash joiner.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM parent1 JOIN child1 ON pa1 = ca1]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lr1u2zwUhvfvKozzLQlAgyL1E1tAAY1Nh6RIuxUaFIuNBTiiQNFAg8D3XshK69hWeMgS9CbZfnz48jzD-wqtrMVd9Sx6yH8AAwIcCMRAIAECKZQEOiVXou-lGn4yArf1L8gjAk3bbfXwcUlgJZWA_BV0ozcCcvhePW7Eg6hqoWgEBGqhq2azH9Op5rlSL0VXKdHqYei3rmr7fDannP5P04wymvDxeUEZ5bOqrWfxTOq1UD2UOwJyq99GHyY-vszWVb8-nlVwKHclgV5XTwJytiP_FiGdjrBaN5s6cIL4KAH_MMHhf7atVLVQoj76p3IgsZ9MXMPnql9_kU0rFGUnm9yIn_qq4NefVPO01ldFfA0E7rc6nxWMFJwUMSkSUqQniQ9pYo80E0e9k3PZUZae5p6cnRzNZvYuMEudP3BhTpPhOR0-T0Kp7RAns1M7dBqT5uzCmrOgmnP73XBb1d4tYU6zv5vKxudhU1ko1Rzi3FiqFjiNSTV-YdV4UNVi-93EtqpN72NOF6EEcwixsBQsSAaTVvGFtYqDapXYbySx1Woxpyz6s5Y0ensZ9sKiUGY55FhamhUqhkmu5MJyJRdrgRMHeRB9J9teWHW8aIgi6icxXk0vt2olviq52o8ZX-_33L5k1KLX47d8fLltx6-GA9rDmQ-89IGZ17lZaqaZw5VxNzjzgZc-MPM698mVndH8lI7e07H5vmMjzI7vLDqlEx_BzTAiuBlGBDfDmOAIjQie-ghuhhHBzTAiuBnGBEdoRPDMR_AbH0XNMKKoGUYUNcOYogiNKLrwUdQMI4qaYURRM4wpitCIoksfRZlXT0BoRFKERixFaExTDMe6gl9Z8GsLfnXBsy_4FQbm1RjYWWVwstVMY7aaacxWM43aiuCYrS5l6XxnLm3JlcZsdepLzjhm61l5MNpa7v77HQAA___JMpkW
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll1r2zAUhu_3K8TZTTsUZMkfTQwFj61jKV3SNb0YFF-4sdYEUtuTHVgp-e_DcbY2H9WRJ5w7O9Fj6dV5Lt5nKH8tIITJxdXFp1uyVAvy5Wb8jdxd_Li--jgckZPPw8nt5PvVKdks-dAsKBIls4qTy_FwRKaz-SLlZDwiRcLJOZkmPAYKWZ7KUfIoSwjvgAMFARRcoOABBR9iCoXKp7Isc1UveV4Dw_Q3hA6FeVYsq_rnmMI0VxLCZ6jm1UJCCLfJ_ULeyCSVijlAIZVVMl-stynU_DFRT9HmfEBhUiRZGZIeE-w98wPGmSea5z7jTJAkS4lL8momVQnxikK-rDZbv-x4_0RmSTnb3isSEK9iCmWVPEgI-Yr-XwT_cITmVrtN4G4lEG8mePnOMstVKpVMt74U1yS25MA1fE3K2WU-z6RifGeSC_mzOonE6bmaP8yqk8g9BQrjZRWSiNNI0MilkUcjfyfxSxrXIs2Bo47yXl4w7u_mPri3t7U3N3eBG-r8hgs95tXPfv2715XaLeIEZmp3nUanOT-y5rxTzYX5bISpaq-G0GPBv0kFzXM9qaAr1VrEOTNUreM0OtXEkVUTnarmms_GNVXt8Dx6rN-VYC1C9A0F6ySDTiv3yFq5nWrlmU_EM9Wq32Pc-TsW39m81HPhTldmtcgxMDSrqxg6ubwjy-UdrQUeOMiNLIs8K6VRx3PqKDJ9kM3VlPlSTeW1yqfrbZrX8Zpbl4xUllXzr2hehlnzV31AcziwgQc2MLc6N_f1NG9xZaIdHNjAAxuYW51758r2aLFLO69pV3_frhbm23fm7NKejeB6GBFcDyOC62FMcIRGBPdtBNfDiOB6GBFcD2OCIzQieGAj-JmNonoYUVQPI4rqYUxRhEYU7dsoqocRRfUwoqgexhRFaETRgY2i3KonIDQiKUIjliI0pimGY13BrizYtQW7umDZF-wKA7dqDHyvMrSyVU9jtuppzFY9jdqK4JitbcrS_szatKW2NGZrq77UGsds3SsPWlvj1bs_AQAA___1lbKo
 
 # Prefix join on interleaved columns uses merge joiner.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM child2 JOIN grandchild2 USING(pid1, cid2)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll9r2zwUh-_fTxHOe7NRBVnynyaGgW87WDu63Y1cuLGWGFLLyA6slHz34bhbGsfWkSZi31mJHx_9dB7BeYVCZuI-fRYVxD-AAQEOBHwgEACBEFYESiXXoqqkal5pgbvsF8Qegbwo93Xz84rAWioB8SvUeb0TEMP39GknHkWaCUU9IJCJOs13xzKlyp9T9ZKst_kua-p9K9Oiimdzyun_NIwoowFvnxeUUT5Li2zmz2S9FaqC1YGA3NdvlU8Fn15m27TanpdKGEk4rA4rAlWdbgTE7ED-LUTYH2Kj0iKbJAkfTHL6lFSZUCLrfuqGJPymqW_8Zs_hfBFqIz7LvBCKsk6Ld-Jn_eGN_vhJ5ZvtaQkEHvZ1PDsmIolPkoAktyRZkGTZOZNTWN8g7L7oC9G793s5lyVlYefN_trBWW1mrgwz835AljkNmuew-T244h2wCBRZ3IHRU_HBVBPcBzbqfeDmLeSGTr7r0pxGf1sZtc9NK6MrOmkR6NbGybFT8cFUEzjJR3XSN2-hb-hkf8PmdHFFEy1iLGxMHCcLH8wygX_-qP4F5o0LDP1bzCnz_vQt9N4WTeOYd0UFLZIsbRQcLQ4fjDOBhcFkk2rPzh5FVcqiEkZzqNdkE9lGtCdXyb1ai69Kro9l2uXDkTuOP5mo6vZf3i7uivavZoPmcOQCL11g5rRvFuppZnFk3A6OXOClC8yc9t05sguad2nvPe3rz9vXwuz8zLwuHbgIrocRwfUwIrgexgRHaETw0EVwPYwIrocRwfUwJjhCI4JHLoLfuiiqhxFF9TCiqB7GFEVoRNGFi6J6GFFUDyOK6mFMUYRGFF26KMqc5gSERiRFaMRShMY0xXBsVnAbFtymBbdxwXFecBsYmNPEwC5GBitb9TRmq57GbNXTqK0IjtlqMyxd9sxmWrKlMVut5iVrHLP1YnjQ2ro6_Pc7AAD__9fkwKM=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzElt9v2joUx9_vX2Gd-9LeGiV2fhQiXSlXd91E1UJXOmlSxUNKPIhEE-YEaVXF_z6FsNFC8IlnEd6S4A_295yPpfMK-fc5BDC6urn6_4Es5Zx8vB_ekserr3c3__UH5OxDf_Qw-nxzTjZL_qkWTGbJPObketgfkKmM0njz4cuoP_hEzhZJzCiZJDE_HwOFNIvFIHoWOQSPwIACBwoOUHCBggdjCguZTUSeZ7Jc8roG-vEPCGwKSbpYFuXnMYVJJgUEr1AkxVxAAA_R01zciygW0rKBQiyKKJmvt1nI5DmSL2F1MKAwWkRpHpCOxa2_Lc-3mOXy6rlrMYuTKI2JQ7JiJmQO4xWFbFlsdt5u-PRCZlE-e79VyGjIYbwaU8iLaCogYCv6ZyG8-hBvStxyEn4wyfavMhkLKeLdv7qgIb8o92-8sqY4t0JOxXWWpEJabKfFc_GtONvQ5__KZDrbvgKF4bIIyDoRDR0aujS8pGGXhr2dmmzDOg3CLtO6ELVnH2SdbGExb2dl_d7uu71Zc2VYM-8PyNKx3PLZK7-7R7wDGoF8jTvQeip-MNUJ7gNr9T7w5i3kDZ1806WO5f9upV89l630j-ikRqBLHSfbTsUPpjqBk7xVJ53mLXQaOlnfsI7VPaKJGjG6Oia2k4UfzHIC_5xW_XObN85t6F-3YzH7V988e_NSNo7ZR1RQI0lPR8HW4vCDcU5goXuySbXmZPciX2RpLhrNoXaZTcRTUVUuz5ZyIu5kNllvU70O19x6_IlFXlS_8uqln1Y_lQdsDvsmcM8EZkbnZp6aZhol43qwbwL3TGBmdO6dku3RfJe239KOut6OEmbva2bv0q6J4GoYEVwNI4KrYUxwhEYE90wEV8OI4GoYEVwNY4IjNCK4byL4pYmiahhRVA0jiqphTFGERhTtmiiqhhFF1TCiqBrGFEVoRNGeiaLMaE5AaERShEYsRWhMUwzHZgWzYcFsWjAbFwznBbOBgRlNDGxvZNCyVU1jtqppzFY1jdqK4JitOsPSfs90piVdGrNVa17SxjFb94YHpa3j1V8_AwAA__-sid2f
 
 # Subset join on interleaved columns uses hash joiner.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM child2 JOIN grandchild2 USING(pid1, cid3)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzElk9vmzAYxu_7FNG7yyY5MjZ_miBN4rju0E7dbhMHGrwEKcXIJtKqKt99Atq1IeAXzwq94YQf9uP3d3ieoJS5uMkehIb4FzAgwIGADwQCIBBCSqBSciO0lqp5pQOu8z8QewSKsjrUzc8pgY1UAuInqIt6LyCGn9n9XtyJLBeKekAgF3VW7NttKlU8ZOox2eyKfd7s96PKSh0vlpTTjzSMKKMB755XlFG-yMp84S9kvRNKQ3okIA_1886vG94_LnaZ3p1ulTCS-JAeUwK6zrYCYnYk_xciHA6xVVmZv0sSPprk9VOHUqpcKJGffCxtSOyVgev4mundN1mUQlHWm-le_K4_tWf8_EUV293LAgjcHup40a5IwkkSkCQiyYok694FvCbzHZINHPtGLmVFWdi_g8G9g5O92XQ_2DTJR8xY0qB5DpvfgwsKbxEoshB-9lR8NNUc8rPZ5OfT58UnCvhmJEsa_Ztb1D03c4suKKBFoCsbAedOxUdTzSEgn01Af_q8_IkCDk9nSVcX1M4ixspGu3my8NEsc8jmzyZbMH1KwUTZVkvKvJchhd7zopkS8y7om0WStY1vs8Xho3HmUC54l3Y5cKg7oStZajGpO3pNLJFvRXdNWh7URnxXctNu0y1vW66tLLnQdfcv7xbXZfdXc8DpcOQCr11g5nRuFpppZnFl3A6OXOC1C8yczt27sjOa92nvLe2b79s3wuz0zrw-HbgIboYRwc0wIrgZxgRHaETw0EVwM4wIboYRwc0wJjhCI4JHLoJfuShqhhFFzTCiqBnGFEVoRNGVi6JmGFHUDCOKmmFMUYRGFF27KMqcegJCI5IiNGIpQmOaYjjWFdzKgltbcKsLjn3BrTAwp8bAziqDla1mGrPVTGO2mmnUVgTHbLUpS-czs2lLtjRmq1VfssYxW8_Kg9HW9PjhbwAAAP__WEKzfg==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzElk1v2zgQhu_7K4jZS7KgIZH6iC1gAS22aesgtdM4BQoEOigWawtwJJeSgQaB_3shyWniL45YwupNlPiIfGeewzxD8X0BAUwury__vyMruSDvb8efyP3l15vr_4YjcvZuOLmbfL4-J5st_zQbpvN0kXByNR6OyEzGWbJ58WUyHH0gZ8s0YZRM08Q5j4BClidiFD-KAoJ7YECBAwUHKLhAwYOIwlLmU1EUuay2PNfAMPkBgU0hzZarsnodUZjmUkDwDGVaLgQEcBc_LMStiBMhLRsoJKKM00V9zFKmj7F8CpuLAYXJMs6KgPQsbv1teb7FLJc3z32LWZzEWUIckpdzIQuI1hTyVbk5-fXAhycyj4v59lEho6ED0TqiUJTxTEDA1vT3QniHQ7wpccdJ-NEkr79aZblMhBTJ1s-iisS2HCjHx7iYX-VpJqTFdnq6EN_Ks_qO5__KdDZ_WQCF8aoMSL2iIaehS0Ofhn0aDnYK8JrMMUh24NqjvJcvLebt1uDg2e7W2ay9H6yd5EfM6Flu9exV790TCq8RyNcQvvNU_GiqLuRnncnP2_eLtxTwTUt6lv-rb37zXPXNP6GAGoEudATsOhU_mqoLAXlnAjrt--W0FPBwd3pW_4TaacTo62jXTRZ-NEsXsjmdyea275LbUrZ-z2L2S5M8e7OousTsE_qmkWSg41tncfjROF0o5_6R6fLApW5FscyzQrSaHe0qlkhmoilTka_kVNzIfFof0yzHNVePLIkoyuYrbxbDrPlUXbA97JvAAxOYGd2beWqaaZSM68G-CTwwgZnRvXdKtkfzXdp-SzvqejtKmG3XzN6lXRPB1TAiuBpGBFfDmOAIjQjumQiuhhHB1TAiuBrGBEdoRHDfRPALE0XVMKKoGkYUVcOYogiNKNo3UVQNI4qqYURRNYwpitCIogMTRZnRnIDQiKQIjViK0JimGI7NCmbDgtm0YDYuGM4LZgMDM5oY2N7IoGWrmsZsVdOYrWoatRXBMVt1hqX9nulMS7o0ZqvWvKSNY7buDQ9KW6P1Xz8DAAD__4Wj0Hs=
 
 # Multi-table staggered join uses interleaved joiner on the bottom join
 # and a lookup join on the higher join.
@@ -453,7 +453,7 @@ SELECT url FROM[EXPLAIN (DISTSQL)
 ORDER BY pid1
 ]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlU-L2zAQxe_9FGFOLZmSyHb-GQq6piy7Jdfig7Fms269GiPLpWXJdy-K6K69JHJIICVHWX5-v_fGMC-gWdF9_kwNpN9BAEIECDEgJIAwgwyhNlxQ07Bxr3jBWv2GdIpQ6rq17nGGULAhSF_AlrYiSGGtLZmK8l-0oVyR-cqlJjOZAoIim5fV3vGOHi04j_I5N3_k1uRaFU9lpRzKptw-dW9fL_y3AKGiR_tRijHKaPzpi3Hvvx4B4aG16UgKlBHKGGWCcoZyjnIB2Q6BW_uG39h8S5CKHZ4e0WH4cJNZP9Y_4jo3pK1DvmP-2dajH1zqEWtHdZBvgXJ1FC46CvfGxEaRIdXHkWIM2e5Agnv-zPVE9IdyzD7u2Yuzxi9uafwDETvjn19__NFZ_Ue31P9AxE7_i-v3H5_Vf3xL_Q9E7PS_vH7_yVn9J7fU_0DETv-r_7t-DsBtqKlZN3TSZpm63URqS36XNdyagr4ZLvY2_viw1-0fKGqsvxX-sNb-ygF2xSIojnpi8V4chZ0HrOOgOgmLk0u4Z0HxPOw8v8R5ERQvw87LS5xX4VlNB36T8E_23jvbffgbAAD__z5elJs=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzUVU1r20wQvr-_YplT_GZKvJJsJ4LCto1bFFw7lVNoCToI7cRRq2jV1aq0BP_3IitNpGBLwQYX3zyaefx8zMLcQ_4jARfm48n43RUrdMLe-7OP7Hr85XLyxpuyo3NvfjX_NOmxh5H_q4GFDlMZ3caJ5Oxi5k3Zw-_Pc2_6gR1lseTIoljyXtXOQk2pafR7bOafj3329isrywAQUiVpGt5RDu41cECwAMEGBAcQBhAgZFpFlOdKlyP3K4Anf4HbR4jTrDDl5wAhUprAvQcTm4TABS81pBMKf5JPoSR9oeKU9EkfECSZME5WjBO6MVByxHeh_i1qHgHBjxe39e5jo_ovQEjoxhwJfozCOu691uX8YwkIs8K4THAUFgobhYNigGKIYgTBEkEV5kl-bsIFgcuX-HKLpYzK3Mmgaeuv4ocdAMJEqe9Fxr6pOGUqLVWt1TdCcbZRnLVR3JMmpSVpkk05gh9DsFzjYKpeqeyEN5eyid5u0POt1s8Paf0dFmvrH-5__dZW-VuHlH-HxVr-o_3nb2-Vv31I-XdYrOV_uv_8na3ydw4p_w6LtfzP_u35WSPOpzxTaU4vuiz98jaRXFB1y3JV6IgutYpWNFU5W-FWHyTlpuryqvDSqlUKrIN5K9hqgPlzsNXO3EFtt6KddrCzi-5BK3jYzjzchXnUCj5tZz7dhfmsfVf9jmfS_siecwfL__4EAAD__7LjvSk=
 
 # Multi-table join with parent1 and child1 at the bottom uses interleaved
 # joiner but induces a hash joiner on the higher join.
@@ -464,4 +464,4 @@ SELECT url FROM [EXPLAIN (DISTSQL)
   JOIN grandchild1 USING (pid1, cid1)
 ]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzUllFv2jwUhu-_X8F3drNpRo4dJ4VIk3K5TlU7ddvVlIuUuBCJJsgJ06qK_z6Z0JIA9cFYROKO4DzxOfZzpPcFijKTt-mTrCD6DQwIcCDgAwEBBAJICCxUOZFVVSr9SgNcZ38h8gjkxWJZ678TApNSSYheoM7ruYQIrotaqrlM_8h7mWZSfSvzQirqAYFM1mk-X-94Ix9r0HvkT6l6jhepkkWty7jPp7P2ymSWzzO90HwHCMzlY_0xZp8_fVH63fVPIHC3rKNBzEjMSeyTWJA4gGRFoFzWm2K3NT48D2ZpNeuWpFkBySohUNXpVELEVuT4vn-mD_NNyzTofvm1l6lKi-ytoR-LtKiiwZBy-oEGIWVUcMrp_7e_bm5oMKKM8kFaZAN_UNYzqSr7bninG_5uN9tPLYtSZVLJrPOxRJPYKweO5GtazTbXz3buf3OJJBbbayQx71ykWN9lQOIRicc73W_b8h3aOlDzbTksF5QFuwdwcG_R2ZudNBjs4gcD6bs9GKHFYBjmYkiFXgv0mjjjkLCeh4T1MyT8JFH5xYuK9N0W9cpG1JaMQxq-WRvSsG1teEZRec-i8n5E9U8S1b94UZG-26KObER9380hHZ1RT79nPf1-9BQn6SkuXk-k77aeYxs9R0PKvFdFA08_tBxl3hkNFT0bKvqPwwcqupfVoiwqeVTY9XRPMpvK5oyqcqkm8rsqJ-ttmse7NbcOTpms6maVNw_XRbOkCzweDl3gsQvMnOpmgZlmFkfG7eDQBR67wMyp7p0j26P5Lu21ad983r4RZt0z83Zp4SK4GUYEN8OI4GYYExyhEcEDF8HNMCK4GUYEN8OY4AiNCB66CH7loqgZRhQ1w4iiZhhTFKERRUcuipphRFEzjChqhjFFERpRdOyiKHPKCQiNSIrQiKUIjWmK4VhWcAsLbmnBLS445gW3wMCcEgPbiwxWtpppzFYzjdlqplFbERyz1SYs7d-ZTVqypTFbrfKSNY7ZuhcejLYmq__-BQAA__9SQAml
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzUll2P4jYUhu_7K9zTm5nWyLHzsRCpUqp22rKisIVZqdIqF1nihUjZhDqh6mjEf69CmBI-xmeCRSTuCPZj-9jPkd5nKP5OwYfZw-jh50eyVin5dTr5g3x6-OvD6KfhmNz9Mpw9zv4c3ZPdlO_rCatIyazk5P1kOCbzZZLGnHycDce_kbtVEvP7emChoiw-HaVkXs0JgUKWx3IcfZUF-J-AAwUBFGyg4AAFF0IKK5XPZVHkqpryvAWG8b_gWxSSbLUuq79DCvNcSfCfoUzKVIIPw6yUKpXRP3Iqo1iq93mSScUsoBDLMkrS7Y4j-aWEao_ka6Segl1VQGGaLJbNkboIoFCvAxRS-aW8C_gP9z-qau72J1CYrEufBJwGggY2DRwauBBuKOTrcnfY_Rk_P5FlVCwPj1SxDoSbkEJRRgsJPt_Qt9f9GH1OdyUz93Dll1oarwIUZqsoK3zSY4J9x1yPceYIJti344-jEXP7jDNBoiwmNsnLpVRF-2rEQTXi1Wr2S62zXMVSyfhgsbAisSlnruT3qFjunp8fvf_uEWng7J-RBuLgIZ3tW7o06NNgcFT9vizboKwzZx7nvXzFuHt8AWf3dg725hc1Br_5xkDqbjaG16IxNH3RY0415lZjzhWbhHfcJLybJhEXiSpuXlSk7qao79qI2pCxx7z_rfWY17TWu6KoomNRRTei2heJat-8qEjdTVH7bUR93c0e619RT7tjPe1u9HQu0tO5eT2Rupt6Dtro2e8xbr0o6lrVR8NRbl3RUKdjQ53u4_CZE01lscqzQr4p7FpVTTJeyPqOinyt5vKDyufbberPyZbbBqdYFmU9KuqPYVYPVQd8O-yZwAMTmBudm7t6mre4MtEO9kzggQnMjc59dGUntDimrSZt6-_b1sL88M6sY9oxEVwPI4LrYURwPYwJjtCI4K6J4HoYEVwPI4LrYUxwhEYE90wEf2eiqB5GFNXDiKJ6GFMUoRFF-yaK6mFEUT2MKKqHMUURGlF0YKIoN8oJCI1IitCIpQiNaYrhWFYwCwtmacEsLhjmBbPAwI0SAz-JDK1s1dOYrXoas1VPo7YiOGZrm7B0-mZt0lJbGrO1VV5qjWO2noQHra3h5pv_AgAA___wPy5O
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_join b/pkg/sql/opt/exec/execbuilder/testdata/distsql_join
index 61cc4e93771b..9bd0d3e9ecac 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_join
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_join
@@ -129,7 +129,7 @@ sort            ·            ·                (a, b, c, d)  +b,+a
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT * FROM (SELECT a,b FROM data AS data1) JOIN (SELECT c,d FROM data AS data2 ORDER BY c,d) ON a=c AND b=d ORDER BY b,a)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ls9v2jAUx-_7K9A7bapRYifhR6RJHNcd2qndbeKQEq8g0Rg5QVpV9X-fgKE2JH3feIYcU_Kxv_H7vD6_UGFyfZM96ZLSXyRJkCJBEQmKSVBCc0Ebaxa6LI3dvXIArvM_lIaCVsVmW-3-PBe0MFZT-kLVqlprSuln9rDWdzrLtQ1CEpTrKlut99ts7Oops8-zPKsyEnS_yYoyHQwDOciKfCAHplpqS4Jut1U6mEkxUzR_FWS21b_t3nZ5eB4ss3JZX_-IzAWVVfaoKZWv4v-SJz7JIzGLfZOrD5O_LbUtjM211XltsfmORK-0fP63rFx-N6tC20CeFG6tf1ef9xm_fLWrx-XxoVYr0fbdbx8UuZTi3thql-OkDDN1JWby6sM94g6H1nYe7xZuCXNjhmYTqPD0lFsjJLUIsrtxsotxgRwGqqduccg-8st-_n6RPfeLvHS_gGIc-2Xk0y-qe8FVp4KrYRD1JKtD9rFf9vPLqnqWVV1aVlCMo6xjH1mj7gWPOhU8GgZxT7I6ZJ_4ZT-_rFHPskaXlhUU4yjrxEfWuHvB404Fj4dB0pOsDtmnftnPL2vcs6zxpWUFxTjKOj3XtblljztdbkxR6k634XB3Yjp_1IcKlGZrF_qHNYv9NofH2z23v-LkuqwOv6rDw3Vx-GkXsDs89oGl9KITL3rK09LhzJQbPPaBT87MlU686ClPq1M6fE9HNTg8hSMWjvlqxSysJL914tMfPAz6g4dRfwAa9AegQX-MfPqDh0F_8DDqD0CD_gA06I8xa-mEl3Ti0x9TH8N5GBjOw8hwQAPDAY0mgMvYbP4ndZmbrjQcAk6T0xkHmsvGFKmpKhUvuuTHCDBdNuaIi-qABq4DGsmOcGA7wpHujRnqpDtPI915GuoOcKQ7wJHujUFa130EdG_MFCfdGzPFSXeeRrrzNNQd4Eh3gCPdG_PUSXeeRrrzNNQd4Eh3gCPdG1O1ftcOed1VY7awus9fP_0NAAD__xLijKQ=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll1v-jYUh-_3KaxzBatRsBPeIlWiW5lG1UEHvdhUcWGIV5Bowpwgrar63aeERm0I9Yn_hlxVCX7iX3ye05M3iP_dgg_z0f3o10eyV1vy22z6B3ka_fVwfzOekMbteP44__O-SRofa34-rMgvBSXLw51AJILczLO_rEnupin-sWpFSVBexcl0djuakV_-zhY0yXRCGoJck1WT3ExuSWNJrrPb-aolJaK5AAphFMiJeJEx-E_AgAIHCi5Q8IBCBxYUdipayTiOVLrkLQPGwX_gtylswt0-SW8vKKwiJcF_g2STbCX48CiWWzmTIpDKaQOFQCZis8222anNi1CvwzQ5UJjvRBj7pOUwIsKAMBIla6mAwnSf-GTI6JDD4p1CtE8-tvvcZflK1iJeF5-fIwsKcSKeJfjsnf5Y8o5NcpcOPdvk_Nvkn4_ah5EKpJJB4WGLlMSWnHj930W8vos2oVQOOyrcVv6TNLKMzWu1eV7nF4Va0VPv_flCrkkp5pFK0hxHZRjyKzpkV9_u4VU4tFPn8eXBJ8JMola0c3j7-JRPRugUIrDqxrEqxjms5fCausUge9cu-_n7hdXcL-zS_YIUI--Xrk2_8OoF55UKzluOW5OsBtl7dtnPLyuvWVZ-aVmRYuSy9mxkdasX3K1UcLfleDXJapC9b5f9_LK6NcvqXlpWpBi5rH0bWb3qBfcqFdxrOZ2aZDXIPrDLfn5ZvZpl9S4tK1KMXNbBuT6bT-wxk_EuCmNZ6Wu4nZ6YDJ7loQJxtFcr-aCiVbbN4XKacdknTiDj5PArP1yMw8NPacDqcM8GZsyK7ljRAz3NDM6Mm8E9G_jozEzpjhU90NP8mG5_pd0C3D6GXS3s6avlaWHO9Ft3bPpDDyP9oYex_kBopD8QGumPrk1_6GGkP_Qw1h8IjfQHQiP90dNa2tdL2rfpj4GN4XoYMVwPY4YjNGI4QmMTwGRslv-TmsxNUxodAkaT0xhHNGelKVJQlXG96Ew_RhDTWWmOmKiO0IjrCI3JjuGI7RiO6V6aoUa662lMdz2N6o7gmO4IjuleGqRF3buI7qWZYqR7aaYY6a6nMd31NKo7gmO6Izime2meGumupzHd9TSqO4JjuiM4pntpqha_tdt63Xlptmh1X7z_9H8AAAD__xwOvEs=
 
 # TODO(radu): rework these tests (the inner ORDER BY aren't useful anymore).
 #
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_misc b/pkg/sql/opt/exec/execbuilder/testdata/distsql_misc
index e75943655473..a423bc8fc65d 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_misc
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_misc
@@ -88,7 +88,7 @@ NULL       /1       {1}       1
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) CREATE STATISTICS s1 ON a FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lE2L2zAQhu_9FWJOLcjow042q9P2uJdu2fRWfNBag2uaWEaSoe2S_14cY7YOG1ng9Ggpb56XZ8S8QmsNftFH9KC-gwAKEijkQKEAChsoKXTOVui9dcNPxsCj-QWKU2jarg_DcUmhsg5BvUJowgFBwTf9csBn1AYd40DBYNDN4YzpXHPU7veD0UEDhX2nW69IxgTRrSGC2PADHVB46oMiDwLKEwXbhzeWD7pGUOJE0_vs9bE7oGObeZfxeN_8QUUE53youg86DpZXwW-8vrXOoEMz45Wnq9U-17XDWgfrmODpJclHyTl56aufGPynq5XzWWWRPjuRMjsmMiZXTW-h0TS97c2nJ9NVyCQVMmP5KhULjSYVdzdXkaeryJNU5BkrVqlYaDSp2N1cRZGuokhSUWRss0rFQqNJxf1_XW_vgJ_Rd7b1eLHm3v9nPqw_NDWOu9Lb3lX41dnqjBk_n86584FBH8ZbMX48tuPVUPDfsIiG5SwsLsMyTl5A59F0EQ8Xa3pvouFtnLxdQ76Lhndx8m4N-T4-K77wTOKP7JJdnj78DQAA__-8qfRA
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lEGL2kAUx-_9FMM77cJIMkl03ZxWrIWA1a3JobDkMOs8rDRm0pkJtBW_e4lBtso6GYh7zIx_f39-b3h70L8KiCGdzWfTjNSqIF9Wy6_kZfb9eT5JFuTuc5Jm6bf5PZmuZpNsRtJskiVplkxTohlZLghvE4IbngOFUgpc8B1qiF-AAYUAKIRAIQIKQ8gpVEquUWupmp_sj4FE_IbYp7Atq9o0xzmFtVQI8R7M1hQIMWT8tcAVcoHK84GCQMO3xRFTqe2Oqz9PTQegkFa81DEZeIzwUhBGpPmBCigsaxOTJwb5gYKszRtLG75BiNmBuvdJ-a4qUHnD8y7tcbr9izFhvu83VVPD7eDgKviNV5dSCVQoznj54Wq1yWajcMONVB7z3UuSu8D3yWu9_olG31-tHJ5VZu6zYy6z89jAC3pNr6PRaXqjm08vcFcROKkIBl7YS0VHo5OKh5urCN1VhE4qwoEX9VLR0eikYnxzFZG7ishJRTTwhr1UdDQ6qXj80PX2DniFupKlxos19_4_-836Q7HBdldqWas1Piu5PmLaz-UxdzwQqE17y9qPpGyvmoL_h5k1HJyF2WU4sJM70KE1HdnDUZ_eQ2t4ZCeP-pAfrOGxnTzuQ360z8rveCb2R3bJzg-f_gUAAP__KeEKoQ==
 
 statement ok
 INSERT INTO data SELECT a, b, c::FLOAT, 1
@@ -97,4 +97,4 @@ FROM generate_series(1,10) AS a, generate_series(1,10) AS b, generate_series(1,1
 query T
 SELECT url FROM [EXPLAIN ANALYZE (DISTSQL) CREATE STATISTICS s1 ON a FROM data]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzElU-L2zAQxe_9FGJOLShrSXb-6bTtbSl0y6a3koMSDa6pYxlJpt0u-e7Fds3Wy0ZWIGGPljTz3vyekJ-gMhq_qAM6kN-BAwUBFFKgkAGFOWwp1Nbs0Tlj2yN9wZ3-DZJRKKq68e3ylsLeWAT5BL7wJYKEb2pX4gMqjTZhQEGjV0XZydS2OCj7eKuVV0BhU6vKSTJLOFGVJpwY_wMtULhvvCS3rSlrfjliUWlJOGu7Oa_KkvjigJIwBxR2jx6HI-nNmnwuPsH2SME0_tmj8ypHkPxI4-fYqENdok3m4xn65U3xBztLnamNV73hU8LipPCzXlMZq9GiHultjyetfcxzi7nyxiacxZsk7wVjZNfsf6J3H05aTkeWeXzmPCbzhM8SEZO6mE59ebM6I_WJSYbUFxdPXcQjFFEIxSxJ3wThxCQDwuXFEabxCNMohOksyd4E4cQkA8LVxRFm8QizKITZLJnHIEynEXJxBsGJQQaC66u-3q8IP6CrTeXwxSv-emfWvu6oc-x_Bc40do9frdl3Mv3nfVfXLWh0vt_l_cdd1W-1Bv8v5sFiMSrmL4tFWHlCOg1WZ-Hi7BzfHcUO6L9b5LDykrA2x3HbebDtIuxpcR1Py2DbVdjT6jqe1uHk2cSlC1_ZeFfb47u_AQAA__9cmmit
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzElVFvmz4Uxd__n8K6T63kFAykTXkq_45JaFnSBR62VTy44SpDI5jZRltX5btPwKIuVQOOlKiPGI7Pub9jmSdQPwrwIQ6n4W1CalmQ94v5R3Iffr6bBtGMBLNg-uVrSM7eRXESf5qek9tFGCQhiZMgieIkuo2JYmQ-I7xTZlzzFCiUIsMZX6MC_x4YUHCAggsUPKAwhpRCJcUSlRKy-eSpFUTZL_BtCnlZ1bpZTikshUTwn0DnukDwIeEPBS6QZygtGyhkqHletDaVzNdcPt40GYBCXPFS-WRkMcLLjDAi9DeUQGFea5_cNKGk-KmIRJ75hNnNbkrzoiA6X6NPbAUUHh41bj9xL67Jh_x_SDcURK2fMyrNVwg-21DzOWK-rgqU1nh3hm45zn9jG6kNFWveBd5n7Ow1fvarSyEzlJjt-KWbvdGC1UriimshLWabhyRnjm2Th3r5HbU63xvZ3YnMzDtnJp1bbGQ5Jq07w61fXUwOaH1gkm3rl0dv3TFH6BghdEaW-yYIBybZIrw6OkLXHKFrhNAdWd6bIByYZItwcnSEnjlCzwihN7LGJgjdYYTMOYDgwCBbgtcnvb1fMV6gqkSp8MUt_vrOdnO7Y7bC7legRC2XeCfFsrXpHuetrl3IUOnuLeseorJ71QT8V8x6xc6OmL0UO_3OA9Zur9rrF3uH5G4ptkD_niKFpfaJ3fS4u-24d9vL_kyXp8l01bvtpD_T5DSZrvubtwcOXf-RNU-Vbv77EwAA__9ZI4Ez
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_numtables b/pkg/sql/opt/exec/execbuilder/testdata/distsql_numtables
index 9498463795c7..62da6bb21f5a 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_numtables
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_numtables
@@ -48,25 +48,25 @@ NULL       /2000    {1}       1
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT 5, 2+y, * FROM NumToStr WHERE y <= 10 ORDER BY str]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkEFLxDAUhO_-ijIe90mboiA59drLKt29SQ-xeSyFNikvKShL_7u0ObgrrOhxZjJfhneG85b3ZuQA_QaFljCJ7zgEL6uVHtT2A7og9G6a42q3hM4LQ58R-zgwNI7mfeCGjWXJCxAsR9MPG3aSfjTyWbl5jD5EAeEwGRd09pCrIr8HoWFnWXT2pLWu98dnyiq1Ky8EZVWJdiH4OX6PCNGcGFot9PehBy-RJVfXG6vH3U18-R98w2HyLvAV_ha5WFoC2xOnWwc_S8ev4rvtmyRftt5mWA4xpSqJ2qVoHXhZVr-Wyx_ldrn7CgAA__9wCqhG
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkFFLwzAUhd_9FZfri7pIm-pAAkLVVSzMbbYFldmH2l5GoUtqkoJj9L_LWsVNmOjjOfeck4-s0bxVKDAOxsFNAo2u4Daa3sM8eJqNr8IJHI3COIkfxsfwGRky8GAAKwYnfVQ2S6uM1fB4F0QBrOClcd2z_BK4C9NoFERw_QzG6hQZSlXQJFuSQTFHjinDWqucjFF6Y627QFi8o3AZlrJu7MZOGeZKE4o12tJWhAKT7LWiiLKCtOMiw4JsVlbdbK3LZaZX_hcXMozrTBoBpw53nUNkGJEsSAsYCiHCSXLBwOcDb0sw8D1MW4aqsd8QxmYLQsFb9nfQWGlL2uG7jP75YO-895_5iEytpKGd-X3LbpsypGJB_V8b1eicZlrl3TO9nHa9zijI2P7KexHK_rQB3C7zX8vej3LaHnwEAAD___w4xj8=
 
 # Query which requires a full table scan.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT 5, 2 + y, * FROM NumToStr WHERE y % 1000 = 0 ORDER BY str]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzElF9r2zAUxd_3KcSFwUYVLMmK6woGfhrkJRtp30YevOhSDIllJAU2Sr778J_RuiSySAp-s2Sde3R_R9wXqI3GdXlAB-oXcKAggEIKFCRQWMKWQmPNDp0ztj3SC1b6DyhGoaqbo2-3txR2xiKoF_CV3yMoeCp_73GDpUabMKCg0ZfVvrNpbHUo7d-iPh68cd4ChcemrJ0ii0Qw1p7-Xu09WkW-FJx8JpwxppRarZ_yr-Qb-f8NFDZY6_bcctiipOB34s2CkkLA9kTBHP3rZZ0vnxEUP9H4hh6N9WiT5biXQt5dLC8uln-taqxGi_pc0TN3WJuFaRI-5nnJPh3Z8_i4eGxcXVqLRM6X2URXQ2bZtZmJeGgiGprsoGXzQZvoaoB2fy20NB5aGg0t66Dl80Gb6GqAll8LTcZDk9HQWlyLmXhNNDTweviIaXqm_AZdY2qHUYOStaMW9TP2o9mZo93hT2t2nU2__NHpug2Nzvd_eb9Y1f2v9oJvxTwoFiMxfy8WYecJ6zSolmGxvOXey6A4CztntzjfB8V52Dm_xfkhnBWbeCbhR_bee3v69C8AAP__hSYJMQ==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzElG-L2k4Qx5__XsUw8AOvrpiN0fMWCra9HBWsXqPQlsMHqRkOIWbT3Q1UxPde8qfceWiyaMFn2c185zvzmWV2qH_FKHDuT_xPC8hUDA_B7As8-d8fJx_GU2jdj-eL-dfJDVQhfQYutGHL4F0ZmmQbI7VR8O2zH_jQ2sL_wB3HuYH34MAsuPcD-PgDtFFLZJjIiKbhhjSKJ-TI0EWGPWToIcM-LhmmSq5Ia6nykF0hGEe_UTgM10mamfx6yXAlFaHYoVmbmFDgIvwZU0BhRKrrIMOITLiOC5tUrTeh2o7-VooM52mYaAGdrus4efTDOjakBLRGvCpfCDGeLoZFF9U3MgwoifK4fnXFYMTb7qsDg5GLyz1DmZmXYrUJnwkF3zP7huZSGVLd_mEvI699Mr17Mv1LVqkiUhQdS3qkhqnsyLTLD3mesu8d2HP7cXHbcRXT6nS9682soatqZoNzZ-baQ3OtoXkFtMH1oDV0VUG7PRdazx5azxraoIA2vB60hq4qaMNzoXn20DxraDmuzpV4NTRU8br7F9v0SPqAdCoTTVaL0slXLUXPVK5mLTO1okclV4VNeZwVuuIiIm3Kv7w8jJPyV17gazGvFbsHYv5W7NY7N1j3atVevdi7pO5-rXhQ7zy4xPm2Vjysdx5e4nxXPyun4ZnUP7K33sv9f38CAAD__4vzJqk=
 
 # Query with a restricted span + filter.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT str FROM NumToStr WHERE y < 10 AND str LIKE '%e%' ORDER BY y]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyMkDFLxEAQhXt_RXhyXLNyiZ1bXaMSlDvJXScp1uxwBJLdMDMB5dj_LskWYiFYvvdm3nzMFSF6OriRBPYdFVqDiWNHIpEXKw_U_hO2NOjDNOtitwZdZIK9QnsdCBZn9zFQQ84T70oYeFLXD2vtxP3o-Gsf5lGjKMPgNLkgtrjbPexuYfDUD0psi_198Vq_PBbbDW221trTuakPzzA4zrqkaJNBnPUHQ9RdCLZK5v-oDckUg9Avyr-ay9QakL9QfofEmTt649itZ7I8rnur4Uk0p1UWdchRatPNdwAAAP__t3t2hg==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyMkE1L60AUhvf3VxzOpbSFuTS5rpxVq001GJM6CajULMbkUAJpJs4HWEr-uyRR1IXg8v2Ydx7OCc1LjRzTIAouM3C6ho1IbmEXPGyjVRjDbB2mWXoXzeG9YqweK407WNWr--tABDA7wpPzvLMCfG8Oq3gNsz6MwpsAphOaTOeQiHUg4OIRjjkybFRJsTyQQb5DH3OGrVYFGaN0b52GQli-IvcYVk3rbG_nDAulCfkJbWVrQo6ZfK5JkCxJLzxkWJKVVT3Mtro6SH1cfrAiw7SVjeHwb3G--IsMN1VtSXNY_v-CyjlPMxHGV8gwcbZPMe8YKmc_MYyVe0Lud-z3qIJMqxpD3yh_Wva6nCGVexrPYZTTBW21KoZvRpkM7wajJGPH1B9F2IxRl3d_3gIAAP__QCCYHg==
 
 # Query which requires a full table scan.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT str FROM NumToStr WHERE y % 1000 = 0 AND str LIKE '%i%' ORDER BY y]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlM-K2zAQh-99CjEQNktlLMlOWAQFF_oH0-It2dyKD641BINjGUmGluB3L5YPqUtSVHLI3ixpPn7zDYxP0GmFRXVEC_I7cKAggEICFFKgsIGSQm90jdZqM5XMQK5-gmQUmq4f3HRdUqi1QZAncI1rESTsqx8t7rBSaGIGFBS6qml9TG-aY2V-Zd1wdNo6AxRe-qqzkkSxYGyq_tS0Do0k63XGyYpwxpiUMi_2T4_kHTl_vy8-kHUmyNf8y0fysGpWD1LKl_0uLz4_AoXnwUmSCZpxKEcKenDnhq2rDgiSj_SK1NlFG4UG1dIiE2-hHC-YFzrSfbxZVF9LF4t0Hj5SHjpSP9EoTu87VxFuJoLNUm-2va9ZEm6WBJttvdnTfc3ScLM02Gxyil7Jgl-Q2qHtdWcxaHnZtP2oDjj_LaweTI3fjK59zHx89py_UGjd_MrnQ975J9_gnzD_J7xdwOxvWNySnNwCp7fAm_-Cy_HN7wAAAP__bVwL3A==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlEFr20AQhe_9FcOAiUzXeCXLJiwUlNZKK-rKqWxoS9BBtYYgkLXq7gpqjP970Spt4pIUFR-cm2bnPd58A6M96h8lClyFi_DdGhpVwnWy_AS34debxVUUgzOPVuvV58UQ7iXaqE5SNVsj2-rLhzAJwXF2MACXcz6EN8CHcBXPwWn7i-hjCBeDYnAxhGUyDxN4-w12KTKsZE5xtiWN4hZdZOghwwky9JHhFFOGtZIb0lqqVrK3hij_iYIzLKq6Me1zynAjFaHYoylMSShwnX0vKaEsJzXmyDAnkxWljalVsc3ULvg9PjJc1VmlBYzGHuet-rooDSkBjhO490xCiCheX1q0P9-WMPAeAQohVuskit8PkeGyMQICjwUupgeGsjEPA2uT3REK98CegXpgkSonRfkxReC9xvTwBHksR7IeT4_Uz6V7R-lu_5W6fVdqNzoa--fdq9efzOtN5luy2XnJJv3JJr3JZpbs8rxkfn8yvzdZyzR6IQf-BFRCupaVpl7Hy9vrp_yOur-Flo3a0I2SGxvTlUvrsw85adN13a6IKtuyAz42u_80z47M_G-zd0ry5BSzf4p5-l_m9PDqVwAAAP__fh4tNA==
 
 #
 # -- Join tests --
@@ -75,7 +75,7 @@ https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlM-K2zAQh-99CjEQNktlLM
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x, str FROM NumToSquare JOIN NumToStr ON y = xsquared]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lU2L2zAQhu_9FWFOu6AQS7bzYSj42O1ht2x7Kz5o42liSCxXkqHLkv9ebBeydlJJXiU5-uPRzDwvaN6gFDk-8j0qSH4CBQIMCIRAIAICMWQEKinWqJSQzS8d8JD_gSQgUJRVrZvXGYG1kAjJG-hC7xAS-MFfdviMPEc5C4BAjpoXu7ZMJYs9l69pWe-1UL9rLhEIfK94qZLJFLIDAVHrf0cfT3x5nWy52vbPShlkh4yA0nyDkNAD-ViL1NSilu_6m7EgCEY2SXtNsv82eTynLoXMUWLeOylrSNsvZyb9wtX2qyhKlLN5v7Ud_tJ3Kbv_LIvNVt-l9B4IPNU6maSUpNFgzuMMoccMZxp8FFNRzSgdTnu2dtSrTd1DZq4htxlPZ9Flk6a3TXpxjaSZu-3Q2XbU2p5f1ja7re3lNWyH7rYjZ9vz1vbysrbD29peXcN25G47drbdeB6700yio9uKpsG198WZ-s-oKlEqdNoGQTMB5hvsjChRyzV-k2Ldluken1quvYFzVLr7yrqHh7L71DToDsc-8MIHXvnAlJppOsIYGwfHPvDCB175wANjJzQb0sF7OjTrDo0w7fsOhnTkE5YZtoRlhi1hmWFLWGbYFlbsE9bcR7cZtug2wxbdZtii2wzbdC98dC99dJthi24zbNFthi26zbBN98pHNx2zLE_v0DHbcixtu_zH7MuxtM05PdkeRunZ4dPfAAAA___jgMjJ
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lVGL4jwUhu-_XxHO1QxksGmrjoWBfuzOsg6zOjvOxcLQi47NaqE2nSQFRfzvS1tBq27SbtTLNnmSc54XctYgPhPwYPL4_PjlDeU8Qd9exz_Q--Ovl-f_hyN083U4eZv8fL5F2y1LjITk1a40X0gmPvOQU_Q0Ho62PyRH4xFaoQe0rBajADCkLKKjcEEFeO9AAIMNGBzA4AKGLgQYMs6mVAjGiy3rEhhGS_AsDHGa5bL4HWCYMk7BW4OMZULBg7fwI6GvNIwo71iAIaIyjJPymozHi5Cv_L1CAcMkC1PhoTsINhhYLrdH7078WKF5KOb1s3wbgk2AQchwRsEjG_xvJRJViZLv1dexLctqWSSpFWn_tcjdOXnKeEQ5jWonBQWp23Ki0--hmD-xOKW806uXltDf8sa3bx94PJvLG5_cAoZxLj3kE-y7B33uenAMejhR4IjdsaxDyGG3J-92a3eT5iHbTUMuM77ruOdNmlw36f4lkrab23Ya23ZL273z2rava_v-Erad5rbdxrZ7pe3789p2rmt7cAnbbnPb3ca2C89tZ5pKtHtd0cS69Lw4cf8rFRlLBW00DayiAxrNaGVEsJxP6Qtn0_Ka6nNccuULHFEhq1W7-him1VJRYHO4awL3TeCBCUyImiYtjNnt4K4J3DeBBybwgbEj2j6krX3aUet2lDCp-7YOadckLDWsCUsNa8JSw5qw1LAurK5JWD0T3WpYo1sNa3SrYY1uNazT3TfRfW-iWw1rdKthjW41rNGthnW6Bya6SZthefyGtpmWbWnd499mXraldc7J0fRQSg82__0JAAD__4ka6Z0=
 
 query TTTTT
 EXPLAIN (VERBOSE) SELECT x, str FROM NumToSquare JOIN NumToStr ON x = y WHERE x % 2 = 0
@@ -103,7 +103,7 @@ render           ·                   ·                    (x, str)     ·
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x, str FROM NumToSquare JOIN NumToStr ON x = y WHERE x % 2 = 0]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzElV1r2zAUhu_3K8yBQUsVYtnOl6Dgq0EGS0fXu-ELNz5LDInlSTKslPz3YbsjjZNJ8rQkd_7QY-m8z8HnFQqe4SLdogT2HSgQCIBACAQiIDCChEAp-BKl5KJe0gLz7Bcwn0BelJWqHycEllwgsFdQudogMHhKnzf4iGmGYugDgQxVmm-abUqRb1PxEhfVVnH5s0oFAoFvZVpI5g2AwKd8o1Aw7yam3kcvYIzNF0_TW-_e89-ugcBDpZgXU0h2BHil3k6yP8Dzi7dO5fpw62Z9QkCqdIXA6I78W0VUV5ES78oZBr7v29XkUknw10r236kKLjIUmB18KanJP0tOLYCY3rV7dRP5gmKFn3leoBiOD5kN_lA3Mb27vRf5at1e7qWROOxUu68kdKjkxBkXfMDLIaXdmk_uHR3sTe37IbDth6YdBsPoCk1BL98Uk_M0RWAvJrQWEzVixlcQE1xezPQ8YkJ7MZG1mHEjZnoFMeHlxczOIyayFzOyFlMrsRzX_89JdHkn1D__bDtxhEeUJS8kWk0uvy4CsxW2uUheiSV-FXzZbNPePjRcMwgylKp9G7Q386J9VR_QHh65wBMXeOYCU6qnaY_Egn7wyAWeuMAzF7iT2BEddGn_PR3q4w61MD3M2-_SkYssPWyQpYcNsvSwQZYeNskaucgau8Sthw1x62FD3HrYELceNsU9cYl76hK3HjbErYcNcethQ9x62BT3zCVu2mdYHv9D-0zLvrTp599nXvalTZnTo-mhDT3ZffgdAAD__0e8BAs=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzElV1r2zwUx--fTyEOPJBSlVi282YoZGwpS2mTLglsUHzhxlpqcK1UkiGl9LsP2xlp0kySpyW584t-1jn_n_B5BfGcQgDTwc3g8wzlPEVXk_Etuh_8uLv5NByhxpfhdDb9dnOG1ktWGAnJq1VZ_iSZeM4jTtH1eDhaP5AcjUdohS7RC_r-dTAZoMYK_Y_cM3SJnBAwZCymo-iJCgjugQAGFzB4gMEHDC0IMSw5m1MhGC-WvJbAMF5B4GBIsmUui8chhjnjFIJXkIlMKQQwix5SOqFRTHnTAQwxlVGSltssefIU8Zf-u5oBw3QZZSJAF4DhKkkl5QFq9ElRbBAEw9GsW9a8vgYM41wGqE8gfMPAcrmuZFPAwwt6jMTj9tbl-hCDkNGCQkDe8N91RFQdSf6unabrOI5ZTzaduH_sZPOdPGM8ppzGW18KC_L3kn0LoE_Oq712E7mlfEGvWZJR3mxvMyn9KRt9cn52yZPFY3W5kYb73k63m048i0721DhiF2zZJGS35717-1t7E_Pz4Jqeh_I4XDT9ExwKcvxD0TnMoXDNxXjGYvxSTPsEYtzji-keRoxnLsY3FtMuxXRPIMY7vpjeYcT45mJaxmIKJYbj-t858Y_vhDiHn217SphQsWSZoEaTyymaoPGCVrkIlvM5veNsXm5T3Y5LrhwEMRWyeutWN8OselUUaA63bOCODdyzgQlR06RGYm49uGUDd2zgng28k9gH2t2lnfe0p47bU8JkO29nl_ZtZKlhjSw1rJGlhjWy1LBOVstGVtsmbjWsiVsNa-JWw5q41bAu7o5N3F2buNWwJm41rIlbDWviVsO6uHs2cZM6w_LjP7TOtKxL637-deZlXVqXOfkwPZShh2___QoAAP__Jx8lsg==
 
 #
 # -- Aggregation tests --
@@ -113,19 +113,19 @@ https://cockroachdb.github.io/distsqlplan/decode.html#eJzElV1r2zAUhu_3K8yBQUsVYt
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT sum(y) FROM NumToStr]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslD9vszAQxvf3U0Q3vZUcgYEQwpSOGdpUSTtVDC4-IaQEI9tIrSK-ewUMgSgxTujoP4-f53dn3QkKwfGVHVFB_AkUCHhAwAcCARBYQEKglCJFpYRsrnSCDf-G2CWQF2Wlm-2EQCokQnwCnesDQgzv7OuAO2QcpeMCAY6a5YfWppT5kcmfdVEdtVBaAoF9yQoVz-aO57rN7W2l49maQlITEJU-2yjNMoSY1sQ-ynOWScyYFtJZDJPsP17-r-nTTRvvps359aoQkqNEPng6qc1BqHtfEn-QhNrXntrWvi393AkeacBInh53OKUBnj22Z40dtNjhI9gjeXrYyynYvj22b40dttjRI9gjeXrY0RTswB47sMZugOd3E49E6RGv_mrAXLHZoSpFofBi0Fx_2W0GEPIMu2mlRCVTfJMibW265bbVtRscle5OabfYFN1RE7AvpkaxNxDTS7Fndh6x9o3qwCwOpuReGMWh2Tmc4rw0iiOzczTFeWXulTvyTcyf7NI7qf_9BgAA__9lhMex
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyslF9r2zAUxd_3Kcx9SkAhlu24qZ9StgwCadPFGQyKH7z4YgKO5ekPrIR892F5o3ZoZSXeo6R7dM5PV9wTiF8FRBAv18vPO0fxwvm63Tw6L8sfz-uH1ZMz-rKKd_G39dj5WyLUcfQ6bqpKdZRMSJ4AgZJl-JQeUUD0AhQIeEDABwIBEJhBQqDibI9CMF6XnLRglf2GyCVwKCsl6-2EwJ5xhOgE8iALhAh26c8Ct5hmyKcuEMhQpodC21T8cEz56-JfDiAQV2kpImcy9Vy3rt4oGTkLCsmZAFPyzUbINEeI6JnYR3nIc455KhmfzrpJ4u-PowUdf2jjfWjzdrsqGc-QY9a5Ojmbg1D3uiR-Jwm1f3tq-_b66SfT4JYG9ORpcYdDGuDZY3vW2IHGDm_B7snTwr4bgu3bY_vW2KHGnt-C3ZOnhT0fgh3YYwfW2DXw5Grinigt4vv_NWDesdmiqFgp8GLQvH-zWw8gzHJsppVgiu_xmbO9tmmWG63TGxkK2ZzSZrEqm6M6YFtMjWKvI6aXYs_s3GPtG9WBWRwMyT0zikOzczjE-c4onpud50Oc7829cnu-ifmTXXon509_AgAA__8yyd0T
 
 # Count the rows in the NumToStr table.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT count(*) FROM NumToStr]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslM-Lm0AUx-_9K5Z32sKEOGrcrKctPeVQLUmWHoosU-chQjIjMyO0LP7vRT2sSjIOukd_fP18P77hvYOQHBN2RQ3xb6BAwAcCARAIgcAOMgKVkjlqLVX7Sh848L8QewRKUdWmvZ0RyKVCiN_BlOaCEMOZ_bngERlHtfWAAEfDykuHqVR5Zerfi6ivRmqjgMCpYkLHD5ut73nt22lt4odECoSsISBr8wHShhUIMW2Ie5lvRaGwYEaq7W7c5Xv6mpzfjumv0-PXuyz_LusDUQupOCrko-9njb0Nnfya0-uPt0Nyfnyh99sEozbUfQzUdQzdFDbbcNksZhoN7KPVs_Dd7X1n-7Czj5bZzzQa2D-ttg_c7QNn-6iz3y-zn2k0sN-vtg_d7UNn-9Z7s0B8psxA_PlTF9AN1hF1JYXGySK6_WWvXVDIC-y3mZa1yvGnknmH6S_TLtfd4KhN_5T2FwfRP2oLDsPUGvZHYToN-3byDDqwpkN7OFzTe2cNR3ZytIb8ZA3v7eT9GvKzfVbezDGxH7IpO2u-_A8AAP__tnPXlw==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyslFFr2zAUhd_3K8x9SoZCbMdxUz-1dBkYUruLXTYopnj2xQQcyZNk2Aj578P2Rp3QyCLuo6R7dM6nK-4BxK8SPIjWm_VDbNS8NL5uw0fjZf3jaXPvB8bkix_F0bfN1PhXkrGaysnnaVdH671kQvIECFCWY5DuUYD3AhYQsIHAAgg4QGAJCYGKswyFYLwpObQCP_8NnklgR6taNtsJgYxxBO8AcidLBA_i9GeJW0xz5HMTCOQo013Z2lR8t0_5n7v_OYBAVKVUeMZsbptmUx3W0jMCRhGSIwFWyzcjIdMCwbOORD_MfVFwLFLJ-Hx5muUhfA7i1234PZpML3rZF73eLGrKeI4c85P7k6M6jXX2NNHz46sfxJM763KaxUkaS78Nlm4b2i7M5s51vRhI1KN3R_fC1qe3temdlt69jn4gUY_-ZjT9Qp9-oU3vtvSr6-gHEvXoV6PpHX16R5u-4Z5dAT4Qpgd--6ED6B2vLYqKUYFng-j9m81mQGFeYDfNBKt5hk-cZa1NtwxbXbuRo5DdqdUtfNodNQH7Yksptk_E1rnYVjsPWC-UakctdsbkXirFrtrZHeN8oxSv1M6rMc636l6ZA99E_cnOvZPjp78BAAD__3Ud7X4=
 
 # Count how many numbers contain the digit 5.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT count(*) FROM NumToStr WHERE str LIKE '%five%']
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF9r2zAUxd_3KcyF0g4UYtmOm-opY2zDbHNGkrKHYYoX3RlDIhlJHhsl333YfqgTGlng-VF_js7hd8R9BiE5pvkRNbAfQIFAAARCIBABgQVkBCol96i1VM2VTpDwP8B8AqWoatNsZwT2UiGwZzClOSAw2OU_D7jBnKOa-0CAo8nLQ2tTqfKYq78rUR-N1EYBgW2VC8282Tzw_eb2x_JgUDFvFXhfks8fvNubX-VvvLlljG13myT9BATWtWFeKgVCdiIga_MSRpu8QGD0RNwDvysKhUVupJovzvO-Xz-mu6fN-vv27u1Vr-Cq14tFLaTiqJCfvZ-d7GnoBb7t49enJN3drej1NOFZGupeFXWtqm1qNo-m62sgdY9QPLqvwJ1Q4EwoagnF0xEaSN0jdD-aUOhOKHQmFLeEltMRGkjdI7QcTShyJxQ5E2rYzCaCMxC4B-fhvw7EV7w2qCspNF4Mxtdf9puBibzAbrpqWas9flNy39p0y3Wrazc4atOd0m6RiO6oCdgXU6s4OBPTS3Fgdx6wDq3qyC6OxuReWMWx3Tke43xvFS_tzssxzg_2rvyBb2L_ZJfe2enNvwAAAP__VPQIrA==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF9r2zAUxd_3KcSF0mQoxHacNNVTSuduZqnT2S4dFFO8-C4YHCuT5LER8t2H7Y0moZENXt705x6dw--KuwX5IwMGgTN3bkNSiIzc-Yt78ux8fZjfuB7pfXCDMPgy75O_JUte5Kr3vl_X5cVacakEefrk-A4pV3P3s0MuL76nP_HiMgIKOU_Qi9cogT2DCRQsoDACCjZQGENEYSP4EqXkoizZVgI3-QXMoJDmm0KVxxGFJRcIbAsqVRkCgzD-lqGPcYJiaACFBFWcZpXNRqTrWPye_csHFIJNnEtGBkPLMMrquzRTKBiZWYeRGWNB6LveR6CwKBQjHs8Roh0FXqjXMFLFKwRm7mj7wDerlcBVrLgYjg_z3i4evfDFXzwFvf5JL-uk16tFkXORoMDk4P1op09jHuELHu9fXC_szczTaUYHacz2rTLbtqrq1GBon69fDan3CE0698tqT8hqTciuCE3OR6gh9R6hq86ERu0JjVoTmlSEpucj1JB6j9C0MyG7PSG7NaGSzeBMcBoC78G5_q8D8Q0vH-WG5xKPBuPbLxvlwMRkhfV0lbwQS3wQfFnZ1NtFpasOEpSqvjXrjZvXV2XAfbGpFVsHYvNYbOmdG6xHWrWtF9tdco-14oneedLF-Uornuqdp12cr_W9Mhq-if6THXtHu3d_AgAA__8x9SVO
 
 #
 # -- Limit tests --
@@ -134,18 +134,18 @@ https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF9r2zAUxd_3KcyF0g4UYt
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT y FROM NumToStr LIMIT 5]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyMjzFLBDEQhXt_xfLqEXcLm1TXHognp51sETfDEdhNwswElCP_XW5TiIVg-b6XvPfmipQDP_uNFe4dE2ZCkbywapYb6g-O4RNuJMRUqt3wTFiyMNwVFm1lOLz5j5XP7APLwwhCYPNx3WOLxM3L1yHVzbKagPBafFI33INwquaGwwTCU9yiDY-YGyFX--lS8xeGmxr9f8-ZteSk_GvKX8ljmwkcLtxv1lxl4RfJy17T5Wn_t4PAat2dujimbrW53X0HAAD__2zZcAY=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyMT0tLMzEU3X-_IpzVJ0TsLLrJqqIVAtOHnVkIJYs4uZTATDLmAZYy_106UcSF4PI87jnnXhDfegg063r90LIcevZ02G3Ycf2yr-_llv1_lE3bPNc37NNyLgaXh-RjCqyWG9mypQKH84a2eqAIcUQFxTEG31GMPlypy2yQ5h1iwWHdmNOVVhydDwRxQbKpJwi0-rWnA2lD4W4BDkNJ236OHYMddDivvvrB0YzaRcFuwbHLSbBVBY7aDjaxJdTE4XP67opJnwiimvjf9xwojt5F-jHlt-TFpDjInKj8HH0OHe2D7-aaAnfz3UwYiqmoVQHSFWlS07-PAAAA__9944W2
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT y FROM NumToStr ORDER BY y LIMIT 5]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyMjzFLBDEQhXt_xfLqEXcLm1TXHognp51sETfDEdhNwswElCP_XW5TiIVg-b6XvPfmipQDP_uNFe4dE2ZCkbywapYb6g-O4RNuJMRUqt3wTFiyMNwVFm1lOLz5j5XP7APLwwhCYPNx3WOLxM3L1yHVzbKagPBafFI33INwquaGwwTCU9yiDY-YGyFX--lS8xeGmxr9f8-ZteSk_GvKX8ljmwkcLtxv1lxl4RfJy17T5Wn_t4PAat2dujimbrW53X0HAAD__2zZcAY=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyMT01Lw0AUvPsrHnNSWLE59LKnqo0QSJua5KCUHNbkUQJJNu4HWEL-uzSriAfB43y8mXkT7HsHiSJO48eSvOnoKc92dIxfDul9sqfrbVKUxXN6Q1-WczAMvnfaOkNZvo1zenilM6XJLilpXUFg0A3vVc8W8ogIlcBodM3WanOhpsWQNB-QK4F2GL270JVArQ1DTnCt6xgSpXrrOGfVsLlbQaBhp9puiR1N2ytz3nxPgUAxqsFKuoVA5p2kTQSBtO1bR2tUs4D27qfLOnViyGgW_9-Tsx31YPnXlL-SV3MlwM2Jw89We1Pzweh6qQkwW-4WomHrghoFkAxBmqv56jMAAP__ahCIpg==
 
 # Test that the correct node is chosen in a reverse scan with multiple spans.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT y FROM NumToStr WHERE y < 1000 OR y > 9000 ORDER BY y DESC LIMIT 5]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyMkDFrwzAQhff-CnFdFWwHMlhT1kBJStqteFCtIxXYOqE7Q0vwfy-yhiaFphnvvfue3ukMgRzu7YgM5g0a0LCBTkNM1CMzpSyXpZ37BFNr8CFOkuVOQ08JwZxBvAwIBva0oljlFIdi_bCszRpokh-IxZ4QzHrWF8HN7eBX-z7gEa3DVNVX8RCTH2362oZpFGJJoOEl2sBGraq2batHZYNTjSL5wGweJjFqmzs--dGL2sBfDZurhv-cfkSOFBjvur2eOw3oTli-l2lKPT4n6pdnynhYuEVwyFLcdRl2oVi54CXc3ITrX3A3P3wHAAD__9mfpyM=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyMUM0Ok0AQvvsUk_HSJtuw1PTAnqotRhJaKpCoqRxWmFQSYHF3SSQN726Aqq2J1eN8f_PNXNF8q1Bg4of-LoVOV_A2jg5w9j-ewtfBERb7IEmT9-ESbpJ-FjRdbZWxGj6882MfFj187jh_lYPLOV9CFP-CCLwbtPdjePMJetj7yQ7C4BCksMmQYaMKOsqaDIozushwgxnDVqucjFF6hK-TKCi-o-AMy6bt7AhnDHOlCcUVbWkrQoFHtVKtM6YUZGVZTbKBoersb5Ox8kIo1gO7C3afB6fyS0UxyYK0wx_isdVlLXW__fkVZJi0sjECVo7nec5LkE0BLij7lUYy6qyA7dgxLOvSwgb_1tB9aPiP02MyrWoM_dftfMgYUnGh-b1GdTqnk1b5tGYeo8k3AQUZO7PreQiamRoL3pvdp2b-hzkbXvwIAAD__-tKysw=
 
 query TTTTT
 EXPLAIN (VERBOSE) SELECT x FROM (SELECT x, 2*x, x+1 FROM NumToSquare)
@@ -161,7 +161,7 @@ scan  ·            ·                    (x)  ·
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x FROM (SELECT x, 2*x, x+1 FROM NumToSquare)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyMj7FOAzEQRHu-IpraiLvWVdo0BAU65MKcV9FJd16zu5ZAkf8d3blAFEgp5409M3tD5kTPcSWFf8eI4FCEJ1Jl2VB_cEpf8IPDnEu1DQeHiYXgb7DZFoLHW_xY6EIxkTwNcEhkcV722CLzGuX7mOtqrJ81CsHhtcSs_vAIh3M1fziOCM2Bq_2WqMUrwY_N3T_kQlo4K_3Z8F_y0IIDpSv1Y5WrTPQiPO01XZ73fztIpNbdsYtT7lYL7eEnAAD__wNFbno=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyMT01L80AYvL-_YplT-7pi43FPFa0QqG1tchDKHtbsQwkku-l-QCTkv0uyinoQPC3zsTPzDPCXBgLFZru5L1l0DXs87p_YafNy2N7lO7Z4yIuyeN4u2YelT4bFJ-Tslv2fnp5dsSyJJrbB-ktUjpYSHMZq2qmWPMQJGSRH52xF3ls3UcNsyHUPseKoTRfDREuOyjqCGBDq0BAESvXa0JGUJnezAoemoOpmju1c3Sr3tv7WDY6iU8YLdg2OfQyCrTPIkcPG8FXigzoTRDbyvw85ku-s8fRjw2_Jq1FykD5TOtbb6Co6OFvNNQnu538zocmHpGYJ5CZJoxz_vQcAAP__tUyKSg==
 
 query TTTTT
 EXPLAIN (VERBOSE) SELECT y, str, repeat('test', y) AS res FROM NumToStr ORDER BY res
@@ -207,4 +207,4 @@ render                    ·            ·                  (y, str, res)  ·
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT count(*) FROM (SELECT 1 AS one FROM NumToSquare WHERE x > 10 ORDER BY xsquared LIMIT 10)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkcFKw0AQhu8-RZmT4kqy6W1PFU8FaaSteJAgazKEhWYnzs6CUvLukuxBKzTY4_yz3_8N7BE8NbixHQYwr6ChUtAz1RgC8RilB-vmE0yuwPk-yhhXCmpiBHMEcXJAMLC37wfcom2QsxwUNCjWHabanl1n-WvlYycUPqJlBAW73vpgFpnWd1ANCijKT3sQ2yIYPaj_X7AjFuRMn8pXxS0oKKOYxYb8KH50nZOFzs9ai0us923L2FohzopT80P5vNm_bcuX3fXNWdfyEtcWQ08-4InnXHM-VAqwaTH9Y6DINT4x1ZMmjeXETUGDQdJWp2Ht02o88DesZ-FiHi5m4eUfuBquvgMAAP__S87dgw==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkU1r20AQhu_9FcOc7HaLtfJtT3ETlQoUK5VU0pKKspUGIZB3lf0AF-P_XqQNNC7YxMd9533mGdgD2ucBBZZJltxW4M0An4v8Hp6S7w_ZJt3C4i4tq_JrtoSXSqO9cov3y9BbvKQcNiVoRSFVfue0ffbSEDx-SYoE9vDTR9GagEeQF3dJAZ9-wD5UWsjS-7QCHi1rZKh0S1u5I4viCTnWDEejG7JWmyk6zIW03aOIGPZq9G6Ka4aNNoTigK53A6HASv4eqCDZkllFyLAlJ_thXjuafifNn5tXhyLDcpTKClhx_hHrI0Pt3b_t1smOUPAje_sFpTaOzIqfym_iD8gw907AVqtJnPW73gGPzlrja6ybrjPUSafNKj413-bfttWvIn8sF8uzrvU1roLsqJWlE8-5zdGxZkhtR-EfrfamoQejm1kTnvnMzUFL1oUpD49UhdF04GuYX4Tjy3B8EV7_B9fHd38DAAD__wAHBz4=
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_ordinality b/pkg/sql/opt/exec/execbuilder/testdata/distsql_ordinality
index 290dca84106d..aa70052b931c 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_ordinality
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_ordinality
@@ -43,4 +43,4 @@ ordinality  ·            ·            (x, y, z, "ordinality")  ·
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x, y, z, ordinality FROM xyz WITH ORDINALITY]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkL1q7DAQhfv7FMup57KWk0qV223isEkXVCjWsAi8kpDGsM7idw-2ivxAwqacM_q-OeiKEB0_2DMX6BcoGELKceBSYl6j-uDgLtANwYc0yRobwhAzQ18hXkaGxrN9HfnI1nHeNyA4FuvHTZuyP9s8d5f5DYSnZEPRu_8g9JPoXddSd0fdPcxCiJN8nChiTwytFrq9Rp-dD3b0Mu_VlxY_2du_2I9cUgyFbzI3iyGwO3H9yBKnPPBjjsN2po79xm2B4yJ1q-pwCHW1FvwMq1_h9htsln_vAQAA__8bbaAd
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkE9Lw0AQxe9-imVOCiNtqqc9pdiKC7GpSUClzWHNDiWQZuPuBpKWfHdJIv4DpR7nzfzee7tHsK8FcIiXwfImYbUp2G0U3rPN8mkdzMWKnS9EnMQPwQV7P2mQtcgOyLagjcpLWeSu3cKINe2BPYrkjoXRQqzmgUieU0AotaKV3JMFvgEPUoTK6Iys1aaXjsOBUA3wKUJeVrXr5RQh04aAH8HlriDgkMiXgiKSisxkCgiKnMyLwbYy-V6a1m_aAyDElSwtZ5eAENaOM3-G_hX615B2CLp2nxHWyR0B9zo8vUb48fCJ963Fb-6z_7hHZCtdWjrJedqlCKR2NH6k1bXJaG10NsSMYzhwg6DIunHrjYMox1Vf8Cvs_QnPfsBpd_YWAAD__zocvUQ=
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_union b/pkg/sql/opt/exec/execbuilder/testdata/distsql_union
index 8957316e4c1d..6b18d959bfcb 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_union
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_union
@@ -34,53 +34,53 @@ subtest Union
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x FROM xyz UNION ALL SELECT x FROM xyz ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lk9vozAQxe_7Kaq5rhEZY_KHU669tKt2b6sc2DCqIqUY2Y7UbpXvvgKE2kTN2CbkCPS9-fnNU50PqHVFD-UrWSj-AIIACQIyEKBAQA4bAY3RW7JWm_ZPesF99QbFTMCubg6ufb0RsNWGoPgAt3N7ggJ-l3_39ERlRSadgYCKXLnbd2Mas3stzfv67f0fCHhuytoWd0naTn48uOJujbA5CtAH92lvXflCUOBRjEPIJ0OQMQjP2jgyKZ4lsMafF_2zMf75FP6fttpUZKj6zvQbiAed6CaVp2e8NF6djMfwDWLABlOZpFl0jSIg5hNCyBiIYdE4dtGB_vOx_jI8RBkSYpakKnqTERCLCSFkDMSQtLxR0oP_Yqx_Fh5iFhKiSrr_vnGbjIBYTgghYyCGpLMbJT34L8f6q_AQVUiIeRK9xwiE1WQIMgZhSFndKOXBf3WjnwBPZBtdWwq6fWft_U3VC_X3vdUHs6VfRm-7Mf3jY6frXlRkXf9V9g_3df-pBfwqRlac8WLJitWJGM_F2TVixZ8Zee6cVS948ZwVL3nx4ppDL68Rr1gxehJDvmToaxlfMw86XtUz5IuGuQedrxrOPXK-az52vmw-Nd82XHnQ-b7JmUfON87DLvnCnas3xx__AwAA__-BxeXG
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0ll9v2jAUxd_3Kaz7tGmOgp2EP3miW5mExKADJm2qeMiIVSFRnDlBgiK--5RkUQui13YIj0l8jn8-9whzgPTvGkKYDUaDr3OyVWvybTr5Th4Hvx5Gd8Mx-Xg_nM1nP0afyP8lu3LBbv9Cfo6HkzG5G40ufJtM7wdT8uU32S2AwkbGYhw9ixTCR2BAgQMFDyj4QCGABYVEyaVIU6nyJYdCMIx3ELYorDbJNstfLygspRIQHiBbZWsBIcyjP2sxFVEslNsCCrHIotW62CZRq-dI7fu7_QtQmCXRJg2J4-Y7T7ZZSPoMFkcKcpu92qdZ9CQgZEdaDyFoDIHbIMykyoRy2VkCffb5XX-vjn_QhP-rrVSxUCK-ZHoBYiwdmbj89Izvbe-fbM_MJ8gMJuhyx_Wsa2QB0W4QgttAVINmdQdt6N-u68_NQ-QmIXqO61tP0gKi0yAEt4GokuY3Srry79T198xD9ExC9J3i19dukhYQ3QYhuA1ElbR3o6Qr_25df988RN8kxMCxnqMFQq8xBG6DUKXs3yjlyr93o78AU5EmcpMKo9u3ld_fIn4S5X2fyq1aigcll8U25eOk0BUvYpFm5VdePgw35acc8K2YoWIPF3NU7J-I2bnYu0bs42dmOHeAqju4uI2Ku7i4c82hu9eIe6iYaRJjeMmYrmV4zTTo7KqeMbxoLNCg41VjbY0c75qOHS-bTo23jfU06HjfeEsjxxunYed44c7Vi-OHfwEAAP__HtgCVw==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x FROM xyz UNION SELECT x FROM xyz ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslkFvozAQhe_7K6q5riMyNiQNpx720st21e5tlQMbRhVSipFtpHar_PcVIKUlasY2cATnzZsv7wn5HWpd0s_ihSzkfwBBgAQBCgSkICCDvYDG6ANZq033k0FwX75CvhZQ1U3rutd7AQdtCPJ3cJU7EuTwu_h7pEcqSjLJGgSU5Irq2Ns0pnopzNvd69s_EPDUFLXNb1ZJ5_zQuvzmDmF_EqBb9zHeuuKZIMeTCF_hR2VdVR9cko39mfkyZv5nRFyOUU1ixHDI9KrBx9y21qYkQ-Vo6v7ErSDXwStkMYxP2jgyicTL8d-vzt-M5mNEjgExJnKVqOiyepY4_4ubiWWNgVySUk2ixHDMcV1lOKYMoVSrJI3O0rPEmXI7McsISFySUk2ixHDMcZYqHFOFUKar_lMfl6VniTPl7cQsIyBxSUo1iRLDMcdZpuGYaQhltopO0rPCmXE3MckIRFyOUU1ixHDI69eBLwweyTa6tnRxLfh68rq7LlD5TMPdwurWHOiX0YfeZnh86HX9i5KsG05xeLivh6Nuwc9iZMXpSIyXYsmKFe-s5jinrDjjnTNWLCWv3rDqLS_ezoG-ZcU73nk3xxk9HfOVbFbLkK8ZenqGs4qGfNPQUzXku-Yz57uGnrLhrLYhXzf09A1nFU7yhZOewsm4wu1P3_4HAAD__6taIWc=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJysll-L2kAUxd_7KcJ9aulIvDOJrnnatloQrG7VQsuSh9QMS8BN7GQCuuJ3LyaLuxGdP4mPSebcc3-eg8we8n9rCGAxmoy-LZ1CrJ3v89kP53H0-2HyZTx1Pg7Hi-Xi5-ST83pkWx3Y7l6cX9PxbHrh_Ww-HM2dr3-cbQgE0izm0-iZ5xA8AgIBCgQYEPCAgA8hgY3IVjzPM3E8si8F43gLQZdAkm4KeXwdElhlgkOwB5nINYcAltHfNZ_zKObC7QKBmMsoWZc2G5E8R2J3v929AIHFJkrzwOm4R-dZIQPnHiE8EMgK-TY-l9EThwAPxHyFYZLLJF1J16_7K-ZTm_nvEfF2jKwRI5pDelcN3uYWaSZiLnhcmxoeVCvQrvEKvg3jIhOSC5fi-fjPV-f3avPRIkeDGF3acZl1WTVLnH7FXsOy2kDekpI1okRzzHpdqTkmNaFkHdezzlKzxImy3zBLC0i8JSVrRInmmPUsmTkmM6H0OuVfvV2WmiVOlHcNs7SAxFtSskaUaI5Zz9Izx_RMKP2OdZKaFU6Mg4ZJWiDi7RhZI0Y0h7x-HbhgMOf5JktzfnYtuDy5e7wu8PiJV3eLPCvEij-IbFXaVI-zUle-iHkuq69YPYzT6tNxwfdiVIq9mhjPxVQpZmpn1sbZU4p9tbOvFFOqVveU6r5a3G8DfacUD9TOgzbOqOmYrmStWobqmqGmZ9iqaKhuGmqqhuqu6czVXUNN2bBV21BdN9T0DVsVjqoLRzWFo3aFCw8f_gcAAP__so088A==
 
 # UNION with no overlap.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x FROM xyz WHERE x < 3 UNION SELECT x FROM xyz WHERE x >= 3 ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslk1r4zAQhu_7K8JcV8Eeyc6HYKGHZSGXdml7283Baw_FkFpBkqHdkv9eHENah0aSrRxj95139PiB6g0aVdFt8UwG5B9AYMCBgQAGGTDIYctgr1VJxijd_Ukf2FQvIFMGdbNvbfd4y6BUmkC-ga3tjkDCY_FvR_dUVKSTFBhUZIt6d6zZ6_q50K83L6__gcHDvmiMnM2TrvlXvbOk5ewGZ3_bNBXlTEgpN7ePK2Bw19ruDWwPDFRrP7qNLZ4IJB5Y-H4_a2PrprRJPlzOMZ-Pmf_5_DgdAP0YQ0BMIoDhCLKLBR9z20bpijRVg6nbg2sFngavkI8544PSlnTC8Xz894vzF4P5OOIrB3zkhM8TcV3PPRueEC8mej6GQAyCGNNDGWA4hKHpPBwCD2Eg5kl2XQ08G54QLCdqMIIAxiCI0SCUAYZDGGogwiGIEAbZ_Pjv54oaeDY8IVhN1GAEAYxBEKNBKAMMhzDUIAuHkIUwyOfXlcCz3wnAeqIEI86P0wHEKBBKAMMRXL76fFFwT2avGkNnV6CvJ6fd1YiqJ-rvUUa1uqTfWpXHmv7n3TF3fFCRsf1b7H9smv5Vt-DnMDrD2SCM52HuDAt3s4hpzpzh3N2cO8Ocu9MLZ3rpDi9jDr1yhtfu5nVMM3oc80kWZRm6NUOPZxglGrpNQ49q6HbNV-52DT2yYZRt6NYNPb5hlHDcLRz3CMfHCbc9fHsPAAD__4-gb1o=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyslt9q2zAUh-_3FOJcbUzBObLTP4ZBtzVlgS7pnIxtdL7wbFEMrp3JMrgtefdhe6R1aSXZymUs_c45-vRB9ADl3wx8WM8v5583pBIZuQhWX8n1_OfV5cfFkrw9X6w362-X78j_LXW3ob67Jz--zIM5qcnvajp1Y-KS78vFaqnbyD8Ql6yC83lAPv0idQgU8iLhy-iWl-BfAwIFBhRcoOABhRmEFLaiiHlZFqLZ8tAGFkkN_pRCmm8r2XwOKcSF4OA_gExlxsGHTfQn4wGPEi6cKVBIuIzSrG2zFeltJO7O6rt7oLDeRnnpk4nTdL5IM8mFT85wfzTf9xfLzQlQWFWyWYFwR6Go5GPvUkY3HHzcUfP5ztNSpnksnVl_OEV9NqT-0_PjeADNlZkTcEcRQHME3qsNHutWeSESLnjSqxruVCOwqfEIsyFnXBdCcuEwfF7-_av1j3r1ccAtG1yywyaOe1jPNRPuER-N9HwIARsENqabMkBzCH3TmTkEZsLAnTjeYTXQTLhHcDxSgwEE0AaBjQamDNAcQl8D1xyCa8LAm7R_PwfUQDPhHsHJSA0GEEAbBDYamDJAcwh9DTxzCJ4Jg9nksBJo5tsDOB0pwYDz43gANgqYEkBzBK8_fV5oEPByW-Qlf_YEernytHka8eSGd--osqhEzK9EEbdtup-rNtd-SHgpu1XsfizybqkZ8GkYlWGvF8bnYaYMu-rOrk1nTxmeqTvPlGHG1OkjZfpYHT62OfSJMnyq7nxq0xk1jukks7IM1ZqhxjO0Eg3VpqFGNVS7pmuudg01sqGVbajWDTW-oZVwTC0c0wjHhgkX7t78CwAA__9_SZP8
 
 # UNION with partial overlap.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x FROM xyz WHERE x <= 4 UNION SELECT x FROM xyz WHERE x > 1 ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslk1r4zAQhu_7K8JcV8Ee2c6HYKGHZSGXdml7283Baw_FkFpGkqHdkv9ebENah0aSrRxt5513_PiB6A1qWdJt_kwaxB9AYMCBQQIMUmCQwZ5Bo2RBWkvV_WQI7MoXEDGDqm5a093eMyikIhBvYCpzIBDwmP870D3lJakoBgYlmbw69DWNqp5z9Xrz8vofGDw0ea3FYhl1zb-qgyElFje4-NvGcVL8WKRCiN3t4wYY3LWmewT7IwPZmo9ybfInAoFH5r_gz0qbqi5MlI23s8znU-Z_BoDzCdAC_QEkswCgP4H0YsHH3LaWqiRF5Wjq_mhbgcfeK2RT3vFBKkMq4ng-_vvF-avRfJzwkT2-ccSXUXJlzx0rnhivZno-BUEIgwDTfRGgP4Ox6dyfAfdBkCyj9MoaOFY8MVjP1GACAgxhEKCBLwL0ZzDWIPFnkPggSJf9v881NXCseGKwmanBBAQYwiBAA18E6M9grEHqzyD1QZAtryyBY8ETge1MCSYAwPkEAhTwBYD-BC4ffb4ouCfdyFrT2RHo68lxdzSi8omGc5SWrSrot5JFXzNc3vW5_kZJ2gxPcbjY1cOjbsHPYbSG01EYz8PcGk7szUlIc2oNZ_bmzBrm3J5eWdNre3gd8tIba3hrb96GNKPDMZdkQZahXTN0eIZBoqHdNHSohnbXXOV219AhGwbZhnbd0OEbBgnH7cJxh3B8mnD747f3AAAA___-6W9V
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyslt9umzAUh-_3FNa52jRH5BjSP0iTuq2pFqlLOpJpmzouGFgVEoXMGIm2yrtPwJSWqrUNziXYv3OOPz4JP0D5NwMf1vPL-ecNqURGLoLVV3I9_3l1-XGxJG_PF-vN-tvlO_J_S91tqO_uyY8v82BOavK7mk7d-APxyPflYrXU7eQEySo4nwfk0y9Sh0AhLxK-jG55Cf41IFBgQMEFCh5QmEFIYSuKmJdlIZotD21gkdTgTymk-baSzeuQQlwIDv4DyFRmHHzYRH8yHvAo4cKZAoWEyyjN2jZbkd5G4u6svrsHCuttlJc-mThN54s0k1z45Awfj-b7_mK5OQEKq0o2SxDuKBSVfGxeyuiGg487aj7geVrKNI-lM-tPp6jPhtR_CgDHE-AEzQG4owCgOQHv1QaPdau8EAkXPOlVDXeqEdjUeITZkDOuCyG5cBg-L__-1fpHvfo44CMbfGOHTRz3wJ5rRtwzPhrp-RAENgwsTDdFgOYM-qYzcwbMBIE7cbwDa6AZcc_geKQGAxCgDQMLDUwRoDmDvgauOQPXBIE3af8-h9RAM-KewclIDQYgQBsGFhqYIkBzBn0NPHMGngmC2eTAEmgG3BM4HSnBAAA4noCFAqYA0JzA61efFxoEvNwWecmfXYFerjxtrkY8ueHdPaosKhHzK1HEbZvucdXm2hcJL2W3it3DIu-WmgGfhlEZ9nphfB5myrCr7uzadPaU4Zm680wZZkydPlKmj9XhY5tDnyjDp-rOpzadUeOYTjIry1CtGWo8QyvRUG0aalRDtWu65mrXUCMbWtmGat1Q4xtaCcfUwjGNcGyYcOHuzb8AAAD__9wdk_Y=
 
 # UNION ALL with swapped column orders.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x, y FROM xyz UNION ALL SELECT y, x from xyz]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyklE2PqjAUhvf3V5izLoEW8IMVWzd64727CQuGnhgSpaQtiY7hv0-AhaPRSQ9d0vbJ--RtOTdolMRdeUYD2QdwYCCAQQwMEmCQQsGg1apCY5QejkzAVl4gixjUTdvZYblgUCmNkN3A1vaEkMH_8vOEBywl6jACBhJtWZ_GmFbX51Jf88v1Cxj8a8vGZIsgHJL3nc0WOWe5gKJnoDp7TzC2PCJkvGfzLFKihWA5f2sh3lrcw7tGaYka5UNw0b_w3KlAtSGPnk6-zo4fsrl7A9yhgVAEYTznJggeS7IH4S6Eu4dw8YiDMJnTB8FjRfYg9BG7e8QuHkkw_knkPggea7IHoY_E3SNx8UiDOW0QLDZEi5lz64XFAU2rGoNOUyka5hrKI05D0KhOV_hXq2qMmT73IzcuSDR22hXTx7YZt8aafsLcBxa_wpw_0NEzHftEJz5w6gMvfeCVD7z2gTder4T2xor-z3cAAAD__18c6HE=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyklF-Lm0AUxd_7KYb71MIVndHsH5-ytCkI1myTFAqLDzZeloDr2BkF3ZDvXtS22yzZMqOPM_cezo8zd-4R9M8CQtiu4tXHHWtUwT5v1l_Yw-r7fXwXJez9p2i7236NP7DfLS2ybuxpu2f2LYnWCbuL4z_lDln7t5wCQilzSrIn0hA-AAcEAQg-IASAsIAUoVJyT1pL1bccB0GUtxB6CIeyaur-OkXYS0UQHqE-1AVBCLvsR0EbynJSrgcIOdXZoRhsKnV4ylS3bLtnQNhWWalD5ri987qpQ7bkuBSQnhBkU7846Dp7JAj5CadRLCwpBC75mxTiTYoX86aUKidF-ZlxerrAmUhHVi73XnVe9vbPvLl5AtwgAVc4rj_lJSw4rqw5LN5CmHMIEw7fcYMpeVhwXFtzWOThm3P4JhyBM_wk6zwsOG6sOSzyCMw5AhOOhTMlDQuKW0uKiXvrAsWGdCVLTUZbyev3GuWPNC5BLRu1p3sl94PNeFwPuuEiJ12PVTEeonIoDTH9K-ZzxOK_Ys7P1N5rtT_HOpgjXswRX80RX88R38wR386aErsZS0_vfgUAAP__Or0DnQ==
 
 # UNION ALL and UNION with different ORDER BY types.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) UNION ALL (SELECT x FROM xyz ORDER BY z) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lk9vozAQxe_7Kaq5rhEZY_KHU669tKt2b6sc2DCqIqUY2Y7UbpXvvgKE2kTN2CbkCPS9-fnNU50PqHVFD-UrWSj-AIIACQIyEKBAQA4bAY3RW7JWm_ZPesF99QbFTMCubg6ufb0RsNWGoPgAt3N7ggJ-l3_39ERlRSadgYCKXLnbd2Mas3stzfv67f0fCHhuytoWd0naTn48uOJujbA5CtAH92lvXflCUOBRjEPIJ0OQMQjP2jgyKZ4lsMafF_2zMf75FP6fttpUZKj6zvQbiAed6CaVp2e8NF6djMfwDWLABlOZpFl0jSIg5hNCyBiIYdE4dtGB_vOx_jI8RBkSYpakKnqTERCLCSFkDMSQtLxR0oP_Yqx_Fh5iFhKiSrr_vnGbjIBYTgghYyCGpLMbJT34L8f6q_AQVUiIeRK9xwiE1WQIMgZhSFndKOXBf3WjnwBPZBtdWwq6fWft_U3VC_X3vdUHs6VfRm-7Mf3jY6frXlRkXf9V9g_3df-pBfwqRlac8WLJitWJGM_F2TVixZ8Zee6cVS948ZwVL3nx4ppDL68Rr1gxehJDvmToaxlfMw86XtUz5IuGuQedrxrOPXK-az52vmw-Nd82XHnQ-b7JmUfON87DLvnCnas3xx__AwAA__-BxeXG
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0ll1v2j4Yxe__n8J6ror-joKdhJdc0a1MQmLQAZM2VVxkxKqQKM6cIPEivvtEsoiB2sd2CHdN4nP883mOag6Q_l5BCNP-sP95RjZqRb5Mxl_JS__H8_BxMCIPT4PpbPpt2CAPf9dsixXb3Z6MJ0_9Cfn0k-wa5PtoMB6Rx-EQXbhvnP_ezoHCWsZiFL2JFMIXYECBAwUPKPhAIYA5hUTJhUhTqU5LDrlgEG8hbFJYrpNNdno9p7CQSkB4gGyZrQSEMIt-rcRERLFQbhMoxCKLlqt8m0Qt3yK16213e6AwTaJ1GhLHPe083mQh6TGYHynITXa2T7PoVUDIjrQaQlAbArdBmEqVCeWyqwR67P8P_b0q_kEd_mdbqWKhRPye6TsQI-nIxOWXZ_xoe_9ie2Y-QWYwQZc7rmddIwuIVo0Q3AaiHDSrOmhD_1ZVf24eIjcJ0XNc33qSFhDtGiG4DUSZNL9T0qV_u6q_Zx6iZxKi7-T_fe0maQHRqRGC20CUSXt3Srr071T1981D9E1CDBzrOVogdGtD4DYIZcr-nVIu_bt3-gkwEWki16kwun2bp_tbxK-iuO9TuVEL8azkIt-meBznuvxFLNKs-MqLh8G6-HQC_FfMULGHizkq9i_E7Frs3SL28TMznDtA1W1c3ELFHVzcvuXQnVvEXVTMNIkxvGRM1zK8Zhp0dlPPGF40FmjQ8aqxlkaOd03HjpdNp8bbxroadLxvvKmR443TsHO8cNfq-fG_PwEAAP__epsI2g==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) UNION (SELECT x FROM xyz ORDER BY z) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyslkFvozAQhe_7K6q5riMyNiQNpx720st21e5tlQMbRhVSipFtpHar_PcVIKUlasY2cATnzZsv7wn5HWpd0s_ihSzkfwBBgAQBCgSkICCDvYDG6ANZq033k0FwX75CvhZQ1U3rutd7AQdtCPJ3cJU7EuTwu_h7pEcqSjLJGgSU5Irq2Ns0pnopzNvd69s_EPDUFLXNb1ZJ5_zQuvzmDmF_EqBb9zHeuuKZIMeTCF_hR2VdVR9cko39mfkyZv5nRFyOUU1ixHDI9KrBx9y21qYkQ-Vo6v7ErSDXwStkMYxP2jgyicTL8d-vzt-M5mNEjgExJnKVqOiyepY4_4ubiWWNgVySUk2ixHDMcV1lOKYMoVSrJI3O0rPEmXI7McsISFySUk2ixHDMcZYqHFOFUKar_lMfl6VniTPl7cQsIyBxSUo1iRLDMcdZpuGYaQhltopO0rPCmXE3MckIRFyOUU1ixHDI69eBLwweyTa6tnRxLfh68rq7LlD5TMPdwurWHOiX0YfeZnh86HX9i5KsG05xeLivh6Nuwc9iZMXpSIyXYsmKFe-s5jinrDjjnTNWLCWv3rDqLS_ezoG-ZcU73nk3xxk9HfOVbFbLkK8ZenqGs4qGfNPQUzXku-Yz57uGnrLhrLYhXzf09A1nFU7yhZOewsm4wu1P3_4HAAD__6taIWc=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyslk1v2kwUhffvr7DuKtE7yNwZOwSv0hYqIVFIgUqtIi9cPIosEZuOxxIf4r9X2BXEKMyHzS6259xzn5wjNHvI_6wggPlwPPyycAqxcr7Opt-cl-HP5_Gn0cS5G4zmi_n38b1z9-_Mpjqx2e6c6WwwnDmffznbe-fHZDSdKA_t7s9_b0IgkGYxn0RvPIfgBRAIUCDAgIAHBHwICaxFtuR5nonjkX0pGMUbCLoEknRdyOPrkMAyExyCPchErjgEsIh-r_iMRzEXbhcIxFxGyaq0WYvkLRLbp812BwTm6yjNA6fjHp2nhQycJ4TwQCAr5Hl8LqNXDgEeiPkKgySXSbqUrl_3V8ynNvPfI-LtGFkjRjSH9K4anOcWaSZiLnhcmxoeVCvQrvEKvg3jPBOSC5fi5fj_r85_qM1HixwNYnRpx2XWZdUscfovPjQsqw3kLSlZI0o0x6zXlZpjUhNK1nE96yw1S5woew2ztIDEW1KyRpRojlnPkpljMhNKr1P-1NtlqVniRPnYMEsLSLwlJWtEieaY9Sw9c0zPhNLvWCepWeHE2G-YpAUi3o6RNWJEc8jr14EPDGY8X2dpzi-uBR9P7h6vCzx-5dXdIs8KseTPIluWNtXjtNSVL2Key-orVg-jtPp0XPC9GJVirybGSzFVipnambVx9pRiX-3sK8WUqtUPSnVPLe61gX5Uivtq534bZ9R0TFeyVi1Ddc1Q0zNsVTRUNw01VUN113Tm6q6hpmzYqm2orhtq-oatCkfVhaOawlG7woWH__4GAAD__1T2Q3M=
 
 # UNION ALL with conflicting numbers of ORDER BY columns.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) UNION ALL (SELECT x FROM xyz ORDER BY y, z) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lk9vozAQxe_7Kaq5rhEZY_KHU669tKt2b6sc2DCqIqUY2Y7UbpXvvgKE2kTN2CbkCPS9-fnNU50PqHVFD-UrWSj-AIIACQIyEKBAQA4bAY3RW7JWm_ZPesF99QbFTMCubg6ufb0RsNWGoPgAt3N7ggJ-l3_39ERlRSadgYCKXLnbd2Mas3stzfv67f0fCHhuytoWd0naTn48uOJujbA5CtAH92lvXflCUOBRjEPIJ0OQMQjP2jgyKZ4lsMafF_2zMf75FP6fttpUZKj6zvQbiAed6CaVp2e8NF6djMfwDWLABlOZpFl0jSIg5hNCyBiIYdE4dtGB_vOx_jI8RBkSYpakKnqTERCLCSFkDMSQtLxR0oP_Yqx_Fh5iFhKiSrr_vnGbjIBYTgghYyCGpLMbJT34L8f6q_AQVUiIeRK9xwiE1WQIMgZhSFndKOXBf3WjnwBPZBtdWwq6fWft_U3VC_X3vdUHs6VfRm-7Mf3jY6frXlRkXf9V9g_3df-pBfwqRlac8WLJitWJGM_F2TVixZ8Zee6cVS948ZwVL3nx4ppDL68Rr1gxehJDvmToaxlfMw86XtUz5IuGuQedrxrOPXK-az52vmw-Nd82XHnQ-b7JmUfON87DLvnCnas3xx__AwAA__-BxeXG
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lk2P2jwUhffvr7DuatDrKNhJ-MiKaYdKSBSmQKVWIxYpsUZIDE6dIPEh_ntF0oiCZq7tEJZJfI4fn3uEOUD6ewUhTPvD_ucZ2agV-TIZfyUv_R_Pw8fBiDw8Daaz6bdhgzz8XbMtVmx3ezKePPUn5NNPsmuQ76PBeEQeh0N8ISX7xvlxOwcKaxmLUfQmUghfgAEFDhQ8oOADhQDmFBIlFyJNpTotOeSCQbyFsElhuU422en1nMJCKgHhAbJlthIQwiz6tRITEcVCuU2gEIssWq7ybRK1fIvUrrfd7YHCNInWaUgc97TzeJOFpMdgfqQgN9nZPs2iVwEhO9JqCEFtCNwGYSpVJpTLrhLosf8_9Peq-Ad1-J9tpYqFEvF7pu9AjKQjE5dfnvGj7f2L7Zn5BJnBBF3uuJ51jSwgWjVCcBuIctCs6qAN_VtV_bl5iNwkRM9xfetJWkC0a4TgNhBl0vxOSZf-7ar-nnmInkmIvpP_-tpN0gKiUyMEt4Eok_bulHTp36nq75uH6JuEGDjWc7RA6NaGwG0QypT9O6Vc-nfv9BdgItJErlNhdPs2T_e3iF9Fcd-ncqMW4lnJRb5N8TjOdfmLWKRZ8ZUXD4N18ekE-K-YoWIPF3NU7F-I2bXYu0Xs42dmOHeAqtu4uIWKO7i4fcuhO7eIu6iYaRJjeMmYrmV4zTTo7KaeMbxoLNCg41VjLY0c75qOHS-bTo23jXU16HjfeFMjxxunYed44a7V8-N_fwIAAP__gCgJnw==
 
 # Only one distinct processor should be used in the single node UNION case.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) VALUES (1), (2) UNION VALUES (2), (3)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJykkTFLBDEQhXt_xTF1YJO9LpWFzTUqtrJFSIYjEDNLZiLCsf9dNinOE09Wr8zM--a9R06QKeCje0MG-woGJgVzIY_MVNZRFxzCB1itIOa5yjqeFHgqCPYEEiUhWEjkXdq9u1SRd3rQoCCguJiaflFAVc40izsiWLOofzqYwWxyGK86nA_XTCVgwfDt4g8ZHiJLzF6G8UIL9wauJdj_peML8kyZcVM3vSbEcMReh6kWj8-FfLPpz6fGtUFAlr4d--OQ26p9wlfY3AKPv8L7C1gv03L3GQAA___qN9W_
+https://cockroachdb.github.io/distsqlplan/decode.html#eJykkc9q8zAQxO_fU4g9xSCI5dx0-kLjgsF10jgpheCDkZZgUKVUf0oh-N2LZWia0pS0PWp2fzsz6AjuWQGHOi_zmw0JVpHb9fKO7PLHVTkvKjJZFPWmvi8T8jAvt3lNJiyhZJIlZFsVy-pdzQZ1ljRAQRuJVfuEDvgOGDQUDtYIdM7YQTrGhUK-Ak8pdPoQ_CA3FISxCPwIvvMKgYMyolXkpVUBHUmnKVCQ6NtOxf2eggn-RDvf7hE46-kvHdiUXeWQXXQ4HQ7aWIkW5aeLX2RYdM53WvhpdrYL_xlcSjD7Scc1uoPRDq_qlg4JUe5xrONMsAJX1ohoMz6XkYuCROfHaTY-Ch1H8RM-wuwvcPYtPDuD077p_70FAAD__6Ke6m8=
 
 subtest Intersect
 
@@ -88,100 +88,100 @@ subtest Intersect
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz) INTERSECT ALL (SELECT y FROM xyz) ORDER BY y]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll9v2jwUxu_fT4HO1TvNKLGT8CfSJKap0ipV7VS4m3KREq8gURI5QSqr-O4TUNYlIX5i0vpuDH72k3N-pycvtE4TeRs_yZzCn8SJkSBGHjHyiVFAEaNMpXOZ56na_-QIXCfPFLqMlutsU-z_O2I0T5Wk8IWKZbGSFNIsfljJexknUjkuMUpkES9Xh2sytXyK1XbyvP1NjKZZvM7DXt_Z33y3KcLeRFC0Y5Ruitfj30592PYWcb4onzfhFO0iRnkRP0oK-Y5dFjOwGlM0xnw7Z7NOVSKVTEonRXsS_eTMs36P88VUFneZwysdmW0zGfaub2dX99Orb7Pe15sbYrSSv4r_J_zTF7V8XBz-9ffReeXR3x7LM6n-NFWFVA4PqpX63Hi-36Js5yryeuiZELdpP80c4VZrfPb6oHQ9by8XbyGXI_qO9yFTYBB0YDmoaAxqYQ64pTkA9T_NweDSORDt-yva9NfrO_6HiGgQdGg5qGgMakFEYUlEUP-TiMNLRfTa99dr01-_f1jL7y-iQdCR5aCiMagFET1LIoL6n0QcXSqi376_fpv-Bv0P0dAg5thqTNEY04KEviUJQfVPEo7f4_X0zPn3Ms_SdS5bvXm6-5rJ5FEee5CnGzWXP1Q6P1xz_Hh34A6vG4nMi-O34vjhen38ah-wPTzsAnPeiQ460WM9zQ1qJszgYRe4UjNTOuhEj_W0qNLuv7RXgt0q7GlhX98tXwsLrr866DIfehjMhx5G8wFoMB-ABvMx6DIfehjMhx5G8wFoMB-ABvMx1Fo60ks66jIf4y6G62FguB5GhgMaGA5otAFM1mb9L6nJ3jSl4RIw2pzGONCc17ZISVUu9KJz_RoBpvPaHjFRHdDAdUAj2REObEc40r22Q41019NIdz0NdQc40h3gSPfaIi3rPgC613aKke61nWKku55GuutpqDvAke4AR7rX9qmR7noa6a6noe4AR7oDHOle26rld21Xr7uo7Rat7tHuvz8BAAD__yMtXoc=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt9u2jAUh-_3FNG5ajWjYCfhT6RJdCvTkBh0hItNVS5S4hUkSjInSE0r3n1KKOuSgE9M2twV8Gf_cvydnjxD9GcNNjjD8fDLXNuKtfZ1Nv2u3Q5_3oyvRhPt4nrkzJ0f40vt4mVNsl_xmDxdaqPJfDhz0m-vxuOjK6az6-FM-_xLS1wgsAl8PvEeeAT2LVAgwICAAQRMIGCBSyAUwYJHUSDSJc8ZMPIfwW4TWG3CbZx-7RJYBIKD_QzxKl5zsGHu3a35jHs-F3obCPg89lbr7JhQrB48kQwekycg4ITeJrK1lp6ePN3GtjZg4O4IBNv4ZfvXXe8SbelFy_x-AwruziUQxd49B5vuyHkxrUZjspMxX_fZbgLhc8H93E5uSmJLjjzrNy9aOjyehjot3Mg8CbmddwcIrPnv-GJALz-J1f0y--vfo9PCo78-lqFSfScQMRc6tYqV-nhyf7NC2Y5V5GXTIyEmQSsIddYu1vjo8VbueFpdLlpBLp21dONdukAhaKfhoOxk0Ab6gDbUB0j9D33QObcPWPX7ZVXu12jp5ruIqBC023BQdjJoAyKyhkRE6n8QsXuuiEb1-zWq3K_Zysby24uoELTXcFB2MmgDIhoNiYjU_yBi71wRzer3a1a5X6v1LhoqxOw3GpOdjNmAhGZDEiLVP0jYf4vX0yP7z3gUBpuIV3rzbKc14_49399BFGzFgt-IYJEds_84zbjsdcPnUbz_le0_jDb7n9KA1eFuHZjSWrRVi-7LaapQM6YGd-vAhZqp0lYtui-nWZFu_08bObhdhA0pbMpvy5TCjMqPtur0hxxG-kMOY_2B0Eh_IDTSH506_SGHkf6Qw1h_IDTSHwiN9EdXamlPLmmvTn_06xguhxHD5TBmOEIjhiM0NgFUxmb5P6nK3FSl0SGgNDmVcURzWpoiOVUpk4tO5WMEMZ2W5oiK6giNuI7QmOwYjtiO4ZjupRmqpLucxnSX06juCI7pjuCY7qVBmte9g-hemilKupdmipLuchrTXU6juiM4pjuCY7qX5qmS7nIa011Oo7ojOKY7gmO6l6Zq_l27LdedlWaLVHd39-FvAAAA__9fq3zW
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz) INTERSECT (SELECT y FROM xyz) ORDER BY y]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF-P4jYUxd_7KZCfWjUo2Nf8i1SJql2pI61mqoG3iocscQcklkRJkJau5rtXwAJDTO6Jk8Ab_459cnzPTwnfxSaOzHP41WQi-EdI4QklPEHCE1p4oi_mnkjSeGGyLE73PzkKnqJvIuh5YrVJtvn-47knFnFqRPBd5Kt8bUQgZuGXtXk1YWRSvyc8EZk8XK0P2yTp6muY7ibfdv8JT0yTcJMFna6_3_llmwediRLzd0_E2_yyfJaHb0YE8t2rbuHPVZavNovc71_vP5GF9S-SL7vOMsyWN35_8aBcPHyMQbaXA9XKQbYbhC41cVlnu4nTyKQmulrpsEqpTdUDNi8W-veygJK6WBg0sODVcvlXmC2nJn9JfCokNdslJug8Pc8-vU4__THr_P75s_DE2vyb_zyRv_yWrt6Wh1fnCSu_rKHLhE3jNDepT1Zqv5auP6oQ261Efix6w8Rz3I0TX_eKGd_cfny1vXQocYUO-6rrkzPNgInzbA7uSDOXINpMgmolIduNQpeaaAgTWZNnLVpASZXxzM1CY57JB_EMTNiJZ1ZqVXmmqvdIVakRdX3tDBRg4jwcwzsCxSEI2WYSVCsJ2W4UutREwzarmkBp0QJKqgwobhYaA0U9CChgwk5AsVKrChSq3iOqUiPdPTwVuQEFmDgPx-iOQHEIQraZBNVKQrYbhS410bDNVBMoLVpASZUBxc1CY6DQg4ACJuwEFCu1qkDR1Xukq9So33XGCbBwHo3xHXHiEINsLweqlYNsNwhdaqJhk3VNmLRoASVVBhM3C41hoh8EEzBhJ5hYqdX5--bG-q8mS-JNZir9M9PbZ2aiN3M8gyzepgvzdxovDtsc374cdIcPIpPlx2_l8c3T5vjV3uBHsSyK5UexvhJLN7GkJmolG6nHTdQ05NWKTZz4xIndus_vzIslOC9erVQTNfUaqUe8WrOJD3hx30GsiuIBKx7yZz1kxeCaR6xYg2KPeSr0ABYsqDhxgVdDMPBySAYgR2jg5YgN0kLLdfAKBG-xxQUPQI34AOQIEECOCIHkoC7SIsx18Cg6HjEFuYUJyUNGDsCx85hBl85zRo7A5hZpnMrOq2HZeTksO5CjsvNyWHaesgpQVvGoARML1KjsQI7KDuSo7EgOJl7xlFVg6BR_B1eQW2VXPGqUBsfOowZdOk8aBUijLNK4lB2oUdmBHJUdyUHZgRze9fOUVYCyikcNKjugLDo3gElUdoBJVHYgRxPPU5bA1BD_gFyQW2UnHjUEbuiIRw24dOJJQ4A0ZJHGpexAjcoO5KjsSA7KDuSo7MRTlgBliUcNesoHlEXnBjCJnvMBJtGDPpCjiecpS-jY-afmgtwuO48aDW7oNI-a4qXP33_6PwAA___UW-5o
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF9v4kYUxd_7Kaz7lKhGZv4QiKVK2TZURaJhCzy0WvHghWmCxGJqGylslO9eARsINr7HY5u8JeAzc3zmnp9sXij-b0E-jbr97m9jZx0tnN-Hgz-dL92_P_c_9R6cq_veaDz6q3_tXP24ZrO_4nnz_drpPYy7w9H203PfDob33aHz6z_OZkIuLcOZeQi-mZj8LyTIJUkuKXJJk0stmri0isKpieMw2l7yshP0Zs_kN12aL1frZPvxxKVpGBnyXyiZJwtDPo2DrwszNMHMRF6TXJqZJJgvdtusovm3INrcPW--k0ujVbCMfafhbXcerBPfuZM0eXUpXCfH5eMkeDTki1e3uIX7eZzMl9PEa53ufydS6x8lXzfOUxA_nbn-6EHaeHgfg6gvB1UqB1FvEDrXxHGd9TKMZiYys5OVdqvk2pRNYPNooXUpCyipo4WbChbcUi7_COKnkUkGK0-lkhpvVsZ_1_9P_T65tDD_Jld34vqXaP74tPvrMGH5t9W2mbBRGCUm8lQmtZ9z1-8UiO1cIj8WPWPiIWyEK0830xmf3f72ZHthUeICHfZkw1PWNAMmDrN5c0Ga2QRRZxKqVBKi3ih0romKMBEleVajBZRUHs_sLFTmmfggnoEJe-NZJrWiPJPFeySL1Eg1PG0NFGDiMBztCwLFIghRZxKqVBKi3ih0romKbZYlgVKjBZRUHlDsLFQGivwgoIAJewNKJrWiQFHFe6SK1Eg3dm9FdkABJg7D0bkgUCyCEHUmoUolIeqNQueaqNhmVRIoNVpASeUBxc5CZaCoDwIKmLA3oGRSKwoUXbxHukiNWg1rnAALh9G4vSBOLGIQ9eWgSuUg6g1C55qo2GRdEiY1WkBJ5cHEzkJlmOgPggmYsDeYZFIr8_PNmfWHJl6Fy9gU-mWmuc3MzB7N_gzicB1NzeconO622f872Ol2H8xMnOy_Fft_esv9V1uD78UiLRbvxfpELOzEQlVRS1FJfVtFrdq8WrKJKz5xxW7d4nfmxQKcF6-WsopaNSupO7xas4nf8OKWhVimxTesuM2fdZsVg3vusGINin3LU6EJsJCBihUXeDUEAy-HZAByhAZejtggMmg5DV6C4DNsscEDUCM-ADkCBJAjQiA5qIvIEOY0eBQdj5iUPIMJwUNG3IBj5zGDbp3njOiAzTOksSo7r4Zl5-Ww7ECOys7LYdl5ykpAWcmjBkwsUKOyAzkqO5CjsiM5mHjJU1aCoZP8E1xKnim75FEjNTh2HjXo1nnSSEAamSGNTdmBGpUdyFHZkRyUHcjhUz9PWQkoK3nUoLIDyqJzA5hEZQeYRGUHcjTxPGUVmBrFvyCn5JmyKx41CjzQKR414NYVTxoFSKMypLEpO1CjsgM5KjuSg7IDOSq74imrAGUVjxr0lg8oi84NYBK95wNMohd9IEcTz1NWoWPn35pT8mzZedRo8ECnedSkb33y-tP_AQAA___L4gvN
 
 # INTERSECT ALL and INTERSECT with MergeJoiner.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz ORDER BY y) INTERSECT ALL (SELECT y FROM xyz ORDER BY y)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzElkFr2zAYhu_7FeE7bSDjSLbTxjDIGIUVSjKS3IYPbqwlgdQykgPNSv77sD2WxYn1WdOi3Zraj_Tq0wN-3yAXGZ-mL1xB_A0oEGBAIAACIRCIICFQSLHiSglZvdIAj9krxEMC27zYl9W_EwIrITnEb1Buyx2HGJbp847PeZpx6Q-BQMbLdLurtynk9iWVh8nr4QcQWBRpruKB51c7z_ZlPJgwSI4ExL78tfxp1efDYJOqzfl6EwrJMSGgynTNIaZH8ncxI6cxWWfM0zr7XMiMS56drZRUJPbKlbN-SdVmwctZ4dPWjSwPBY8Hj9Plw3zx8Hk5-PT0BAR2_Hv5fkI_fJTb9ab-6_fRaevop2MFFse6knkqPFH4NGoP4Ore4dnetP_N0x437zPPD26iqEHQkeOgrDOoA0mpI0lZ__mzPvMPPD-8iSgGQe8cB2WdQR2IwhyJEvSff9Bn_qFXf3P-vSgGQe8dB2WdQR2IEjgSJew__7DP_CPvJpoYxBw7jck6YzqQJPwP3ehKojlXhcgV79V8htWZeLbmzYyU2MsV_yrFqt6m-TmrufornnFVNk9Z8-Mxbx5VAfvDIxt4bANTq9w00tPUYGTMDB7ZwGMbmFrlbo3sgmZtevgnHejnHWhhej6zYZsObQTXw4jgehgRXA9jgiM0InhkI7geRgTXw4jgehgTHKERwUc2gt_ZKKqHEUX1MKKoHsYURWhE0XsbRfUwoqgeRhTVw5iiCI0oOrZRlFr1BIRGJEVoxFKExjTFcKwr2JUFu7ZgVxcs-4JdYaBWjYFeVAYjW_U0ZquexmzV06itCI7ZalKWLu_MpC2Z0pitRn3JGMdsvSgPWluT47ufAQAA__9XmVno
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll1v2jAUhu_3K6xz1UpGwU6gJdIkupVpSAw64GJTlYuUeAWJkswOUtOK_z4lVOv48onn1bsrxY_9-viReJ9B_VxCCJPeoPdxStZyST6NR1_Ibe_bzeCqPyRn1_3JdPJ1cE7OXtYU2xWPxRMZja97Y_LhOynOSX847Y0n5YKrwQBZHAGFVZqIYfwgFIS3wIACBwo-UAiAQgsiCplMZ0KpVJZLniugnzxC2KSwWGXrvPx3RGGWSgHhM-SLfCkghGl8txRjESdCek2gkIg8XiyrYzK5eIhl0X0snoDCJItXKiQNrzx5tM5D0uUQbSik6_xl-9dd7woyj9V8d78ug2gTUVB5fC8gZBv6dzFbTmPykzFf91mvUpkIKZKdnaKSxJYcuevnWM0nIh9lHtt7kWmRiXDXHaCwFD_ysy47fy8X9_Pqr99XZ3tXf72Wb3GtI5mHaSPNPNbaH8DRs4Ods1n9l2c1Xt7jDc9_E0UNgrYdB-UngzqQlDmSlNefP68zf7_hBW8iikHQC8dB-cmgDkThjkTx68_frzP_oFH95vx7UQyCXjoOyk8GdSCK70iUoP78gzrzbzXeRBODmB2nMfnJmA4kCf5DNzqSaCxUlq6UqNV8muWdRHIvtjNS6VrOxI1MZ9Ux24-jiqt-xROh8u23fPuhv9p-VQasD7dt4I4NzKxys5aeZgYj42Zw2wbu2MDMKvfeyA5ovk83_6R9_bx9Lcx2Z9bcpwMbwfUwIrgeRgTXw5jgCI0I3rIRXA8jguthRHA9jAmO0IjgbRvBL2wU1cOIonoYUVQPY4oiNKLopY2iehhRVA8jiuphTFGERhTt2CjKrHoCQiOSIjRiKUJjmmI41hXsyoJdW7CrC5Z9wa4wMKvGwA4qg5GtehqzVU9jtupp1FYEx2w1KUuHb2bSlkxpzFajvmSMY7YelAetrdHm3a8AAAD__4iBeyc=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz ORDER BY y) INTERSECT (SELECT y FROM xyz ORDER BY y)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF1r-kgYxe_3U8hc7UIkPjOJL4EFl93CFkq7tN4tXqRmtgrWhCRC3dLv_kcFrUnznExm7P_Ot1_m5OQ5JxPfxSZN9H38qgsR_StIeEIKTyjhiUB4IhRzT2R5utBFkeb7nxyB2-RNRANPrDbZttx_PPfEIs21iN5FuSrXWkRiFj-v9aOOE537A-GJRJfxan1YJstXr3G-m77t_heeeMriTRH1-v5-5YdtGfWmUsw_PJFuy_PhizJ-0SKiD6-9hL9WRbnaLEo_vFx_SpXjn5HnXW8ZF8svfn_WIE00fLaB3PmgOvlAbo0IGkWcj7PdpHmic51cHOlwlEaZcgBkniWE15KAnDpLGFpI8Dqp_Dsulk-6fMh8VXFqtst01Lu9n908Pt38Oev9cXcnPLHW_5W_Tum33_PVy_Lw6jRhzac1cuvsfdpPM1-FVQO-XHt8sTYZJKxFwHzZ95Vx1QARp8EZXrFqTIxw6YTq5AS5tSJoFGGZdOpYNg4lIKeaysZMgnXZ0DeVjWw_57LNmKu-HxgHHog4XbzRFQNvYAS5dEJ1coLcWhE0irBMm-wYeIcSkFNNgTeTYB14-U2BV-3nXLUZ86B_2PKbBR6IOF288RUDb2AEuXRCdXKC3FoRNIqwTJvqGHiHEpBTTYE3k2AdePVNgQ_az3nQZszDvnHcgYTTpZtcMe4GNpA7H1QnH8itEUGjCMukBR3D7lACcqop7GYSrMMe_IT_Dr5Q9KiLLN0UutU_A4P9OenkRR89KtJtvtD_5OnisMzx7cOBO3yQ6KI8fkvHN7eb41d7gZ9hqsL0GQ4uYDKDSVrRExtaDm1opXhaso4r3nHFLh3yK_MwAd08LQdW9MiGVmDSAtZxcLFDA1hW4SELg5Me8YMy5CdlzNITHp7YBJuHUbABDYLN0yjYPI2CTaBLUZnytQKyDWgUboCjdCMcTDrAUb6Jr1RCeK1dOLyWceLrBZ063y8EUk61hjG6BfM0vAcDHN2EeRzehXkcppWvVxoD42v9apRWnoZp5XGYVoCjkeVxmNZay14YLwlsn_iWreC1tMpa1ZikVfJNI8HuTfL7GGAcoFFaEQ7SCnCUVoDDTTNfsjIExtda1iStgEZpBThKK8LRyPI4Sqvkt7ByDHC-ZSt4Pa38LhadOt80agCetWpNY5JWQKO0IhykFeAorQBHaVV8ySoJjK-1rNFTLk_Dx1weh8-5AEcPujyO0qr4raxC1vEtW8FraVX8XrZ66vOPX34EAAD__9HR6zs=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmFFv4kYUhd_7K6z7lEhGMDM2IZYqZdtQFYmGLfDQasWDF08TJBa7tpHCRvnvFaaCYMf3eGyTfUvAn-f4-J7jMS-U_Lsmj2bD8fDXubWN19Zv08kf1pfhX5_Hn0YP1tX9aDaf_Tm-tq7-P2Z3OOJ5992aTO-HU-uXv63dtTV6mA-ns_0B_IELsmkTBvrB_6YT8r6QIJsk2aTIJodscmlhUxSHS50kYbw_5CUDRsEzeT2bVptom-4_Xti0DGNN3gulq3StyaO5_3Wtp9oPdNztkU2BTv3VOlsmilff_Hh397z7TjbNIn-TeFanu195sk09607S4tWmcJueTp-k_qMmT7za1SXcr5J0tVmmXfd8_TuRO_8J-bqznvzk6Z3jTxqkiYa3Noj2fFC1fBDtGuGUijidZ7sJ40DHOjg7U3aWUpmyB2SeJLiXkoCcOknoN5Bg11L5u588zXQ6iboq59R8F2nvTf4_jcdk01r_k17dieuf49XjU_bXccLKL-umXWcfwk4YdZWbN-DdtQdnawuDhFUIWFd2usq4aoCI4-D0L1g1Jka06YSq5YRo1wqnVETDpIuaZdOiBORUWdmYSWhcNuKDykZWn3NZZcxVp-sYBx6ION68mwsG3sAI0aYTqpYTol0rnFIRDdMmawa-RQnIqbLAm0loHHj5QYFX1edcVRlzp5Nt-c0CD0Qcb97ggoE3MEK06YSq5YRo1wqnVETDtKmagW9RAnKqLPBmEhoHXn1Q4J3qc-5UGXO3Yxx3IOF4624vGHcDG0R7PqhaPoh2jXBKRTRMmlMz7C1KQE6Vhd1MQuOwOz_gt4N3FE11EoWbRFf6ZaC3vyYdPOqDR0m4jZf6cxwus2UO_04yLvsg0El6-FYc_hltDl_tBb6FRR4Wb2HnDBZmsJCN6NsmtOw3oZXiack6rnjHFbu0y6_MwwLo5mnZa0TfNKEVmDSHdRzcbNcAlnm4z8Lgom_4QenzkzJg6Vsevm0SbB5GwQY0CDZPo2DzNAq2AF2KypSvFZBtQKNwAxylG-Fg0gGO8i34ShUIL7QLhxcyLvh6QZfO94sAKReFhjF6BPM0fAYDHD2EeRw-hXkcppWvVzEAxhf61SitPA3TyuMwrQBHI8vjMK2Flj0zXgqwfeJbNocX0ioLVWOSVsk3jQS7N8nvY4BxgEZpRThIK8BRWgEON818yUoXGF9oWZO0AhqlFeAorQhHI8vjKK2S38LKAcD5ls3hxbTyu1h06XzTqB541yo0jUlaAY3SinCQVoCjtAIcpVXxJaskML7QskZvuTwNX3N5HL7nAhy96PI4Sqvit7IKWce3bA4vpFXxe9n8pS9ef_ovAAD__6E_C5A=
 
 # INTERSECT ALL and INTERSECT with no overlap.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz WHERE x < 2) INTERSECT ALL (SELECT x FROM xyz WHERE x >= 2) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll9v2jwUxu_fTxGdq3eaUWIn4U-kSp2mTkOq6FS427hIiVeQKImcIJVV_e5TQlEXAn7ipOSuNPnZHJ_fw_ELbeJITsInmVLwkzgxEsTIJUYeMfJpzihR8UKmaazyV_bAOHqmwGG02iTbLP_3nNEiVpKCF8pW2VpSQLPwYS3vZRhJZTvEKJJZuFoX2yRq9RSq3fXz7g8xmibhJg2snp3v_G21zqQKrGtu_do6jruwRBAE48lsSIzutln-hOavjOJt9rb3-5YPO2sZpsvyZsX7c0ZpFj5KCvgra1aD37gGefXRRYizRbyvs93EKpJKRqWV5jmJXjlxEt_DdDmV2V1i86NmznaJDKzxZHZzP735OrO-3N4So7X8nf1_zT9dqdXjsvjrbOnvZbkmvZnGKpPK5v7xSX0-u75X49hOncjboie-xCTuxYktnOMzPrm9X9qe11eP11DPFj3b7T5ABlX0W1Rx6QjxbiPEO4oQ6M4hQv2mERL1uy_qdN_t2V73DhtUMWhRxaUdFt06LDpyGHTn4PCgqcNu_e67dbrv9YqrQscOG1QxbFHFpR12u3XY7chh0J2Dw8OmDnv1u-_V6b7f695ggxpGjWu4tL9et_56HfkLenPwd_QRV_ET69_LNIk3qax1y3byM5PRo9z3II23aiF_qHhRbLP_eFdwxf0okmm2fyr2H8ab_aP8C9aHB21gzlvRfit6pKe5wZkJM3jQBj46M1Pab0WP9LQ4pp1_abcEO8ewq4U9fbc8LSy4fmu_TT70MMiHHkb5ADTIB6BBPvpt8qGHQT70MMoHoEE-AA3yMdBaOtRLOmyTj1Ebw_UwMFwPI8MBDQwHNJoAJmOz-ktqMjdNaTgEjCanMQ4055UpUlKVC73oXD9GgOm8MkdMVAc0cB3QSHaEA9sRjnSvzFAj3fU00l1PQ90BjnQHONK9MkjLuveB7pWZYqR7ZaYY6a6nke56GuoOcKQ7wJHulXlqpLueRrrraag7wJHuAEe6V6Zq-a7t6HUXldmi1X3--t_fAAAA___lQaxm
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll9v4jgQwN_vU1jz1OqMEjsJfyJVau9KVSQOeoC0u-rykBJvQaIk6yQStOp3XyWU7YZQT0xK3krjX4aZ-Q3jF4h-LsGFcbff_XdCErkkN6Phf-S--_Wuf9UbkLPr3ngy_r9_Ts7ezqy3J9abZ_LltjvqkjX5npimNSP8nPQGk-5onB676vdRRFykzHB03R2Rf76R9RQorAJfDLwnEYF7DwwocKBgAQUbKDgwpRDKYCaiKJDpkZcM6PlrcE0Ki1WYxOm_pxRmgRTgvkC8iJcCXJh4D0sxEp4vpGECBV_E3mKZhQnl4smTm8v15hkojENvFbmkYaSRbxbLWEiXXLLfWbqu2xtM2kBhmMTpE5i-UgiS-C32e8iHDZl70TwfLDs_pRDF3qMAl73S43Jwjs4hLfvnJsE_TOL9PckqkL6Qws-9aZqS2JEDlbj1ovlYxMPQYHvNnGxC4eZFBApL8SM-u2TnF3LxOM_--jD197Qsnd6MAxkLaTBnv1J_f_h-u0TZDlXk7aUHvsQgaAShwc39Gh8M7-TCs_LqsRLqGbxhWPUPkEYWzQpZnHqEWL0jxGoaIaQ7uxFqHjtCvHz3eZnuWw3Drt9hjSxaFbI4tcO8Xod5TQ4j3dk53DrWYat8960y3bcb2VWhZoc1smhXyOLUDlv1OmzV5DDSnZ3D7WMdtst33y7TfadRv8EaOXSOzuHU_tr1-mvX5C_Sm52_nc-4ih94_0hEYbCKRKlbtpnWTPiPYtuDKEjkTNzJYJaF2X4cZlx2P_JFFG-f8u2H3mr7KP2C5eFWFZixSrRTie6oaaZRM64Ht6rAezXTpZ1KdEdN833a_JO2crC5D1tK2FZ3y1bCnKlDO1XmQw0j86GGsflAaGQ-EBqZj2aV-VDDyHyoYWw-EBqZD4RG5qOltLStlrRdZT46VQxXw4jhahgzHKERwxEa2wA6a7P4S6qzN3VpdAlobU5tHNGcFbZITlXG1aIz9RpBTGeFPaKjOkIjriM0JjuGI7ZjOKZ7YYdq6a6mMd3VNKo7gmO6Izime2GR5nVvIroXdoqW7oWdoqW7msZ0V9Oo7giO6Y7gmO6Ffaqlu5rGdFfTqO4IjumO4Jjuha2av2ubat15YbcodZ--_vUrAAD__0qR08k=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz WHERE x < 2) INTERSECT (SELECT x FROM xyz WHERE x >= 2) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1v4kYYhe_7K9BctaqRPR98xNJKqdqtGmmVVAl3bS68eJpYYrFlG2lplP9eAQWCB79nxmO4SzBn5vjMex7ZvLFlnur75JuuWPwX4yxgggVMsoApFrARew5YUeZzXVV5ufnKTnCXfmdxFLBsWazqzcfPAZvnpWbxG6uzeqFZzGbJ14V-1EmqyzBiAUt1nWSL7TZFmX1LyvXt9_W_LGBPRbKs4sEw3Oz8e7aodRkPbvng71UUyflAxHF8dz-bsoA9rOrNFfb8HrB8VR_3rurkRbOYvwf2_n7LqjpbzutwdGrOWP8o-boevCbV65nvHz0IFw8fM-LdQ9KfXFKSnVLi_cakWk0c11kt8zLVpU5PVtqu0mpTRMDm0cLoUhZQUkcLYw8LQSeXfyTV65OuH4pQNpKarQsdD-7uZ58fnz7_Ohv88uULC9hC_1P_eMt_-lRmL6_bvywmbOIyYU95WesylEZqP7euP7WI7Vwi_y96xsR9PsyLUEXNjM9uf3OyPXeouEXDQzEMZb8gBA4Pgzu-IAhdUvKJyQeFtjnxfoNSrSY8OcQ7orBHCyipNhS6WfBGIb8SCsGE7VFopGaLQmHfMmFTMjkMVb8sAg4PkzO5IIscUuI-MfmwyDYn3m9QqtWEJwhERxb1aAEl1cYiNwveLBJXYhGYsD2LjNRsWSTtWyZtSqaG2ze1HlkEHB4mZ3pBFjmkxH1i8mGRbU6836BUqwlPEMiOLOrRAkqqjUVuFrxZJK_EIjBhexYZqdmySNm3TNmUbDTsl0TA32Fubi5IIoeMePeQfDhkmxLvNybVasITAqojh3q0gJJq45CbBW8OqStxCEzYnkNGal1-qjqz_qOuinxZaatfoaJNZjp90bszqPJVOdd_lvl8u83u34etbvtBqqt6d5Xv_rlb7i5tDH4U86aYfxSrEzF3E3PpoxbcS33jo5YTWi3IxCWduCS3HtE702IOzotWC-GjlpGXekqrFZn4mBaPHMSiKR6T4gl91hNSDO55SooVKPYNTYUIYMGAihMXaDUEAy2HZAByhAZajtjADbScBi9A8AZbXPAA1IgPQI4AAeSIEEgO6sINwpwGj6KjEdOQG5jgNGT4GBw7jRl06zRn-BRsbpDGqey0GpadlsOyAzkqOy2HZacpKwBlBY0aMLFAjcoO5KjsQI7KjuRg4gVNWQGGTtBPcA25UXZBo0YocOw0atCt06QRgDTCII1L2YEalR3IUdmRHJQdyOFTP01ZASgraNSgsgPKonMDmERlB5hEZQdyNPE0ZSWYGkm_IDfkRtkljRoJHugkjRpw65ImjQSkkQZpXMoO1KjsQI7KjuSg7ECOyi5pykpAWUmjBr3lA8qicwOYRO_5AJPoRR_I0cTTlJXo2Om35obcLDuNGgUe6BSNmuatP7__8F8AAAD__zB7PFY=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1v4kYfxe-fT2HNVaLHCOaFl1haKduG1SJR2AJSW225YGGaILGY2kaCjfLdK2ADwcb_M-MxuUvAZ-b4zP_8ZPPM4n8XLGDDdrf968hbRwvv06D_m_e1_eeX7sdOz7t56AxHw9-7t97Nz2s2hys22x_eH5_bg7a38f5e12py6olbr9MbtQfD3WXocv1hd31_8NAeeL_85W3GzGfLcKZ7k-86ZsFXxpnPBPOZZD5TzGd1NvbZKgqnOo7DaHfJ817QmW1YUPPZfLlaJ7uPxz6bhpFmwTNL5slCs4CNJt8WeqAnMx1Va8xnM51M5ov9Nqto_n0Sbe832x_MZ8PVZBkHXqW62_nTfJHoKPDu-fEOgyDo9EYt5rP-Otl9w8YvPgvXyWnvOJk8ahbwF9_c38M8TubLaVKtn5vLrH-SfNt6T5P46cL1Jw_CxsPbjHjxkHbnap6SLJQSLzcmlWvitM56GUYzHenZ2Ur7VXJtihqwebJQv5YFlNTJQsPBgl_I5edJ_DTUSX9VlamkRtuVDt7A5GO3y3y20P8kN_f89kM0f3za_2UwYU2bCRuGUaKjqsyk9v_c9VsGsV1K5OeiF0z0wkq4qqpaOuOL29-dbc8tKm7Q8KqoVGW5IAQOj4PbuCIIbVJyickFhaY58XKDUrkmHDnEC6KwRAsoqTwU2llwRiF_JxSCCXtFYSY1UxQK85YJk5LJSlWVyyLg8Dg5zSuyyCIl7hKTC4tMc-LlBqVyTTiCQBRkUYkWUFJ5LLKz4Mwi8U4sAhP2yqJMaqYskuYtkyYlU5X9m1qJLAIOj5PTuiKLLFLiLjG5sMg0J15uUCrXhCMIZEEWlWgBJZXHIjsLziyS78QiMGGvLMqkZsoiZd4yZVKyeqVcEgF_x7m5uyKJLDLixUNy4ZBpSrzcmFSuCUcIqIIcKtECSiqPQ3YWnDmk3olDYMJeOZRJrchPVRfWH-h4FS5jbfQrVG2XmZ496sMZxOE6muovUTjdb3P4t7_X7T-Y6Tg5fMsP_3SWh692Bt-KeVrM34rVmZjbibl0UQvupL5zUcsmrRZk4pJOXJJb1-mdaTEH50WrhXBRy5qTukWrFZl4gxbXLcQiLW6Q4iZ91k1SDO65RYoVKPYdTYUawEIGKlZcoNUQDLQckgHIERpoOWIDz6DlPHgBgs-wxQYPQI34AOQIEECOCIHkoC48Q5jz4FF0NGJS8gwmOA0Z3gDHTmMG3TrNGd4Cm2dIY1V2Wg3LTsth2YEclZ2Ww7LTlBWAsoJGDZhYoEZlB3JUdiBHZUdyMPGCpqwAQyfoJ7iUPFN2QaNGKHDsNGrQrdOkEYA0IkMam7IDNSo7kKOyIzkoO5DDp36asgJQVtCoQWUHlEXnBjCJyg4wicoO5GjiacpKMDWSfkFOyTNllzRqJHigkzRqwK1LmjQSkEZmSGNTdqBGZQdyVHYkB2UHclR2SVNWAspKGjXoLR9QFp0bwCR6zweYRC_6QI4mnqasRMdOvzWn5Nmy06hR4IFO0ahJ3_r45X__BQAA__9LB2LA
 
 # INTERSECT ALL and INTERSECT with some overlap.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz WHERE x < 3) INTERSECT ALL (SELECT y FROM xyz WHERE x >= 1) ORDER BY y]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lk1v2kAQhu_9FdacWnWRvWubD0uRqKpURYpIFbi1Pjh4G5AIttZGCo347xUQmtom-3px8C0EHg-z87zMPtMqieU4epQZBT-JEyNBjFxi5BEjn0JGqUpmMssStfvIARjFTxQ4jBardJ3v_h0ymiVKUvBM-SJfSgpoGt0v5Z2MYqlshxjFMo8Wy32ZVC0eI7UZPm3-EKNJGq2ywOrYu8rfFstcqsAacuvX2nHcmeUGQTAaT_vE6HadB9ZQULhllKzzl9qvJe831jzK5sViQ07hNmSU5dGDpIBv2Xk9-Gf3IK8s_r5NiDebeH3OepWoWCoZF54U7kj0kRMn8T3K5hOZ36Y2Lw1zukllYI3G0-u7yfXXqfXl5oYYLeXv_OOQf7pSi4f5_q9_rfNS669tuSazmSQql8rmfvmkPr_5fK_GsZ06kZeHnvgS46STpLZwymd8srxfKM_rq8drqGeLju22HyCDLroNurh0hHi7EeItRQhM5xih7rkREvWnL-pM3-3YXvsOG3TRa9DFpR0W7TosWnIYTOfocO9ch93603frTN_r7K8KLTts0EW_QReXdtht12G3JYfBdI4O98912Ks_fa_O9P1O-wYb9DA4u4dL--u166_Xkr9gNkd_B-9xFT_x_DuZpckqk7Vu2c7uzGT8IA8zyJK1mskfKpntyxxe3u65_f0olll-eFccXoxWh7d2X7A-3GsCc96I9hvRAz3NDc5MmMG9JnDpzExpvxE90NOiTDv_024Bdsqwq4U9_bQ8LSy4vrTfJB96GORDD6N8ABrkA9AgH90m-dDDIB96GOUD0CAfgAb56Gkt7esl7TfJx6CJ4XoYGK6HkeGABoYDGm0Ak7VZ_SU12ZumNFwCRpvTGAea88oWKajKhV50rl8jwHRe2SMmqgMauA5oJDvCge0IR7pXdqiR7noa6a6noe4AR7oDHOleWaRF3btA98pOMdK9slOMdNfTSHc9DXUHONId4Ej3yj410l1PI931NNQd4Eh3gCPdK1u1eNd29LqLym7R6h5uP_wNAAD__8vMrHA=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt1u6kYQgO_7FKu5Cuoie9c2P5YikTZEQaKQAlJbpb5w8DYgEeyujQSJePcjQ0iOMdnx4uC7w2G_HWbmm8y-Qfz_AlwYd_vd3ydkJRfkbjT8gzx2_37o3_QG5Oq2N56M_-zXyNX7mc3-xHrzSv667466ZE3-XZmmNSVWjfQGk-5onB676fdRRFwTViPD0W13RH77h2w8oLAMAzHwX0QM7iMwoMCBggUUbKDggEchkuFUxHEo0yNvO6AXrME1KcyX0SpJ_9ujMA2lAPcNknmyEODCxH9aiJHwAyENEygEIvHni12YSM5ffLnprDevQGEc-cvYJXUjjXw3XyRCuqTDPrJ0Xbc3mLSAwnCVuKTDwdtSCFfJe-zPkE8bMvPjWTZYh4G39SjEif8swGVbel4Oztk5pGX_3iT4l0l83rNahjIQUgSZm7yUxI6cqMS9H8_GIhlGBjtq5mQTCTcrIlBYiP-Sqw6rXcv582z3r4_U2VHqn2lZOr0ZhzIR0mDOcaV-_fJ-u0DZTlXk_dITP2IQ1sPI4OZxjU-GdzLhWXH1WAH1DF43rOoHSCOLRoksLj1CrNoRYhWNENKdwwg1zh0hXrz7vEj3rbphV--wRhbNEllc2mFercO8IoeR7hwcbp7rsFW8-1aR7tv13VOhYoc1smiVyOLSDlvVOmxV5DDSnYPDrXMdtot33y7SfadevcEaObTPzuHS_trV-mtX5C_Sm4O_7e94ip-4fyTiKFzGotAr20xrJoJnse9BHK7kVDzIcLoLs_843HG791Eg4mT_Ld9_6C33X6U_sDjcLAMzVop2StFtNc00asb14GYZ-KhmurRTim6raX5Mmz_TVgY2j2FLCdvqbtlKmDN1aKfMfKhhZD7UMDYfCI3MB0Ij89EoMx9qGJkPNYzNB0Ij84HQyHw0lZa21JK2ysxHu4zhahgxXA1jhiM0YjhCYxtAZ23m_5Lq7E1dGl0CWptTG0c0Z7ktklGVcbXoTL1GENNZbo_oqI7QiOsIjcmO4YjtGI7pntuhWrqraUx3NY3qjuCY7giO6Z5bpFndG4juuZ2ipXtup2jprqYx3dU0qjuCY7ojOKZ7bp9q6a6mMd3VNKo7gmO6Izime26rZt_aplp3ntstSt297S8_AgAA__-K3tPW
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz WHERE x < 3) INTERSECT (SELECT y FROM xyz WHERE x >= 1) ORDER BY y]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mFtr40Ycxd_7KcQ8tVRGmosvESy4tFsaWJKS-K3Ng9aaJgKvJSQZNg357sV2Y8ca639mNHLefDszR2f-54fkF7YuMn2TftM1S_5inIVMsJBJFjLFQjZmDyErq2Kp67qotj_ZC66z7yyJQ5avy02z_fghZMui0ix5YU3erDRL2CL9utJ3Os10FcUsZJlu0ny126as8m9p9Tz__vwvC9l9ma7rJBhF251_z1eNrpJgzoO_N3Esl4FMkuT6ZjFjIbvdNEkwF-zhNWTFpjnuXTfpo2YJfw3t_f2W102-XjbR-NTcnLfWP0q-PgdPaf105vdHD8LFw_uMeP-Q9KeA26cke6XEh41JdZo4rrNZF1WmK52drLRbpdOmiIHNo4XxpSygpI4WJh4Wwl4u_0jrp3vd3JaRbCW1eC51ElzfLD7f3X_-dRH88uULC9lK_9P8OOc_faryx6fdq8OEdV_W1GXC7ouq0VUkjdR-7lx_ZhHbuUT-X_SMiZtiVJSRitsZn93-6mR77lBxi4ZHYhTJYUEIHB4Gd3JBELqk5BOTDwptc-LDBqU6TXhyiPdE4YAWUFJdKHSz4I1C_kEoBBP2hkIjNVsUCvuWCZuSyVGkhmURcHiYnOkFWeSQEveJyYdFtjnxYYNSnSY8QSB6smhACyipLha5WfBmkfggFoEJe2ORkZoti6R9y6RNydRo96Q2IIuAw8PkzC7IIoeUuE9MPiyyzYkPG5TqNOEJAtmTRQNaQEl1scjNgjeL5AexCEzYG4uM1GxZpOxbpmxKNh4NSyLg7zA3VxckkUNGvH9IPhyyTYkPG5PqNOEJAdWTQwNaQEl1ccjNgjeH1AdxCEzYG4eM1Pr8VXVm_Ttdl8W61lb_QsXbzHT2qPdnUBebaqn_rIrlbpv929udbvdBputm_y3fv7le77_aGnwv5m0xfy9WJ2LuJubSRy24l_rKRy2ntFqQiUs6cUluPaZ3psUcnBetFsJHLWMv9YxWKzLxCS0eO4hFWzwhxVP6rKekGFzzjBQrUOwrmgoxwIIBFScu0GoIBloOyQDkCA20HLGBG2g5DV6A4A22uOABqBEfgBwBAsgRIZAc1IUbhDkNHkVHI6YlNzDBacjwCTh2GjPo0mnO8BnY3CCNU9lpNSw7LYdlB3JUdloOy05TVgDKCho1YGKBGpUdyFHZgRyVHcnBxAuasgIMnaDv4Fpyo-yCRo1Q4Nhp1KBLp0kjAGmEQRqXsgM1KjuQo7IjOSg7kMO7fpqyAlBW0KhBZQeURecGMInKDjCJyg7kaOJpykowNZJ-QG7JjbJLGjUS3NBJGjXg0iVNGglIIw3SuJQdqFHZgRyVHclB2YEclV3SlJWAspJGDXrKB5RF5wYwiZ7zASbRgz6Qo4mnKSvRsdNPzS25WXYaNQrc0CkaNe1Lf3j94b8AAAD__35sPGA=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1v4kYfxe-fT2HNVaLHCOaFl1haiW3DapEobAGprbZcsDBNkFhMbSOFjfLdK2ADwcb_M-MxuUvAx3PmzP_8ZPPM4n-XLGCjTq_z69jbREvv03Dwm_e18-eX3sdu37u5747Go997t97Nz2u2hyuetj-8Pz53hh3vyft7U6vJmSdvvW5_3BmOdpehy_UHj996g-F9Z-j98pe3nTCfrcK57k-_65gFXxlnPhPMZ5L5TDGf1dnEZ-sonOk4DqPdJc97QXf-xIKazxar9SbZfTzx2SyMNAueWbJIlpoFbDz9ttRDPZ3rqFpjPpvrZLpY7pdZR4vv02jbftr-YD4braerOPAq1d3KnxbLREeB1-bHHQZB0O2PW8xng00SeG3BJi8-CzfJae04mT5oFvAX39zf_SJOFqtZUq2fm2vz1P1Pkm9b73EaP164_uRB2Hh4mxEvHtLuXM1TkoVS4uXGpHJNnO6zWYXRXEd6fnan_V1ybYoasHmyUL-WBZTUyULDwYJfyOXnafw40slgXZWppMbbtQ7ewORjr8d8ttT_JDdtfvshWjw87v86Tlj-tpo2EzYKo0RHVZlJ7f-5928ZxHYpkZ83vWCiH1bCdVXV0hlfXP7ubHluUXGDhldFpSrLBSFweBzcxhVBaJOSS0wuKDTNiZcblMo14cghXhCFJVpASeWh0M6CMwr5O6EQTNgrCjOpmaJQmLdMmJRMVqqqXBYBh8fJaV6RRRYpcZeYXFhkmhMvNyiVa8IRBKIgi0q0gJLKY5GdBWcWiXdiEZiwVxZlUjNlkTRvmTQpmars39RKZBFweJyc1hVZZJESd4nJhUWmOfFyg1K5JhxBIAuyqEQLKKk8FtlZcGaRfCcWgQl7ZVEmNVMWKfOWKZOS1Svlkgj4O87N3RVJZJERLx6SC4dMU-LlxqRyTThCQBXkUIkWUFJ5HLKz4Mwh9U4cAhP2yqFMakV-qrpw_6GO1-Eq1ka_QtV2men5gz6cQRxuopn-EoWz_TKHfwd73f6DuY6Tw7f88E93dfhqZ_CtmKfF_K1YnYm5nZhLF7XgTuo7F7Vs0mpBJi7pxCW5dJ1emRZzcF60WggXtaw5qVu0WpGJN2hx3UIs0uIGKW7SZ90kxWDPLVKsQLHvaCrUABYyULHiAq2GYKDlkAxAjtBAyxEbeAYt58ELEHyGLTZ4AGrEByBHgAByRAgkB3XhGcKcB4-ioxGTkmcwwWnI8AY4dhozaOs0Z3gLLJ4hjVXZaTUsOy2HZQdyVHZaDstOU1YAygoaNWBigRqVHchR2YEclR3JwcQLmrICDJ2gn-BS8kzZBY0aocCx06hBW6dJIwBpRIY0NmUHalR2IEdlR3JQdiCHT_00ZQWgrKBRg8oOKIvODWASlR1gEpUdyNHE05SVYGok_YKckmfKLmnUSPBAJ2nUgK1LmjQSkEZmSGNTdqBGZQdyVHYkB2UHclR2SVNWAspKGjXoLR9QFp0bwCR6zweYRC_6QI4mnqasRMdOvzWn5Nmy06hR4IFO0ahJb33y8r__AgAA__8cdmLN
 
 # INTERSECT ALL and INTERSECT with swapped column orders.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x, y FROM xyz INTERSECT ALL SELECT y, x from xyz]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll-L2kwUxu_fTyHn6i1MiDNJ3DVQsJSFLixa1LuSi6yZquBmwkyEtYvfvSTpYv3TOZkeTS9j8pt5Zs4PfN4gV5kcpy_SQPwNODAQwCAABiEwiCBhUGi1kMYoXX3SAI_ZK8R9Buu82JbVzwmDhdIS4jco1-VGQgzz9HkjpzLNpPb7wCCTZbre1NsUev2S6t3odfcDGMyKNDdxz_OrnSfbMu6NOBsJSPYM1Lb8tcNh4eddb5Wa1fGS70jCwJTpUkLM9-zvwkaOYQUbcWpY8cewh6W2udKZ1DI7WiypSOyTCyf-kprVTJaTwucn05nvChn3Hsfzh-ns4fO89-npCRhs5Pfy_zr4h496vVy9P9hmdjhfQDjfhfBj5anC59HpTVzcOzzam7cXgbcQwReeH9zQW4e4A-e41zeXd2su79pc0X4cos04As8Pb2iPQ9w757jXt0d0a4_o2p6g_TiCNuMIvfrP6lb2OMS9d457fXuCbu0JurYnbD-OsM04Iu-G7jiEHTqGvb45YbfmhP-yb12INpWmULmRrdpUvzqczJayuSyjtnohv2q1qLdpHic1V7eBTJqyeSuah8e8eVUFbA8PKPCQAnNSbh7Zae5wZcINHlDgIQXmpNwnV3ZGi1O6_zsd2O87sML8-M76p3RIEdwOI4LbYURwO4wJjtCI4BFFcDuMCG6HEcHtMCY4QiOCDyiC31EUtcOIonYYUdQOY4oiNKLoPUVRO4woaocRRe0wpihCI4oOKYpyUk9AaERShEYsRWhMUwzHugKtLNDaAq0uEPsCrTBwUmPgZ5XByVY7jdlqpzFb7TRqK4JjtrqUpfOZubQlVxqz1akvOeOYrWflwWprsv_vZwAAAP__3WZveA==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll9v2jwUxu_fTxGdq1YyCnYCLZFeiWpjGhKDDriYVOUiJV5BSpPMTiTSqt99StKu48984hmyyxD_4sc-P4nnGeSPCDxYjCajD0srF5H1aT77Yt2Nvt1ObsZT6-LjeLFcfJ1cWq9LtsQq6jXb4skaT5ej-aL8_WYyeVtSEGv7a4kPBOIk5NPgkUvw7oACAQYEHCDgAoEe-ARSkay4lIkolzxXwDjcgtclsInTPCt_9gmsEsHBe4Zsk0UcPFgG9xGf8yDkwu4CgZBnwSaqtknF5jEQxXBbPAGBRRrE0rM6drnzLM88a0jJkIH_QiDJs9cd3j98X1jrQK53P_mG-ARkFjxw8OgL-buwPc2wjAypaVj2x7Dvn8rjRIRc8HDnY35JYkuOnPhzINcLns1Sm-5NZ1mk3Nu1BwhE_Ht2UQW__F9sHtZvD6qZvZ_PMTjfkfDTpJOkNu3t38TRvd2dvWlzEWgDEWzWsZ0zeqsRt68d9_Tm0nbNpW2by5qPgzUZh9Ox3TPaoxH3Sjvu6e1h7drD2rbHaT4Op8k43E71Z3UuezTiXmvHPb09Trv2OG3b4zYfh9tkHL3OGd3RCDvQDHt6c9x2zXH_Zd86Em3OZZrEkjdqU93ycDx84PVlySQXK34rklW1Tf04q7iqDYRcZvVbVj-M4_pVGbA53DeBByYwNcpNe2qaalwZ04P7JvDABKZGufeu7IBm-3T3d9pR37ejhOnunXX3addEcDWMCK6GEcHVMCY4QiOC90wEV8OI4GoYEVwNY4IjNCJ430TwKxNF1TCiqBpGFFXDmKIIjSh6baKoGkYUVcOIomoYUxShEUUHJopSo56A0IikCI1YitCYphiOdQWzsmDWFszqgmFfMCsM1Kgx0IPKoGWrmsZsVdOYrWoatRXBMVt1ytLhzHTaki6N2arVl7RxzNaD8qC01X_572cAAAD__xATi70=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x, y FROM xyz INTERSECT SELECT y, x from xyz]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF9r4kwYxe_fTyFz9S5E4jOT-Cew4LJb2EJpl9a7xYvUzFbBmpBEqFv63ReV1ZqY58wkpntp7S9zcvKckxlfxSqO9G34rDMR_BQkHCGFI5RwhCcc4YupI5I0nuksi9Ptv-yB6-hFBD1HLFbJOt_-eeqIWZxqEbyKfJEvtQjEJHxc6nsdRjp1e8IRkc7DxXK3TJIunsN0M37Z_BaOeEjCVRZ0uu525bt1HnTG5IylmL45Il7nxxWyPHzSIqA3x1zFt0WWL1az3PVPJZxb4kg9bjrzMJufR45KpI2S936QrSHSGVOlIaqWIdSGI16llOOl1qs4jXSqo5OL7a5SKVb2sNijCr8tFQaWHVX0G6hwagn9HmbzB53fJa4q-DXZJDroXN9Oru4frr5OOl9uboQjlvpX_v_uJj59ThdP878fzHI4uKzLt3E3TlzlF504u_bwZG2ySJ5B8FzZdVWdLgI6DnPUb72LbByxt8SijUwtoTY88SqlNOwBqt9GF1RhYFlVG9mpaNxG9NFtJM3nX5qMv-q6Xp1GADoOz3LQeiNYOEL2llg0gqkl1IYnXqWUhlmU9RvhgioMLKtqBDsVjRtBfnQjKPP5Vybj73V3RwrrRgA6Ds9y2HojWDhC9pZYNIKpJdSGJ16llIZZVPUb4YIqDCyragQ7FY0bQX10I3jm8--ZjL_frdMHQMXhSY5a7wMLP8jWEIs2MDWE2nDEq5TSMIde_Ta4oAoDy6rawE5F4zbw_uXvF2ek3essiVeZNvp1ore9OR096b1ZWbxOZ_pHGs92y-w_3u243R8ineX7b2n_4Xq1_2or8D1MRZjew94JTHYwyUb0qAkt-01opXhaso4r3nHFLu3zK_MwAd08LXuN6EETWoFJ81jHwcP2LWBZhPssDG56wA9Kn5-UIUuPeHjUJNg8jIINaBBsnkbB5mkUbAJdisqUrxWQbUCjcAMcpRvhYNIBjvJNfKUSwkvtwuGljBNfL-jW-X4hkHIqNYzVK5in4TsY4OglzOPwLczjMK18vdIQGF_qV6u08jRMK4_DtAIcjSyPw7SWWvbEeElg-8S3bAEvpVWWqsYmrZJvGgl2b5LfxwDjAI3SinCQVoCjtAIcbpr5kpU-ML7UsjZpBTRKK8BRWhGORpbHUVolv4WVQ4DzLVvAy2nld7Ho1vmmUT1w1io1jU1aAY3SinCQVoCjtAIcpVXxJaskML7UslanXJ6Gx1weh-dcgKODLo-jtCp-K6uQdXzLFvBSWhW_ly3e-vTtvz8BAAD__zpQDTI=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmFFv4kYUhd_7K6z7tCsNgpkxhFiqlFU3VZFosg08VFrx4IVpgsRiahsJNsp_rzApBBvfM2Pj7COYz3N8fM_xmGdK_l1QQKPb4e1vY28dL7zfH-7_9L7e_v1l-Glw5334PBiNR38NP3qvP9kIb7v_zWb7wxvcjW8fRrvvXw9vhbc5HJ6QoGU0M3fhd5NQ8JUkCVIkSJMgnwR1aSJoFUdTkyRRvPvJcwYMZhsKOoLmy9U63X09ETSNYkPBM6XzdGEooHH4bWEeTDgzcbtDgmYmDeeLbJlVPP8extubzfYHCRqtwmUSeK32buX7dRp4N1LcKJq8CIrW6XGFJA0fDQXyRdir-DxP0vlymra7pxLOLXGkvm29pzB5Oo8clSgXJW_9kK6GKHEjSw3RlQyRTTjil0o5nmq9jOKZic3s5GTZWUrFqg4We1TRbUqFhWVHFb0aKkQloX-EydPIpPerts75Nd6uTPCmDT4NhyRoYf5JP2QX8fHXeP749P8HuxxeXdblu6gVrdq6m3fi7Nr9k7WlQ_IsgtdWrbau0kVAx2GOeo13kYsj7pY4tJGtJbIJT_xSKTV7QFZvowuqsLCsrI3cVNRuI_nebaTs51_ZjL9utf0qjQB0HO7lVeON4OCIdLfEoRFsLZFNeOKXSqmZRVW9ES6owsKyskZwU1G7EdR7N4K2n39tM_5-K3ulcG4EoONwL_uNN4KDI9LdEodGsLVENuGJXyqlZhZ19Ua4oAoLy8oawU1F7UbQ790Ivv38-zbj321V6QOg4nAnrxvvAwc_pKshDm1ga4hswhG_VErNHPrV2-CCKiwsK2sDNxW128D_mf9fnJH2YJJVtEyM1b8Tnd3Fmdmj2ZuVROt4ar7E0TRbZv_xPuOyL2YmSfdH5f7DYLk_tBP4FpZ5WL6F_RNYusFS1aKv69CqV4fWmqcV67jmHdfs0l1-ZR6WQDdPq04t-qoOrcGk-azj4GZ3HWCVh3ssDC76ih-UHj8pfZa-5uHrOsHmYRRsQINg8zQKNk-jYEvQpahM-VoB2QY0CjfAUboRDiYd4Cjfkq9UifBCu3B4IeOSrxd06Xy_SJByWWgYp0cwT8NnMMDRQ5jH4VOYx2Fa-XqVfWB8oV-d0srTMK08DtMKcDSyPA7TWmjZE-OVBNsnvmVzeCGtqlA1LmlVfNMosHtT_D4GGAdolFaEg7QCHKUV4HDTzJes6gLjCy3rklZAo7QCHKUV4WhkeRylVfFbWNUHON-yObyYVn4Xiy6dbxrdAe9ahaZxSSugUVoRDtIKcJRWgKO0ar5ktQLGF1rW6S2Xp-FrLo_D91yAoxddHkdp1fxWViPr-JbN4YW0an4vm7_0ycsv_wUAAP__w6sofg==
 
 # INTERSECT ALL and INTERSECT with different ORDER BY types.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) INTERSECT ALL (SELECT x FROM xyz ORDER BY z) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll1r2zAUhu_3K8K52piCLdnOh2HQMQorlHY0uRu5cGOtCaSRkR1oVvrfR5yGznGs14pb3TWNH-n10XNy9Exrlcqb5FHmFP8mTowEMQqIUUiMIpoxyrSayzxXevfIHrhKnyj2GS3X2abY_XvGaK60pPiZimWxkhTTNLlfyTuZpFJ7PjFKZZEsV-U2mV4-Jnp78bT9S4wmWbLO417f2-18uyni3gWn2QsjtSlel39b9X7bWyT5orpe-fyMUV4kD5Ji_sLOixk5jSkaY76ts1krnUot08pKsx2JHjnxrj-TfDGRxW3m8aMTmW4zGfeubqaXd5PLH9Pe9-trYrSSf4rPF_zLN718WJR_Nb7622sFNtWfKF1I7fHouFJfG9cPW5TtVEVeFz0R4kb1VeYJ_7jGJ7ePKtvz9nLxFnJ5ou8FH9IFFkEHjoOKxqAO-oA76gNQ_0MfDM7tA9H-fEWb8w36XvghIloEHToOKhqDOhBROBIR1P8g4vBcEYP25xu0Od-wX47l9xfRIujIcVDRGNSBiIEjEUH9DyKOzhUxbH--YZvzjfofoqFFzLHTmKIxpgMJQ0cSguofJBy_x_X0xPp3Ms_UOpetbp7-rmYyfZD7M8jVRs_lL63m5Tb7j7clV143UpkX-2_F_sPVev_VLmB7eNgF5rwTHXWix2aaW9RM2MHDLvBRzWzpqBM9NtPimPb_p4MK7B_DgREOzacVGmHBzVtHXfrDDIP-MMOoPwAN-gPQoD8GXfrDDIP-MMOoPwAN-gPQoD-GRktHZklHXfpj3MVwMwwMN8PIcEADwwGNJoDN2Kz_ktrMTVsaDgGryWmNA815bYpUVOXCLDo3jxFgOq_NERvVAQ1cBzSSHeHAdoQj3Wsz1Ep3M410N9NQd4Aj3QGOdK8N0qruA6B7baZY6V6bKVa6m2mku5mGugMc6Q5wpHttnlrpbqaR7mYa6g5wpDvAke61qVq9a_tm3UVtthh1n718-hcAAP__RbNefQ==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll9vokwUh-_fT0HOVc07BmYA_5Bs0u7WzZq42hUvdtNwQWW2mlhhB0y0Tb_7BqxxEZnDSMud1nlmfpx5Tg8vEP9ZgQPuYDT4MtM2YqV9nU6-a_eDn3ejm-FYu7odujP3x6ilXb2t2e5XbHfP2mR6O5hqn39pu5Y2HM8GUzddcDMaSRc_t46ftx4QWIcBH_tPPAbnHigQYEDABAIWELDBIxCJcM7jOBTpkpcMGAZbcAwCy3W0SdI_ewTmoeDgvECyTFYcHJj5Dys-5X7AhW4AgYAn_nKVHROJ5ZMvdtfb3TMQcCN_HTtaW09PnmwSR7um4L0SCDfJ2_bHXR922sKPF_n9svUegTjxHzk49JVcFtNuNCYrjXncZ7MORcAFD3I7eSmJLTnzrN_8eOHyZBLp9ORGZruIO3mNgMCK_06urmnrk1g-LrJPpY9-fCxTpfpuKBIudGqfVur_0v2tCmU7V5G3Tc-EGIftMNKZcVrjs8fbueNpdbloBbl01tbND-kChaCdhoOy0qAN9AFtqA-Q-h_6oHNpH7Dq98uq3K_Z1q0PEVEhaLfhoKw0aAMisoZEROp_ELF7qYhm9fs1q9yv1c7G8vuLqBC013BQVhq0ARHNhkRE6n8QsXepiFb1-7Wq3K_d_hANFWL2G43JSmM2IKHVkIRI9Q8S9t_j9fTM_lMeR-E65pXePI20Zjx45Ps7iMONmPM7Ec6zY_ZfJxmXvW4EPE72v7L9l-F6_1MasDrcrQNTWou2a9F9OU0VasbU4G4d-KRmqrRdi-7LaXZKG__SZg42TmFTClvy27KkMKPyo-06_SGHkf6Qw1h_IDTSHwiN9EenTn_IYaQ_5DDWHwiN9AdCI_3RlVrak0vaq9Mf_TqGy2HEcDmMGY7QiOEIjU0AlbFZ_E-qMjdVaXQIKE1OZRzRnBamSE5VyuSiU_kYQUynhTmiojpCI64jNCY7hiO2Yzime2GGKukupzHd5TSqO4JjuiM4pnthkOZ17yC6F2aKku6FmaKku5zGdJfTqO4IjumO4JjuhXmqpLucxnSX06juCI7pjuCY7oWpmn_XNuS6s8Jskeruvf73NwAA___ClYKq
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) INTERSECT (SELECT x FROM xyz ORDER BY z) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mN-L6kYcxd_7V8g8tTQSZ77jr0BhS3uhC5fdsvpWfMg101XwmpBEWLvs_17Uq64Z8z2ZJPrmrzNzcuZ7PiS-i3Ucmafwu8lE8I-QwhNKeIKEJ7TwRF_MPJGk8dxkWZzufnIQPEZvIuh5YrlONvnu45kn5nFqRPAu8mW-MiIQ0_DbyryYMDKp3xOeiEweLlf7bZJ0-T1Mtw9v2_-EJyZJuM6CTtff7fy8yYPOgxSzD0_Em_y8fJaHr0YE8sOrbuHPZZYv1_Pc71_ub61_lnzbdhZhtrjy-7MH5eLhcwyyvRyoVg6y3SB0qYnzOpt1nEYmNdHFSvtVSm2qHrB5ttC_lQWU1NnCoIEFr5bLv8JsMTH5c-JTIanpNjFB5_Fp-uVl8uWPaef3r1-FJ1bm3_znB_nLb-nydbF_VWHChi4TNonT3KQ-Wan9Wrr-qEJs1xL5segVE09xN0583StmfHX78cX20qHEFTrsq65PzjQDJk6zObghzVyCaDMJqpWEbDcKXWqiIUxkTZ61aAElVcYzNwuNeSbvxDMwYUeeWalV5Zmq3iNVpUbU9bUzUICJ03AMbwgUhyBkm0lQrSRku1HoUhMN26xqAqVFCyipMqC4WWgMFHUnoIAJOwLFSq0qUKh6j6hKjXR3_1TkBhRg4jQcoxsCxSEI2WYSVCsJ2W4UutREwzZTTaC0aAElVQYUNwuNgUJ3AgqYsCNQrNSqAkVX75GuUqN-1xknwMJpNMY3xIlDDLK9HKhWDrLdIHSpiYZN1jVh0qIFlFQZTNwsNIaJvhNMwIQdYWKlVufvmyvrv5gsideZqfTPTG-XmYlezeEMsniTzs3faTzfb3N4-7zX7T-ITJYfvpWHN4_rw1c7g5_FsiiWn8X6QizdxJKaqJVspB43UdOQVys2ceITJ3brPr8zL5bgvHi1Uk3U1GukHvFqzSY-4MV9B7EqigeseMif9ZAVg2sesWINij3mqdADWLCg4sQFXg3BwMshGYAcoYGXIzZICy2XwSsQvMUWFzwANeIDkCNAADkiBJKDukiLMJfBo-h4xBTkFiYkDxk5AMfOYwZdOs8ZOQKbW6RxKjuvhmXn5bDsQI7Kzsth2XnKKkBZxaMGTCxQo7IDOSo7kKOyIzmYeMVTVoGhU_wdXEFulV3xqFEaHDuPGnTpPGkUII2ySONSdqBGZQdyVHYkB2UHcnjXz1NWAcoqHjWo7ICy6NwAJlHZASZR2YEcTTxPWQJTQ_wDckFulZ141BC4oSMeNeDSiScNAdKQRRqXsgM1KjuQo7IjOSg7kKOyE09ZApQlHjXoKR9QFp0bwCR6zgeYRA_6QI4mnqcsoWPnn5oLcrvsPGo0uKHTPGqKlz77-On_AAAA__-RYO5e
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mE1v6kYYhff9FdasEtXIzAcfsVQptw1VkWi4BRatrlj4wjRB4mJqGwkS5b9XmCQED36PxzbZJeAzc3zmPY9snln835L5bNwb9H6bOJto6fw-Gv7pfOv9_XXwpX_vXN31x5PxX4Nr5-r1mu3hiu3uyRmO7noj59d_nN2107-f9Ebj_QXUhU_Xx7-3U-ayVTjX98EPHTP_G-PMZYK5TDKXKeayFpu6bB2FMx3HYbS_5DkV9Odb5jddtlitN8n-46nLZmGkmf_MkkWy1Mxnk-D7Uo90MNeR12Qum-skWCzTbdbR4kcQ7W63uyfmsvE6WMW-0_D2Ow83ie_ccjZ9cVm4SY7Lx0nwoJnPX9ziFu4WcbJYzRKvdbq_sf5R8n3nPAbx45nrjx6EjYePMfD6cpClcuD1BqFyTRzX2azCaK4jPT9ZKV0l16ZoAptHC61LWUBJHS20K1hwS7n8I4gfxzoZrj2ZSWqyW2v_Awq-DAbMZUv9b3J1y69_iRYPj-lfBSasYzNh4zBKdORJI7Wfc9fvFojtXCKvi54xcR82wrWnmtmMz25_c7I9tyhxgQ57ouFJa5oBE--z2b4gzWyCqDMJWSoJXm8UKtdERZjwkjyr0QJKKo9ndhYq84x_Es_AhL3xzEitKM9E8R6JIjWSDU9ZAwWYeB-OzgWBYhEErzMJWSoJXm8UKtdExTaLkkCp0QJKKg8odhYqA0V8ElDAhL0BxUitKFBk8R7JIjVSjfStyA4owMT7cHQvCBSLIHidSchSSfB6o1C5Jiq2WZYESo0WUFJ5QLGzUBko8pOAAibsDShGakWBoor3SBWpUathjRNg4X00bi6IE4sYeH05yFI58HqDULkmKjZZlYRJjRZQUnkwsbNQGSbqk2ACJuwNJkZqZX6-ObP-SMfrcBXrQr_MNPeZ6fmDPpxBHG6imf4ahbN0m8O_w1SXfjDXcXL4lh_-6a8OX-0NfhTzrJh_FKsTMbcTc1lFLXgl9U0VtezQakEmLunEJbl1i96ZFnNwXrRaiCpq2ayk7tJqRSbepsUtC7HIitukuEOfdYcUg3vukmIFin1DU6EJsGBAxYoLtBqCgZZDMgA5QgMtR2zgBlpOgxcgeIMtNngAasQHIEeAAHJECCQHdeEGYU6DR9HRiMnIDUxwGjK8DY6dxgy6dZozvAs2N0hjVXZaDctOy2HZgRyVnZbDstOUFYCygkYNmFigRmUHclR2IEdlR3Iw8YKmrABDJ-gnuIzcKLugUSMUOHYaNejWadIIQBphkMam7ECNyg7kqOxIDsoO5PCpn6asAJQVNGpQ2QFl0bkBTKKyA0yisgM5mniashJMjaRfkDNyo-ySRo0ED3SSRg24dUmTRgLSSIM0NmUHalR2IEdlR3JQdiBHZZc0ZSWgrKRRg97yAWXRuQFMovd8gEn0og_kaOJpykp07PRbc0Zulp1GjQIPdIpGTfbWpy8__R8AAP__SPwRoQ==
 
 # INTERSECT ALL and INTERSECT with different numbers of ORDER BY columns.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) INTERSECT ALL (SELECT x FROM xyz ORDER BY y, z) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll1r2zAUhu_3K8K52piCLdnOh2HQMQorlHY0uRu5cGOtCaSRkR1oVvrfR5yGznGs14pb3TWNH-n10XNy9Exrlcqb5FHmFP8mTowEMQqIUUiMIpoxyrSayzxXevfIHrhKnyj2GS3X2abY_XvGaK60pPiZimWxkhTTNLlfyTuZpFJ7PjFKZZEsV-U2mV4-Jnp78bT9S4wmWbLO417f2-18uyni3gWn2QsjtSlel39b9X7bWyT5orpe-fyMUV4kD5Ji_sLOixk5jSkaY76ts1krnUot08pKsx2JHjnxrj-TfDGRxW3m8aMTmW4zGfeubqaXd5PLH9Pe9-trYrSSf4rPF_zLN718WJR_Nb7622sFNtWfKF1I7fHouFJfG9cPW5TtVEVeFz0R4kb1VeYJ_7jGJ7ePKtvz9nLxFnJ5ou8FH9IFFkEHjoOKxqAO-oA76gNQ_0MfDM7tA9H-fEWb8w36XvghIloEHToOKhqDOhBROBIR1P8g4vBcEYP25xu0Od-wX47l9xfRIujIcVDRGNSBiIEjEUH9DyKOzhUxbH--YZvzjfofoqFFzLHTmKIxpgMJQ0cSguofJBy_x_X0xPp3Ms_UOpetbp7-rmYyfZD7M8jVRs_lL63m5Tb7j7clV143UpkX-2_F_sPVev_VLmB7eNgF5rwTHXWix2aaW9RM2MHDLvBRzWzpqBM9NtPimPb_p4MK7B_DgREOzacVGmHBzVtHXfrDDIP-MMOoPwAN-gPQoD8GXfrDDIP-MMOoPwAN-gPQoD-GRktHZklHXfpj3MVwMwwMN8PIcEADwwGNJoDN2Kz_ktrMTVsaDgGryWmNA815bYpUVOXCLDo3jxFgOq_NERvVAQ1cBzSSHeHAdoQj3Wsz1Ep3M410N9NQd4Aj3QGOdK8N0qruA6B7baZY6V6bKVa6m2mku5mGugMc6Q5wpHttnlrpbqaR7mYa6g5wpDvAke61qVq9a_tm3UVtthh1n718-hcAAP__RbNefQ==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt9vok4QwN-_fwWZp5rvGtgF_EFySXtXL2fiaU98uEvDA5W9amKFWzDRNv3fL2CNh8gOKy1vpexnd5j5jLMvEP9ZgQPuYDT4MtM2YqV9nU6-a_eDn3ejm-FYu7odujP3x6ilXb2t2e5XbHfP2mR6O5hqn39pu5Y2HM8GUzddcDMayRcT7bl1fNx6QGAdBnzsP_EYnHugQIABARMIWEDABo9AJMI5j-NQpEteMmAYbMExCCzX0SZJ_-0RmIeCg_MCyTJZcXBg5j-s-JT7ARe6AQQCnvjLVXZMJJZPvthdb3fPQMCN_HXsaG09PXmySRztmoL3SiDcJG_bH3d92GkLP17k98vWewTixH_k4NBXclmYdqNhstIwj_ts1qEIuOBBbicvJbElZ771mx8vXJ5MIp2eVGS2i7iTNwkIrPjv5Oqatj6J5eMi-6v004-fZapk3w1FwoVO7dNM_V-6v1Uhbecy8rbpmSDGYTuMdGac5vjs8XbueFpdLlpBLp21dfNDukAh0E7DgbLSQBvoA9pQHyD5P_RB59I-YNXry6rU12zr1oeIqBBot-FAWWmgDYjIGhIRyf9BxO6lIprV62tWqa_Vzsby-4uoEGiv4UBZaaANiGg2JCKS_4OIvUtFtKrX16pSX7v9IRoqhNlvNExWGmYDEloNSYhk_yBh_z2up2f2n_I4Ctcxr3TzNNKc8eCR72sQhxsx53cinGfH7B8nGZddNwIeJ_u3bP8wXO9fpQFWh7t1YEpr0XYtui-nqULOmBrcrQOf5EyVtmvRfTnNTmnjX9rMwcYpbEphS14tSwozKj_artMfchjpDzmM9QdCI_2B0Eh_dOr0hxxG-kMOY_2B0Eh_IDTSH12ppT25pL06_dGvY7gcRgyXw5jhCI0YjtDYBFAZm8VfUpW5qUqjQ0BpcirjiOa0MEVyqlImF53KxwhiOi3MERXVERpxHaEx2TEcsR3DMd0LM1RJdzmN6S6nUd0RHNMdwTHdC4M0r3sH0b0wU5R0L8wUJd3lNKa7nEZ1R3BMdwTHdC_MUyXd5TSmu5xGdUdwTHcEx3QvTNX8XduQ684Ks0Wqu_f6398AAAD__yT5g28=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) INTERSECT (SELECT x FROM xyz ORDER BY y, z) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mN-L6kYcxd_7V8g8tTQSZ77jr0BhS3uhC5fdsvpWfMg101XwmpBEWLvs_17Uq64Z8z2ZJPrmrzNzcuZ7PiS-i3Ucmafwu8lE8I-QwhNKeIKEJ7TwRF_MPJGk8dxkWZzufnIQPEZvIuh5YrlONvnu45kn5nFqRPAu8mW-MiIQ0_DbyryYMDKp3xOeiEweLlf7bZJ0-T1Mtw9v2_-EJyZJuM6CTtff7fy8yYPOgxSzD0_Em_y8fJaHr0YE8sOrbuHPZZYv1_Pc71_ub61_lnzbdhZhtrjy-7MH5eLhcwyyvRyoVg6y3SB0qYnzOpt1nEYmNdHFSvtVSm2qHrB5ttC_lQWU1NnCoIEFr5bLv8JsMTH5c-JTIanpNjFB5_Fp-uVl8uWPaef3r1-FJ1bm3_znB_nLb-nydbF_VWHChi4TNonT3KQ-Wan9Wrr-qEJs1xL5segVE09xN0583StmfHX78cX20qHEFTrsq65PzjQDJk6zObghzVyCaDMJqpWEbDcKXWqiIUxkTZ61aAElVcYzNwuNeSbvxDMwYUeeWalV5Zmq3iNVpUbU9bUzUICJ03AMbwgUhyBkm0lQrSRku1HoUhMN26xqAqVFCyipMqC4WWgMFHUnoIAJOwLFSq0qUKh6j6hKjXR3_1TkBhRg4jQcoxsCxSEI2WYSVCsJ2W4UutREwzZTTaC0aAElVQYUNwuNgUJ3AgqYsCNQrNSqAkVX75GuUqN-1xknwMJpNMY3xIlDDLK9HKhWDrLdIHSpiYZN1jVh0qIFlFQZTNwsNIaJvhNMwIQdYWKlVufvmyvrv5gsideZqfTPTG-XmYlezeEMsniTzs3faTzfb3N4-7zX7T-ITJYfvpWHN4_rw1c7g5_FsiiWn8X6QizdxJKaqJVspB43UdOQVys2ceITJ3brPr8zL5bgvHi1Uk3U1GukHvFqzSY-4MV9B7EqigeseMif9ZAVg2sesWINij3mqdADWLCg4sQFXg3BwMshGYAcoYGXIzZICy2XwSsQvMUWFzwANeIDkCNAADkiBJKDukiLMJfBo-h4xBTkFiYkDxk5AMfOYwZdOs8ZOQKbW6RxKjuvhmXn5bDsQI7Kzsth2XnKKkBZxaMGTCxQo7IDOSo7kKOyIzmYeMVTVoGhU_wdXEFulV3xqFEaHDuPGnTpPGkUII2ySONSdqBGZQdyVHYkB2UHcnjXz1NWAcoqHjWo7ICy6NwAJlHZASZR2YEcTTxPWQJTQ_wDckFulZ141BC4oSMeNeDSiScNAdKQRRqXsgM1KjuQo7IjOSg7kKOyE09ZApQlHjXoKR9QFp0bwCR6zgeYRA_6QI4mnqcsoWPnn5oLcrvsPGo0uKHTPGqKlz77-On_AAAA__-RYO5e
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mE1v6kYYhff9FdasEtXIzAcfsVQptw1VkWi4BRatrlj4wjRB4mJqGwkS5b9XmCQED36PxzbZheAzc3zmPY9snln835L5bNwb9H6bOJto6fw-Gv7pfOv9_XXwpX_vXN31x5PxX4Nr5-r1mu3hiu3uyRmO7noj59d_nN2107-f9Ebj_QXkha7zdH38uJ0yl63Cub4PfuiY-d8YZy4TzGWSuUwxl7XY1GXrKJzpOA6j_SXPqaA_3zK_6bLFar1J9v-eumwWRpr5zyxZJEvNfDYJvi_1SAdzHXlN5rK5ToLFMt1mHS1-BNHudrt7Yi4br4NV7DsNb7_zcJP4zi1n0xeXhZvkuHycBA-a-fzFLW7hbhEni9Us8Vqn-xvrHyXfd85jED-euf7oQdh4-BgDry8HWSoHXm8QKtfEcZ3NKozmOtLzk5XSVXJtiiawebTQupQFlNTRQruCBbeUyz-C-HGsk-Hak5mkJru19j_Q4MtgwFy21P8mV7f8-pdo8fCY_lVgwjo2EzYOo0RHnjRS-zl3_W6B2M4l8rroGRP3YSNce6qZzfjs9jcn23OLEhfosCcanrSmGTDxPpvtC9LMJog6k5ClkuD1RqFyTVSECS_JsxotoKTyeGZnoTLP-CfxDEzYG8-M1IryTBTvkShSI9nwlDVQgIn34ehcECgWQfA6k5ClkuD1RqFyTVRssygJlBotoKTygGJnoTJQxCcBBUzYG1CM1IoCRRbvkSxSI9VI34rsgAJMvA9H94JAsQiC15mELJUErzcKlWuiYptlSaDUaAEllQcUOwuVgSI_CShgwt6AYqRWFCiqeI9UkRq1GtY4ARbeR-PmgjixiIHXl4MslQOvNwiVa6Jik1VJmNRoASWVBxM7C5Vhoj4JJmDC3mBipFbm55sz6490vA5XsS70y0xzn5meP-jDGcThJprpr1E4S7c5fBymuvQfcx0nh2_54UN_dfhqb_CjmGfF_KNYnYi5nZjLKmrBK6lvqqhlh1YLMnFJJy7JrVv0zrSYg_Oi1UJUUctmJXWXVisy8TYtblmIRVbcJsUd-qw7pBjcc5cUK1DsG5oKTYAFAypWXKDVEAy0HJIByBEaaDliAzfQchq8AMEbbLHBA1AjPgA5AgSQI0IgOagLNwhzGjyKjkZMRm5ggtOQ4W1w7DRm0K3TnOFdsLlBGquy02pYdloOyw7kqOy0HJadpqwAlBU0asDEAjUqO5CjsgM5KjuSg4kXNGUFGDpBP8Fl5EbZBY0aocCx06hBt06TRgDSCIM0NmUHalR2IEdlR3JQdiCHT_00ZQWgrKBRg8oOKIvODWASlR1gEpUdyNHE05SVYGok_YKckRtllzRqJHigkzRqwK1LmjQSkEYapLEpO1CjsgM5KjuSg7IDOSq7pCkrAWUljRr0lg8oi84NYBK95wNMohd9IEcTT1NWomOn35ozcrPsNGoUeKBTNGqytz59-en_AAAA__9bzhJm
 
 # INTERSECT ALL and INTERSECT with compatible ORDER BY columns that are not in the final result.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz ORDER BY z) INTERSECT ALL (SELECT y FROM xyz ORDER BY z)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzElkFr2zAYhu_7FeE7bSDjSLbTxjDIGIUVSjKS3IYPbqwlgdQykgPNSv77sD2WxYn1WdOi3Zraj_Tq0wN-3yAXGZ-mL1xB_A0oEGBAIAACIRCIICFQSLHiSglZvdIAj9krxEMC27zYl9W_EwIrITnEb1Buyx2HGJbp847PeZpx6Q-BQMbLdLurtynk9iWVh8nr4QcQWBRpruKB51c7z_ZlPJgwSI4ExL78tfxp1efDYJOqzfl6EwrJMSGgynTNIaZH8ncxI6cxWWfM0zr7XMiMS56drZRUJPbKlbN-SdVmwctZ4dPWjSwPBY8Hj9Plw3zx8Hk5-PT0BAR2_Hv5fkI_fJTb9ab-6_fRaevop2MFFse6knkqPFH4NGoP4Ore4dnetP_N0x437zPPD26iqEHQkeOgrDOoA0mpI0lZ__mzPvMPPD-8iSgGQe8cB2WdQR2IwhyJEvSff9Bn_qFXf3P-vSgGQe8dB2WdQR2IEjgSJew__7DP_CPvJpoYxBw7jck6YzqQJPwP3ehKojlXhcgV79V8htWZeLbmzYyU2MsV_yrFqt6m-TmrufornnFVNk9Z8-Mxbx5VAfvDIxt4bANTq9w00tPUYGTMDB7ZwGMbmFrlbo3sgmZtevgnHejnHWhhej6zYZsObQTXw4jgehgRXA9jgiM0InhkI7geRgTXw4jgehgTHKERwUc2gt_ZKKqHEUX1MKKoHsYURWhE0XsbRfUwoqgeRhTVw5iiCI0oOrZRlFr1BIRGJEVoxFKExjTFcKwr2JUFu7ZgVxcs-4JdYaBWjYFeVAYjW_U0ZquexmzV06itCI7ZalKWLu_MpC2Z0pitRn3JGMdsvSgPWluT47ufAQAA__9XmVno
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzElkFv2jAYhu_7FdZ3aiWjYCfQEmkS3co0JAYdcNhU5ZASryBRktlBKq3471NCtY4A_uJ59W6l-LFff34k3mdQP5cQwqQ36H2ckrVckk_j0Rdy2_t2M7jqD8nZdX8ynXwdnJOzlzWb3YrHzRMZja97Y_LhO3k6J_3htDeeFAuuBgNkcQQUVmkihvGDUBDeAgMKHCj4QCEACi2IKGQynQmlUlkseS6BfvIIYZPCYpWt8-LfEYVZKgWEz5Av8qWAEKbx3VKMRZwI6TWBQiLyeLEsj8nk4iGWm-7j5gkoTLJ4pULS8IqTR-s8JF0O0ZZCus5ftn_d9W5D5rGa7-_XZRBtIwoqj-8FhGxL_y5my2lMfjLm6z7rVSoTIUWyt1NUkNiSI3f9HKv5ROSjzGOVF5luMhHuuwMUluJHftZl5-_l4n5e_vX76qxy9ddr-RbXOpJ5mDbSzGOt6gCOnh3snc3qvzyr8fIeb3j-myhqELTtOCg_GdSBpMyRpLz-_Hmd-fsNL3gTUQyCXjgOyk8GdSAKdySKX3_-fp35B43yN-ffi2IQ9NJxUH4yqANRfEeiBPXnH9SZf6vxJpoYxOw4jclPxnQgSfAfutGRRGOhsnSlRK3m0yzuJJJ7sZuRStdyJm5kOiuP2X0clVz5K54Ile--5bsP_dXuqyJgfbhtA3dsYGaVm7X0NDMYGTeD2zZwxwZmVrkrIzugeZVu_kn7-nn7Wpjtz6xZpQMbwfUwIrgeRgTXw5jgCI0I3rIRXA8jguthRHA9jAmO0IjgbRvBL2wU1cOIonoYUVQPY4oiNKLopY2iehhRVA8jiuphTFGERhTt2CjKrHoCQiOSIjRiKUJjmmI41hXsyoJdW7CrC5Z9wa4wMKvGwA4qg5GtehqzVU9jtupp1FYEx2w1KUuHb2bSlkxpzFajvmSMY7YelAetrdH23a8AAAD__7tseyk=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz ORDER BY z) INTERSECT ALL (SELECT y FROM xyz ORDER BY z)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzElkFr2zAYhu_7FeE7bSDjSLbTxjDIGIUVSjKS3IYPbqwlgdQykgPNSv77sD2WxYn1WdOi3Zraj_Tq0wN-3yAXGZ-mL1xB_A0oEGBAIAACIRCIICFQSLHiSglZvdIAj9krxEMC27zYl9W_EwIrITnEb1Buyx2HGJbp847PeZpx6Q-BQMbLdLurtynk9iWVh8nr4QcQWBRpruKB51c7z_ZlPJgwSI4ExL78tfxp1efDYJOqzfl6EwrJMSGgynTNIaZH8ncxI6cxWWfM0zr7XMiMS56drZRUJPbKlbN-SdVmwctZ4dPWjSwPBY8Hj9Plw3zx8Hk5-PT0BAR2_Hv5fkI_fJTb9ab-6_fRaevop2MFFse6knkqPFH4NGoP4Ore4dnetP_N0x437zPPD26iqEHQkeOgrDOoA0mpI0lZ__mzPvMPPD-8iSgGQe8cB2WdQR2IwhyJEvSff9Bn_qFXf3P-vSgGQe8dB2WdQR2IEjgSJew__7DP_CPvJpoYxBw7jck6YzqQJPwP3ehKojlXhcgV79V8htWZeLbmzYyU2MsV_yrFqt6m-TmrufornnFVNk9Z8-Mxbx5VAfvDIxt4bANTq9w00tPUYGTMDB7ZwGMbmFrlbo3sgmZtevgnHejnHWhhej6zYZsObQTXw4jgehgRXA9jgiM0InhkI7geRgTXw4jgehgTHKERwUc2gt_ZKKqHEUX1MKKoHsYURWhE0XsbRfUwoqgeRhTVw5iiCI0oOrZRlFr1BIRGJEVoxFKExjTFcKwr2JUFu7ZgVxcs-4JdYaBWjYFeVAYjW_U0ZquexmzV06itCI7ZalKWLu_MpC2Z0pitRn3JGMdsvSgPWluT47ufAQAA__9XmVno
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzElkFv2jAYhu_7FdZ3aiWjYCfQEmkS3co0JAYdcNhU5ZASryBRktlBKq3471NCtY4A_uJ59W6l-LFff34k3mdQP5cQwqQ36H2ckrVckk_j0Rdy2_t2M7jqD8nZdX8ynXwdnJOzlzWb3YrHzRMZja97Y_LhO3k6J_3htDeeFAuuBgNkcQQUVmkihvGDUBDeAgMKHCj4QCEACi2IKGQynQmlUlkseS6BfvIIYZPCYpWt8-LfEYVZKgWEz5Av8qWAEKbx3VKMRZwI6TWBQiLyeLEsj8nk4iGWm-7j5gkoTLJ4pULS8IqTR-s8JF0O0ZZCus5ftn_d9W5D5rGa7-_XZRBtIwoqj-8FhGxL_y5my2lMfjLm6z7rVSoTIUWyt1NUkNiSI3f9HKv5ROSjzGOVF5luMhHuuwMUluJHftZl5-_l4n5e_vX76qxy9ddr-RbXOpJ5mDbSzGOt6gCOnh3snc3qvzyr8fIeb3j-myhqELTtOCg_GdSBpMyRpLz-_Hmd-fsNL3gTUQyCXjgOyk8GdSAKdySKX3_-fp35B43yN-ffi2IQ9NJxUH4yqANRfEeiBPXnH9SZf6vxJpoYxOw4jclPxnQgSfAfutGRRGOhsnSlRK3m0yzuJJJ7sZuRStdyJm5kOiuP2X0clVz5K54Ile--5bsP_dXuqyJgfbhtA3dsYGaVm7X0NDMYGTeD2zZwxwZmVrkrIzugeZVu_kn7-nn7Wpjtz6xZpQMbwfUwIrgeRgTXw5jgCI0I3rIRXA8jguthRHA9jAmO0IjgbRvBL2wU1cOIonoYUVQPY4oiNKLopY2iehhRVA8jiuphTFGERhTt2CjKrHoCQiOSIjRiKUJjmmI41hXsyoJdW7CrC5Z9wa4wMKvGwA4qg5GtehqzVU9jtupp1FYEx2w1KUuHb2bSlkxpzFajvmSMY7YelAetrdH23a8AAAD__7tseyk=
 
 # INTERSECT ALL and INTERSECT with a projection on the result.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x FROM ((SELECT x, y FROM xyz) INTERSECT ALL (SELECT x, y FROM xyz))]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzEllGL2kwUhu-_XyHn6itMiDNJ3DVQsJSFCosW9a7kImumKriZMBNh7eJ_L0m6WKOZk-lgcpk1T-adcx7Y9x1SkfBZ_MoVhD-AAgEGBDwg4AOBACICmRRrrpSQxSsVME3eIBwS2KXZIS_-HBFYC8khfId8l-85hLCKX_Z8weOES3cIBBKex7t9eUwmd6-xPE7ejr-AwDKLUxUOHLc4eX7Iw8GEkgmD6ERAHPI_J5w__HIcbGO1vfzkBxIRUHm84RDSE_m3sEEPYVlj2POnDqmQCZc8ufhYVJDYKzdu_C1W2yXP55lLa9tZHTMeDqaz1dNi-fR1Nfjy_AwE9vxn_n8Z_NNnudtsPx7OY6jN4Hw5z-JyN5LPhCMylwb1Mdw82784m7a3gLawwGWO691RWoO4o17issa4HWhLO9WWtd8Fa7MLz3H9O6pjEPehl7isMW4H6rBO1fHa78JrswvfKf9H3Usdg7iPvcRljXE7UMfrVB2__S78NrsInDuKYxB23ENY1hi2A2383jrWjVwLrjKRKt6qQQ2Lm_Fkw6tJKXGQa_5dinV5TPU4L7myASRc5dWvrHqYptVPRcD28MgGHtvA1Co3DfQ0NRgZM4NHNvDYBqZWuWsju6JZnR7-TXv6eXtamF7ObFinfRvB9TAiuB5GBNfDmOAIjQge2AiuhxHB9TAiuB7GBEdoRPCRjeAPNorqYURRPYwoqocxRREaUfTRRlE9jCiqhxFF9TCmKEIjio5tFKVWPQGhEUkRGrEUoTFNMRzrCnZlwa4t2NUFy75gVxioVWOgV5XByFY9jdmqpzFb9TRqK4JjtpqUpeudmbQlUxqz1agvGeOYrVflQWtrdPrvdwAAAP__prFsYg==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzElkFv2jAYhu_7FdF3Asko2Am0RJrUamMaEoMOOEyqckiJV5AoyewgQav-9ylJESOAv3gWyTHET_za3yPxvoH8swIPpv1h_8vM2oiV9W0y_mE99n89DO8HI6vxdTCdTX8Om9bHkm2-oNHYPxNrl_-03b02rcFo1p9M0xf3w6F1flHTBwLrKOSj4IVL8B6BAgEGBBwg4AKBDvgEYhHNuZSRSJe8ZcAg3ILXJrBcx5sk_dknMI8EB-8NkmWy4uDBLHha8QkPQi7sNhAIeRIsV9k2sVi-BGJ3t929AoFpHKylZ7XsdOfxJvGsO0ruGPjvBKJN8rHD4cNPO2sRyMXxJ_eIT0AmwTMHj76T_wvbqSEsuxj28KnNOhIhFzw8-pifktiSMyf-HsjFlCfj2KaF6cx2MfeOBQICK_47aWTBm5_F8nmxfzhcQ-EODodzDA53JvkoakWxTTvFazi7t3u0Ny1vAS1hgc1atnNFaTXidmuJyy7GrUBbWqm2rPwsWJlZOC3bvaI6GnFvaonLLsatQB1WqTpO-Vk4ZWbhtrL_qGupoxH3tpa47GLcCtRxKlXHLT8Lt8wsOq0riqMRtldDWHYxbAXauLV1rDO5JlzG0VryUg2qnZ6Mh888vykZbcScP4honm2TP44zLmsAIZdJ_pblD4N1_ioNWB7umsA9E5ga5aYdNU01rozpwV0TuGcCU6PchSs7oVmRbv9LO-r7dpQwPb6zdpF2TQRXw4jgahgRXA1jgiM0InjHRHA1jAiuhhHB1TAmOEIjgndNBL8xUVQNI4qqYURRNYwpitCIorcmiqphRFE1jCiqhjFFERpRtGeiKDXqCQiNSIrQiKUIjWmK4VhXMCsLZm3BrC4Y9gWzwkCNGgM9qQxatqppzFY1jdmqplFbERyzVacsnc5Mpy3p0pitWn1JG8dsPSkPSlv9909_AwAA__-KBI1m
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x FROM ((SELECT x, y FROM xyz) INTERSECT (SELECT x, y FROM xyz))]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmE9r40gUxO_7KUyfdkFGft2S_wgWsuwEJhCSIfFt8EGxemKDYwlJhnhCvvtgm7FjyXqlVkuZo-P81NWlV6WW38Q6jvRd-KIzEXwXJBwhhSOUcIQnHOGLmSOSNJ7rLIvT3b8cgJvoVQQDRyzXySbf_XnmiHmcahG8iXyZr7QIxDR8WukHHUY6dQfCEZHOw-Vqv0ySLl_CdHv1uv0pHPGYhOss6PXd3cr3mzzoXZFzJcXs3RHxJj-tkOXhsxYBvTv1VXxZZvlyPc9d_1zCpSVO1NO2twizxWXkpESaKPnoB7VqiGpkCHXhiFcp5XSpzTpOI53q6Oxi-6tUipUDLPakwu9KRQ3LTiqGFiqcRkK_htniUef3iasKfk23iQ56N3fT64fH6_-nvf9ub4UjVvpH_vd-E__8my6fF78_nMaucnOjdi2-i_tx4iq_aMPFtcdna5NB7GqkzpV9VzUpIqDjOETDzovIxJGWLVGNLKEuPPEqpViWADWvohZV1LCsqorMVFhXEX1qFcn6wy_rzL7qu16TOgA6jjdy1HkdGDhCLVuiGllCXXjiVUqxDKJsXgctqqhhWVUdmKmwrgP5qXWg6g-_qjP7Xn__JmFcB0DH8UaOO68DA0eoZUtUI0uoC0-8SimWQVTN66BFFTUsq6oDMxXWdaA-tQ68-sPv1Zl9v9-kDICK422cdF4GBn5Qq4aoRoZQF454lVIsQ-g1r4IWVdSwrKoKzFRYV4H3x36zuKDrQWdJvM50rV8kBrud6ehZH5zK4k0619_SeL5f5vDxfs_t_xDpLD98S4cPN-vDVzuBH2EqwvQR9s5gMoNJWtETG1oObWileFqyjiveccUu7fMr8zAB3TwtB1b0yIZWYNI81nFws30DWBbhIQuDTY_4QRnykzJm6QkPT2yCzcMo2IAGweZpFGyeRsEm0KWoTPlaAdkGNAo3wFG6EQ4mHeAo38RXKiG81C4cXso48fWCts73C4GUU6lhjB7BPA2fwQBHD2Eeh09hHodp5euVxsD4Ur8apZWnYVp5HKYV4GhkeRymtdSyZ8ZLAscnvmULeCmtslQ1JmmVfNNIcHqT_DkGGAdolFaEg7QCHKUV4PDQzJes9IHxpZY1SSugUVoBjtKKcDSyPI7SKvkjrBwDnG_ZAl5OK3-KRVvnm0YNwLtWqWlM0gpolFaEg7QCHKUV4Citii9ZJYHxpZY1esvlafiay-PwPRfg6EWXx1FaFX-UVcg6vmULeCmtij_LFrc-e__rVwAAAP__sgcKHA==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF9v4kYUxd_7Kaz7lEiDYGYMIZYqZdVNVSSabAMPlVY8eGGaILHYtY0UNsp3rzBNABvf4_Gf7KPBP-b4-J7jMS8U_7sijya349vfps4mWjm_P9z_6Xy9_fvL-NPozrn4PJpMJ3-NL53_T3nen3Bx8XYsnO3-o-ftj0tndDe9fZjsvjh_wuWMBK2Dhbnzv5uYvK8kSZAiQZoEuSSoTzNBYRTMTRwH0e6UlxQYLZ7J6wlarsNNsvt4JmgeRIa8F0qWycqQR1P_28o8GH9hom6PBC1M4i9X6TJhtPzuR9ub5-0PEjQJ_XXsOZ3ubuX7TeI5N1LcKJq9Cgo2yWGFOPEfDXnyVZRX8XkZJ8v1POn2TyWcW-JAfds6T378dB45KFE2So79kI0aoisZIttwxC2UcvipzTqIFiYyi5MfS3-lUKzqYbEHFf22VJSw7KBiUEOFqCT0Dz9-mpjkPuzqjF_TbWi8o0L4NB6ToJX5J7lIL-Ly12j5-PR2cBi7wou7atbiu6AThF3dz9pwdu3hydrSInYlUtdVna6uUkRAx_sQDVovIhtHGrZEV7JEtuGJWyilZgnI6lXUoIoSlhVVkZ2K2lUkP7SKVPnhV2VmX3e6bpU6ADreb-RV63Vg4Yhs2BJdyRLZhiduoZSaQVTV66BBFSUsK6oDOxW160B9aB3o8sOvy8y-20nfJKzrAOh4v5HD1uvAwhHZsCW6kiWyDU_cQik1g6ir10GDKkpYVlQHdipq14H-0Dpwyw-_W2b2-50qZQBUvN_G69bLwMIP2aghupIhsg1H3EIpNUPoVq-CBlWUsKyoCuxU1K4C96f9Z3FG14OJw2Adm1L_SPR2V2YWj2bvVBxsorn5EgXzdJn94X3KpR8sTJzsv5X7g9F6_9VO4DEss7A8ht0TWNrBUtWir-vQalCH1pqnFeu45h3X7NJ9fmUelkA3T6teLfqqDq3BpLms4-Bm9y1glYUHLAwu-ooflAE_KUOWvubh6zrB5mEUbECDYPM0CjZPo2BL0KWoTPlaAdkGNAo3wFG6EQ4mHeAo35KvVInwXLtweC7jkq8XdOl8v0iQcplrGKtHME_DZzDA0UOYx-FTmMdhWvl6lUNgfK5frdLK0zCtPA7TCnA0sjwO05pr2RPjlQTbJ75lM3gurSpXNTZpVXzTKLB7U_w-BhgHaJRWhIO0AhylFeBw08yXrOoD43Mta5NWQKO0AhylFeFoZHkcpVXxW1g1BDjfshk8n1Z-F4sunW8a3QPvWrmmsUkroFFaEQ7SCnCUVoCjtGq-ZLUCxuda1uotl6fhay6Pw_dcgKMXXR5HadX8VlYj6_iWzeC5tGp-L5u99NnrL_8FAAD__yjAKic=
 
 subtest Except
 
@@ -189,97 +189,97 @@ subtest Except
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz) EXCEPT ALL (SELECT x AS y FROM xyz) ORDER BY y]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lk1r20AQhu_9FWZOLV0j7Uryh6DgUgINhCQkORSKDoq1jQ2OJVYyxA3-78V2TCrLmVdr2brVtZ_d0czzZvRK8zTR1_Gzzin8TZIEKRLkkSCfBAUUCcpMOtZ5npr1T7bAZfJCoStoOs8Wxfq_I0Hj1GgKX6mYFjNNIT3EjzN9p-NEG8clQYku4ulsc01mps-xWY5eln9J0H0Wz_Ow03XWN98sirAzUhStBKWL4u3491Mfl51JnE_K540kRatIUF7ET5pCuRLHlRlYlikblak-LPP9nMU8NYk2OimdFK1J9JMDz_ozzif3urjJHLk3kYdlpsPOxa8fF7cPne9XVyRopv8Un0fyyzczfZps_vXhc78_k2fT-vvUFNo4Mthv09cPz_dr9OxQO94OPVDEddpNM0e5-w0-eH1Qul7WN0vWMMtRXcc7SwQsCu1ZF3rKEMh2QyDbCAFo_i4EvWNDoOoPV9UZrtd1_LNYaFFo37rQU1qo2rVQtWEhaP7Owv6xFnr1h-vVGa7f3Wzj01toUejAutBTWui1a6HXhoWg-TsLB8da6Ncfrl9nuEH3LA5alDm0LPOUBvrtGui3YSBo_c7A4SleSQ-cf6fzLJ3nutbbprtumE6e9HYAebowY31r0vHmmu3Hmw23ectIdF5sv1XbD5fz7VfrAuvD_SawlI3ooBE95Glp0TNlB_ebwHs9s6WDRvSQp9U-7f5PeyXY3Yc9Fvb5afksrCR_ddAkHzwM8sHDKB-ABvkANMhHr0k-eBjkg4dRPgAN8gFokI8-a-mAl3TQJB_DJobzMDCch5HhgAaGAxptAJu1Wf1LarM3bWm4BKw2pzUONJeVLVJSVSpedMmvEWC6rOwRG9UBDVwHNJId4cB2hCPdKzvUSneeRrrzNNQd4Eh3gCPdK4u0rHsP6F7ZKVa6V3aKle48jXTnaag7wJHuAEe6V_aple48jXTnaag7wJHuAEe6V7Zq-V3b5XVXld3C6h6tPv0LAAD__56IWfo=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt9vok4QwN-_fwWZpzbfNbAL-IPkEnutlzPxak986KXhgcpeNbHCLZhIG__3i1ivRewOK8pbKfvZHWY-4-wrxH_m4IDbG_Sux9pSzLVvo-EP7aF3fze46t9qFzd9d-z-HFxqF29r0u2KVfpyqfXur3t3Y-1qMPj3eqVdubk1w9FNb6R9_aWlHhBYhAG_9Z95DM4DUCDAgIAJBCwgYINHIBLhhMdxKDZLXjOgH6zAMQjMFtEy2fzbIzAJBQfnFZJZMufgwNh_nPMR9wMudAMIBDzxZ_PsmEjMnn2RdlfpCxBwI38RO1pD35w8XCaO1mXgrQmEy-Rt-_ddH1Nt6sfT_H5dCt7aIxAn_hMHh67JcWHaimHSSmGyT8N832e5CEXABQ9yO3kbElty4Fu_-_HU5ckw0uleRcZpxJ0P9gCBOf-dXHTp5Rcxe5pmf3363e_fZKqk3g1FwoVO7f00_f_p_laJnB1Kx9umB4K4DRthpDNjP8EHj7dzx9PyZtESZumsoZtnaQGFQJvKgZ6yCWi9TUDraAIk-bsmaB7bBKx8cVmZ4poN3TqLhQqBtpQDPaWFrF4LWR0WIsnfWdg61kKzfHHNMsW1Gtk0Pr2FCoG2lQM9pYVmvRaadViIJH9nYftYC63yxbXKFNdunMVBhTA7imGe0kCrXgOtOgxEUr8zsHOKK-mB_Uc8jsJFzEvdNo1NwnjwxLcFiMOlmPA7EU6yY7aPw4zLbhkBj5PtW7Z96C-2rzYBlodbVWBKK9F2Jbojp6lCzpga3KoC7-VMlbYr0R05zfZp4yNt5mBjHzalsCWvliWFGZUfbVfpDzmM9IccxvoDoZH-QGikP5pV-kMOI_0hh7H-QGikPxAa6Y-W1NK2XNJ2lf7oVDFcDiOGy2HMcIRGDEdobAKojM3iL6nK3FSl0SGgNDmVcURzWpgiOVUpk4tO5WMEMZ0W5oiK6giNuI7QmOwYjtiO4ZjuhRmqpLucxnSX06juCI7pjuCY7oVBmte9iehemClKuhdmipLuchrTXU6juiM4pjuCY7oX5qmS7nIa011Oo7ojOKY7gmO6F6Zq_q5tyHVnhdki1d1b__c3AAD__2oDeK0=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz) EXCEPT (SELECT x AS y FROM xyz) ORDER BY y]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mN9r4kocxd_vXyHzdC83EueHvwIXvOwWtlDa0vZhYfEhNbNVsCYkEeqW_u-LumrNmO-ZSaJv_jozJ2e-50PiO1vEkb4NX3XGgh-MM48J5jHJPKaYx7ps7LEkjSc6y-J0_ZOt4Dp6Y0HHY7NFsszXH489NolTzYJ3ls_yuWYBewqf5_pBh5FO_Q7zWKTzcDbfbJOks9cwXY3eVr-Yxx6TcJEFrba_3vlumQetkWDjD4_Fy_ywfJaHL5oF_MOzt_B1luWzxST3u8f7j3hh_YPkedWahtn0xO8PHoSLh88xcNccij4PHmSlHHizQahSE4d1los4jXSqo6OVNquU2hQdYPNgoXsuCyipg4VeDQteJZffwmz6qPO7xJeFpJ5WiQ5aV9-_XN0_tf6_uWEem-uf-d8j_s9_6exlunllMV59l_F6jNNcp740Ivu3dP2BRWan4viz6AkTt3E7TnzVKQZ8cvvh0fbcocEWBfZF25fOKAMm9oPZOyPKXIJwT8IWZrZJ8GajUKUmapKEV4RZgxZQUmUwc7NQG2b8EjAD47WDmRGZLcyEfYmETYdk21fONAEm9pPRPyNNHILg7knY0sQ2Cd5sFKrURM0qi4o0adACSqqMJm4WatNEXIImYLx2NDEis6WJtC-RtOmQam8ehtxoAkzsJ2NwRpo4BMHdk7CliW0SvNkoVKmJmlWWFWnSoAWUVBlN3CzUpom8BE3AeO1oYkRmSxNlXyJl06Fu25klwMJ-LoZnZIlDDNw1B1uS2ObAmw1ClZqoWWNVkSQNWkBJlZHEzUJtkqhLkASM144kRmRV_rI5sf6DzpJ4kWmrf2M668B09KK3B5DFy3Si79N4stlm-_Zuo9t8EOks337Lt2-uF9uv1gY_i3lRzD-L1ZGYu4m5rKMWvJZ6WEct-7RakIlLOnFJbt2ld6bFHJwXrRaijlp2aqkHtFqRifdocddBLIriHinu02fdJ8XgmgekWIFiD2kqdAAWDKg4cYFWQzDQckgGIEdooOWIDdxAy3HwAgRvsMUFD0CN-ADkCBBAjgiB5KAu3CDMcfAoOhoxBbmBCU5DhvfAsdOYQZdOc4YPwOYGaZzKTqth2Wk5LDuQo7LTclh2mrICUFbQqAETC9So7ECOyg7kqOxIDiZe0JQVYOgEfQdXkBtlFzRqhALHTqMGXTpNGgFIIwzSuJQdqFHZgRyVHclB2YEc3vXTlBWAsoJGDSo7oCw6N4BJVHaASVR2IEcTT1NWgqmR9ANyQW6UXdKokeCGTtKoAZcuadJIQBppkMal7ECNyg7kqOxIDsoO5KjskqasBJSVNGrQUz6gLDo3gEn0nA8wiR70gRxNPE1ZiY6dfmouyM2y06hR4IZO0agpXvr446_fAQAA__8-NOnb
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1v4kYYhe_7K6y5SlQjMx98xFKlpBuqRqIhBS62WnHhhWmCxGJqGylslP9eYQIEG79nBhvukthn5vjMex7ZeWPxfzPms0Gn2_kydJbRzPmj3_vL-db5-tS9e3h0ru4fBsPB391r5-rjntXmjtfVz2un8_VL52m4u_Tq3A0Orvf6952-8_s_zmrEXDYPJ_ox-KFj5n9jnLlMMJdJ5jLFXNZgI5ctonCs4ziM1re8pYKHySvz6y6bzhfLZP3nkcvGYaSZ_8aSaTLTzGfD4PtM93Uw0ZFXZy6b6CSYztJtFtH0RxCtbl9XP5nLBotgHvtOzVvv3FsmvnMr2OjdZeEy2S8fJ8GzZj5_d80t3E_jZDofJ17jcP9bnll_L_m-cl6C-OXI_XsPwsbD5xi4bQ5Zn3sP8qQceLVBqEIT-3WW8zCa6EhPDlZKVym0KerA5t5C41wWUFJ7C80SFtyTXP4ZxC8DnfQWnswkNVwttL8lwF23y1w20_8mV7f8-rdo-vyS_mQwXi2b8RqEUaIjT-Yi-7Vw_bZBZsfi-Fj0iInHsBYuPFXPBnx0-5uD7blFgw0K7ImaJ61RBkzsBrN5RpTZBGGfhCnMTJPg1UahCk2UJAk_EWYVWkBJFcHMzkJpmPFLwAyM1xZmuchMYSbMSyRMOiRrnrKmCTCxm4zWGWliEQS3T8KUJqZJ8GqjUIUmSlZZnEiTCi2gpIpoYmehNE3EJWgCxmtLk1xkpjSR5iWSJh1StfRjyI4mwMRuMtpnpIlFENw-CVOamCbBq41CFZooWWV5Ik0qtICSKqKJnYXSNJGXoAkYry1NcpGZ0kSZl0iZdKhRs2YJsLCbi5szssQiBm6bgylJTHPg1QahCk2UrLE6kSQVWkBJFZHEzkJpkqhLkASM15YkuchO-ZfNkfX7Ol6E81gb_Temvg5MT5715gDicBmN9VMUjtNtNr_2Ul36h4mOk81VvvnlYb65tDb4WcyzYv5ZrA7E3E7MZRm14KXUN2XUskWrBZm4pBOX5NYNemdazMF50WohyqhlvZS6TasVmXiTFjcsxCIrbpLiFn3WLVIMnrlNihUo9g1NhTrAQg4qVlyg1RAMtBySAcgRGmg5YgPPoeUweAGCz7HFBg9AjfgA5AgQQI4IgeSgLjxHmMPgUXQ0YjLyHCY4DRneBMdOYwY9Os0Z3gab50hjVXZaDctOy2HZgRyVnZbDstOUFYCygkYNmFigRmUHclR2IEdlR3Iw8YKmrABDJ-g3uIw8V3ZBo0YocOw0atCj06QRgDQiRxqbsgM1KjuQo7IjOSg7kMO3fpqyAlBW0KhBZQeURecGMInKDjCJyg7kaOJpykowNZL-QM7Ic2WXNGokeKGTNGrAo0uaNBKQRuZIY1N2oEZlB3JUdiQHZQdyVHZJU1YCykoaNegrH1AWnRvAJPrOB5hEH_pAjiaepqxEx05_NWfk-bLTqFHghU7RqMk--uj9l_8DAAD__0CZB6Q=
 
 # EXCEPT ALL and EXCEPT with MergeJoiner.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz ORDER BY y) EXCEPT ALL (SELECT y FROM xyz ORDER BY y)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ltFq2zAUhu_3FOFcbSDjSLbTxjDIGIUVSlPaXAyGL9z4LAmktpEcaFby7sP2WBYn0bGmRndN7U_6dfSB_zfIiwzv0xdUEP8ADgwEMAiAQQgMIkgYlLKYo1KFrF9pgdvsFeIhg1Vebqr63wmDeSER4jeoVtUaIYZZ-rzGR0wzlP4QGGRYpat1s00pVy-p3E5et7-AwVOZ5ioeeH6983RTxYOJgGTHoNhUf5bfr_q8HSxTtTxcb8Ih2SUMVJUuEGK-Y_8XM3IaU5yNuV9nkxcyQ4nZwUpJTVKvnDjrt1Qtn7Calj7v3MhsW2I8uPn-9eZhNvhydwcM1viz-jjhnz7L1WLZ_PX33Lxz7v2ZAosznQh8X3hF6fOoe_qTe4cHe_P-1857XLsvPD-4iJ8GQUeOg4qzQR0Yyl0YKvoPX_QZfuD54UUsMQh65TioOBvUgSXChSVB_-EHfYYfes2n5v0tMQh67TioOBvUgSWBC0vC_sMP-ww_8i7iiEHMsdOY4mxMB4aErvvQiTiPqMoiV9ir7QzrA2G2wHZAqtjIOT7IYt5s0_6cNlzz5c5QVe1T0f64zdtHdcD-8MgGHtvA3Co3j_Q0NxiZMINHNvDYBuZWuTsjO6JFlx7-Swf6eQdamB_ObNilQxvB9TAhuB4mBNfDlOAETQge2QiuhwnB9TAhuB6mBCdoQvCRjeBXNorqYUJRPUwoqocpRQmaUPTaRlE9TCiqhwlF9TClKEETio5tFOVWPYGgCUkJmrCUoClNKZzqCnZlwa4t2NUFy75gVxi4VWPgR5XByFY9Tdmqpylb9TRpK4FTtpqUpeM7M2lLpjRlq1FfMsYpW4_Kg9bWZPfhdwAAAP__ubNVYA==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lkFv2jAYhu_7FdZ3aiWjYCfQEmkSXcs0JFY64NCpyiElXkGiJLOD1LTiv0-Eai0B_MXz6lspfuzXnx-J9wXU7wWEMO4NepcTspIL8nU0_E7uerc3g4v-NTm56o8n4x-DU3LyuqbYrngqnslwdNUbkS8_SXFKereXvZsJuRgMkJURUFimibiOH4WC8A4YUOBAwQcKAVBoQUQhk-lUKJXKzZKXEugnTxA2KcyX2Srf_DuiME2lgPAF8nm-EBDCJL5fiJGIEyG9JlBIRB7PF-UxmZw_xrLoPhXPQGGcxUsVkoa3OXm4ykPS5RCtKaSr_HX7t13vCzKL1Wx3vy6DaB1RUHn8ICBka_pvMVtOY_KjMd_2WS1TmQgpkp2dog2JLTlw12-xmo1FPsw8VnmRSZGJ8J04QGEhfuUnXXb6Wc4fZuVff-_NKvd-u5NvcacDga_TRpp5rFW9_cGzg52zWf1nZzWe3eMNz_8QPw2Cth0H5UeDOjCUuTCU1x8-rzN8v-EFH2KJQdAzx0H50aAOLOEuLPHrD9-vM_ygUf7U_H9LDIKeOw7KjwZ1YInvwpKg_vCDOsNvNT7EEYOYHacx-dGYDgwJXPehA3FGQmXpUolabae5uZBIHsR2QCpdyam4kem0PGb7cVhy5S93IlS-_ZZvP_SX2682AevDbRu4YwMzq9yspaeZwci4Gdy2gTs2MLPKXRnZHs2rdPM97evn7WthtjuzZpUObATXw4jgehgRXA9jgiM0InjLRnA9jAiuhxHB9TAmOEIjgrdtBD-zUVQPI4rqYURRPYwpitCIouc2iuphRFE9jCiqhzFFERpRtGOjKLPqCQiNSIrQiKUIjWmK4VhXsCsLdm3Bri5Y9gW7wsCsGgPbqwxGtuppzFY9jdmqp1FbERyz1aQs7b-ZSVsypTFbjfqSMY7ZulcetLZG609_AgAA__-iT3W3
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz ORDER BY y) EXCEPT (SELECT y FROM xyz ORDER BY y)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1r-kgYxe_3U8hc7UIkPjOJL4EFl90_bKG0pe3FwuJFamarYE1IItQt_e5_VNCaNM_JZEbv-uIvc-bkOScTP8Q6TfRd_KYLEf0rSHhCCk8o4YlAeCIUM09keTrXRZHmu48cgJvkXUQDTyzX2abc_XnmiXmaaxF9iHJZrrSIxHP8stKPOk507g-EJxJdxsvVfpksX77F-Xb6vv1feOIpi9dF1Ov7u5XvN2XUm0ox-_REuilPly_K-FWLiD699hL-Whblcj0v_fB8_SlVrn9CXra9RVwsvvn8SYM00fDVBnLng-rkA7k1ImgUcbrOZp3mic51cnal_VUaZcoBkHmSEF5KAnLqJGFoIcHrpPLvuFg86fI-81XFqedtpqPej3_-_PHw3Pvj9lZ4YqX_K3-d0m-_58vXxf6n43g172nk1ta7tJ9mvgqru_927fHZ2mQQrxbp8mXfV8Y9A0Qcp2Z4wZ4xMcKlE6qTE-TWiqBRhGXMqWPTOJSAnGpqGjMJ1k1D12ga2X7IZZsZV30_ME47EHG8c6MLpt3ACHLphOrkBLm1ImgUYRk12THtDiUgp5rSbibBOu3yGmlX7YdctZnxoL8_6ZulHYg43rnxBdNuYAS5dEJ1coLcWhE0irCMmuqYdocSkFNNaTeTYJ12dY20B-2HPGgz42HfOOtAwvG-TS6YdQMbyJ0PqpMP5NaIoFGEZcyCjkl3KAE51ZR0MwnWSQ-u_X3BN3IedZGl60K3-jZgsNuQTl71waAi3eRz_ZCn8_0yh1_v99z-D4kuysN_6fDLzfrwr53ArzBVYfoKB2cwmcEkreiJDS2HNrRSPC1ZxxXvuGKXDvmVeZiAbp6WAyt6ZEMrMGkB6zi42aEBLKvwkIXBpkf8oAz5SRmz9ISHJzbB5mEUbECDYPM0CjZPo2AT6FJUpnytgGwDGoUb4CjdCAeTDnCUb-IrlRBeaxcOr2Wc-HpBW-f7hUDKqdYwRo9gnobPYICjhzCPw6cwj8O08vVKY2B8rV-N0srTMK08DtMKcDSyPA7TWmvZM-MlgeMT37IVvJZWWasak7RKvmkkOL1J_hwDjAM0SivCQVoBjtIKcHho5ktWhsD4WsuapBXQKK0AR2lFOBpZHkdplfwRVo4BzrdsBa-nlT_Foq3zTaMG4F2r1jQmaQU0SivCQVoBjtIKcJRWxZesksD4WssaveXyNHzN5XH4ngtw9KLL4yitij_KKmQd37IVvJZWxZ9lq1ufff7yMwAA__8wq-az
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mNFvolgYxd_3ryDfU5tg9N4L1pJs0tmpm23i1q76MJuJD4zcbU0cYQGTOk3_9424oxXKd7iAfWuVH_dw-M7h4gsl_67Io-lwNPw8szbxyvp9Mv7T-jr88jD6dHdvXdzeTWfTv0aX1sX_x2z3Rzxvf1jjye1wYv32t7W9tIZfPg8fZuCoOdm0DgN973_XCXlfSZBNkmxSZJNDNrk0tymKw4VOkjDeHfKSAXfBM3k9m5braJPuPp7btAhjTd4Lpct0pcmjmf9tpSfaD3Tc7ZFNgU795SpbJoqX3_14e_O8_UE2TSN_nXhWp7tbebxJPetG0vzVpnCTHk-fpP6jJk-82tUl3C6TdLlepF33dP0bkTv_Efm2tZ785Omd448apImGtzaI9nxQtXwQ7RrhlIo4nmezDuNAxzo4OVN2llKZsgdkHiW455KAnDpK6DeQYNdS-YefPE11Oo66KufUbBtp72f4P41GZNNK_5Ne3IjLX-Pl41P212G8yq_pql1b78NOGHWVm7_6d9cenKwtDOJVIV1d2ekq454BIg5T0z9jz5gY0aYTqpYTol0rnFIRDWMuajZNixKQU2VNYyahcdOIj2gaWX3IZZUZV52uY5x2IOJw567OmHYDI0SbTqhaToh2rXBKRTSMmqyZ9hYlIKfK0m4moXHa5UekXVUfclVlxp1OttM3SzsQcbhzgzOm3cAI0aYTqpYTol0rnFIRDaOmaqa9RQnIqbK0m0lonHb1EWl3qg-5U2XG3Y5x1oGEw327PmPWDWwQ7fmgavkg2jXCKRXRMGZOzaS3KAE5VZZ0MwmNk-589O8F78iZ6CQK14mu9GtAb3dBOnjUe4OScBMv9EMcLrJl9v-OMy77INBJuv9W7P-5W--_2gl8C4s8LN7CzgkszGAhG9HXTWjZb0IrxdOSdVzxjit2aZdfmYcF0M3TsteIvmpCKzBpDus4uNmuASzzcJ-FwUVf8YPS5ydlwNLXPHzdJNg8jIINaBBsnkbB5mkUbAG6FJUpXysg24BG4QY4SjfCwaQDHOVb8JUqEF5oFw4vZFzw9YIune8XAVIuCg1j9AjmafgMBjh6CPM4fArzOEwrX69iAIwv9KtRWnkappXHYVoBjkaWx2FaCy17YrwUYPvEt2wOL6RVFqrGJK2SbxoJdm-S38cA4wCN0opwkFaAo7QCHG6a-ZKVLjC-0LImaQU0SivAUVoRjkaWx1FaJb-FlQOA8y2bw4tp5Xex6NL5plE98K5VaBqTtAIapRXhIK0AR2kFOEqr4ktWSWB8oWWN3nJ5Gr7m8jh8zwU4etHlcZRWxW9lFbKOb9kcXkir4vey-Uufv_7yXwAAAP__KKkGIA==
 
 # EXCEPT ALL and EXCEPT with no overlap.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz WHERE x < 2) EXCEPT ALL (SELECT x FROM xyz WHERE x >= 2) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll9r2zwUxu_fT2HO1TumYEu288dQ6BgdK5S2tLkYbLlwY60JpLGRHWhW-t2HnYbOcaLHihvdNbV_Uo7O78nRCy3TRF7HTzKn6CdxYiSIkU-MAmIU0oRRptKpzPNUla9sgMvkmSKP0XyZrYry3xNG01RJil6omBcLSRGN44eFvJNxIpXrEaNEFvF8UW2TqflTrNbnz-s_xOg-i5d55PTccudv80UhVeScc-fXyvP8qSOiKLq8Hg-J0c2qKJ_Q5JVRuire9n7f8mHtzOJ8Vt-sen_CKC_iR0kRf2XH1RAeXYM8--gixMEi3tdZLVOVSCWT2kqTkkSv7DmJ73E-u5fFTebynWaO15mMnIsfXy9ux86XqytitJC_i__P-aczNX-cVX8drPu9Jt-kMfepKqRyebh7TJ8Prh-0OLN9x_G26J4vcZ320swV3u4B790-rG3P23vHW3jnip7r20-PQRX9DlWcOj_cbn64jfyA1mzz0z82P6J960Wb1vs9N7AvsEEVgw5VnFpgYVdgYUNg0JqtwINjBfbbt95v0_qgV90QLAtsUMWwQxWnFti3K7BvQ2DQmq3Aw2MFDtq3PmjT-rBnX1-DGkZH13BqeQO78gY25AWN2co7-ojr957172SepctctrpZe-WByeRRbhqQpys1lbcqnVbbbD7eVFx1LUpkXmyeis2Hy-XmUfkF28ODLjDnneiwEz3S09zgzIQZPOgC75yZKR12okd6WuzS3r-0X4O9XdjXwoG-W4EWFly_ddglH3oY5EMPo3wAGuQD0CAf_S750MMgH3oY5QPQIB-ABvkYaC0d6iUddsnHqIvhehgYroeR4YAGhgMaTQCTsdn8JTWZm6Y0HAJGk9MYB5rzxhSpqcqFXnSuHyPAdN6YIyaqAxq4DmgkO8KB7QhHujdmqJHuehrprqeh7gBHugMc6d4YpHXd-0D3xkwx0r0xU4x019NIdz0NdQc40h3gSPfGPDXSXU8j3fU01B3gSHeAI90bU7V-1_b0uovGbNHqPnn9728AAAD___m9p94=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lm9P4kwQwN8_n2IzrzTPkna3LX-amOijNZLwgAck58XjRaV7QoK0ty0JaPzulxY5heJOl0rfid1fh5n5DbMvEP-egQsDr-NdDslCzsh1v_c_uffubjsX7S45uWoPhoNvnVNy8nZmuT6xXD2T7zde3yNL8nNhmtaY8FPi3V16t0Ny0emg58VZCvT6V16f_PeDLEdAYR4Gous_iRjce2BAgQMFCyjYQMGBEYVIhmMRx6FMj7xkQDtYgmtSmM6jRZL-e0RhHEoB7gsk02QmwIWh_zATfeEHQhomUAhE4k9nWZhITp98uTpfrp6BwiDy57FLakYa-Xo6S4R0yTn7m6Lruu3usAkUeoskfQKjVwrhInmL_R7yYUUmfjzZDpadH1GIE_9RgMte6WE5OAfnkJb9a5Pgnybx_p7FPJSBkCLYetMoJbEjeypx48eTgUh6kcF2mjlcRcL9YCFQmIlfyck5Oz2T08dJ9teneb_nZOk0ZhDKREiDObtl-vfT99sFaravHG8v3fMlumEtjAxu7hZ4b3hnKzwr7h0r4J3Ba4ZV_fRoZFEvkcWx54dVOz-sivlBWrOZn_qh88OLt54Xab1VM-zqBdbIolEii2MLzKsVmFchMNKajcCNQwW2irfeKtJ6u5bdECoWWCOLZoksji2wVa3AVhUCI63ZCNw8VGC7eOvtIq13atXrq5FD6-Acji2vXa28dhXyIo3ZyNv6iuv3nvf3RRyF81gUulmbacFE8CjWDYjDhRyLWxmOszDrj72My65FgYiT9VO-_tCerx-lX7A43CgDM1aKdkrRLTXNNGrG9eBGGXinZrq0U4puqWm-S5sfaWsLNndhSwnb6m7ZSpgzdWinzHyoYWQ-1DA2HwiNzAdCI_NRLzMfahiZDzWMzQdCI_OB0Mh8NJSWNtWSNsvMR6uM4WoYMVwNY4YjNGI4QmMbQGdt5n9JdfamLo0uAa3NqY0jmrPcFtlSlXG16Ey9RhDTWW6P6KiO0IjrCI3JjuGI7RiO6Z7boVq6q2lMdzWN6o7gmO4IjumeW6TbutcR3XM7RUv33E7R0l1NY7qraVR3BMd0R3BM99w-1dJdTWO6q2lUdwTHdEdwTPfcVt2-a5tq3Xlutyh1H73-8ycAAP__vDHOWQ==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz WHERE x < 2) EXCEPT (SELECT x FROM xyz WHERE x >= 2) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1r40YYhe_7K8xctVRGmg9_RLCQ0m5pYEmWTS4KbS601jQWeC0hybBuyH8vtms71ljvmdHIvkssn5mjM-95kPzKlnmq75NvumLxX4yzgAkWMMkCpljARuw5YEWZz3RV5eXmKzvBXfqdxVHAsmWxqjcfPwdslpeaxa-szuqFZjF7Sr4u9BedpLoMIxawVNdJtthuU5TZt6Rc335f_8sC9lgkyyoeDMPNzr9ni1qX8eCWD_5eRZGcDUQcx3f3T1MWsIdVvbnCnt8Clq_q495VnbxoFvO3wN7fb1lVZ8tZHY5OzRnrHyVf14N5Us3PfP_oQbh4eJ8R7x6S_uCSkuyUEu83JtVq4rjOapmXqS51erLSdpVWmyICNo8WRpeygJI6Whh7WAg6ufwjqeaPun4oQtlI6mld6Hjw8c9fP35-Gvzy6RML2EL_U_94y3_6UGYv8-1fFuM1cRmvx7ysdRlKI7KfW9efWmR2Lo7_Fz1j4j4f5kWoombAZ7e_OdmeO_Tbot6hGIayXwoCh4epHV-Qgi4p-cTkw0HbnHi_QalWE54Q4h052KMFlFQbB90seHOQX4ODYLz2HDQis-WgsK-YsGmYHIaqXxABh4exmVwQRA4pcZ-YfEBkmxPvNyjVasKTAqIjiHq0gJJqA5GbBW8QiWuACIzXHkRGZLYgkvYVkzYNU8PtC1qPIAIOD2MzvSCIHFLiPjH5gMg2J95vUKrVhCcFZEcQ9WgBJdUGIjcL3iCS1wARGK89iIzIbEGk7CumbBo2GvaLIeDvMDQ3F8SQQ0a8e0g-ELJNifcbk2o14UkA1RFCPVpASbVByM2CN4TUNSAExmsPISOyLj9PnVn_i66KfFlpq1-eok1gOn3RuwOo8lU505_LfLbdZvfvw1a3_SDVVb27ynf_3C13lzYG34t5U8zfi9WJmLuJufRRC-6lvvFRywmtFmTikk5ckluP6J1pMQfnRauF8FHLyEs9pdWKTHxMi0cOYtEUj0nxhD7rCSkG9zwlxQoU-4amQgSwYEDFiQu0GoKBlkMyADlCAy1HbOAGWk6DFyB4gy0ueABqxAcgR4AAckQIJAd14QZhToNH0dGIacgNTHAaMnwMjp3GDLp1mjN8CjY3SONUdloNy07LYdmBHJWdlsOy05QVgLKCRg2YWKBGZQdyVHYgR2VHcjDxgqasAEMn6Ce4htwou6BRIxQ4dho16NZp0ghAGmGQxqXsQI3KDuSo7EgOyg7k8KmfpqwAlBU0alDZAWXRuQFMorIDTKKyAzmaeJqyEkyNpF-QG3Kj7JJGjQQPdJJGDbh1SZNGAtJIgzQuZQdqVHYgR2VHclB2IEdllzRlJaCspFGD3vIBZdG5AUyi93yASfSiD-Ro4mnKSnTs9FtzQ26WnUaNAg90ikZN89af3374LwAA__9lNDfO
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1v2kgYhe_3V1hzlWiNYD74iKVK6TZURWJDFpC2qy4XFGYTJIpZ20jQKP-9AgIEjN8z4zG5S8Bn5vjMex7ZPLP4_ykLWK_Zbn7qe4to6n3udv70vjW_PrQ_tu69q7tWr9_7q33tXb1es9xesVz99P7-0uw2vaX376JSkSNPXHvNr5-aD314rf6wvrjTvWt2vT_-8ZYD5rNZONb3wx86ZsE3xpnPBPOZZD5TzGdVNvDZPApHOo7DaH3J80bQGi9ZUPHZZDZfJOuPBz4bhZFmwTNLJslUs4D1h9-nuquHYx2VK8xnY50MJ9PNNvNo8mMYrW6Xq5_MZ735cBYHXqm83vnzZJroKPBu-f72giBo3fcbzGedRbL-hg1efBYuksPecTJ81CzgL765v7tJnExmo6RcPTaXWv8g-b7ynobx05nrDx6EjYe3GfH8Ia3P1TwlmSslXmxMKtPEYZ3FLIzGOtLjo5U2q2TaFBVg82CheikLKKmDhZqDBT-Xyy_D-Kmnk868LE-S6q_mOtiR5GO7zXw21f8lV7f8-kM0eXza_GUwXnWb8eqFUaKjskxF9nvm-g2DzM7F8broGRP3YSmcl1XlNOCz298cbc8t-m1Q77IolWWxFAQO91NbuyAFbVJyicmFg6Y58WKDUpkmHCHEc3KwQAsoqSwO2llw5iB_Dw6C8dpxMBWZKQeFecWEScNkqayKBRFwuB-b-gVBZJESd4nJBUSmOfFig1KZJhwpIHKCqEALKKksENlZcAaReA8QgfHagSgVmSmIpHnFpEnDVGnzglYgiIDD_dg0Lggii5S4S0wuIDLNiRcblMo04UgBmRNEBVpASWWByM6CM4jke4AIjNcORKnITEGkzCumTBpWLRWLIeBvPzQ3F8SQRUY8f0guEDJNiRcbk8o04UgAlRNCBVpASWVByM6CM4TUe0AIjNcOQqnI8vw8dWb9ro7n4SzWRr88VdaB6fGj3h5AHC6ikX6IwtFmm-2_nY1u88FYx8n2W779pzXbfrU2-FbMT8X8rVgdibmdmEsXteBO6hsXtazTakEmLunEJbl1ld6ZFnNwXrRaCBe1rDipG7RakYnXaHHVQixOxTVSXKfPuk6KwT03SLECxb6hqVABWEhBxYoLtBqCgZZDMgA5QgMtR2zgKbQcBy9A8Cm22OABqBEfgBwBAsgRIZAc1IWnCHMcPIqORsyJPIUJTkOG18Cx05hBt05zhjfA5inSWJWdVsOy03JYdiBHZaflsOw0ZQWgrKBRAyYWqFHZgRyVHchR2ZEcTLygKSvA0An6Ce5Eniq7oFEjFDh2GjXo1mnSCEAakSKNTdmBGpUdyFHZkRyUHcjhUz9NWQEoK2jUoLIDyqJzA5hEZQeYRGUHcjTxNGUlmBpJvyCfyFNllzRqJHigkzRqwK1LmjQSkEamSGNTdqBGZQdyVHYkB2UHclR2SVNWAspKGjXoLR9QFp0bwCR6zweYRC_6QI4mnqasRMdOvzWfyNNlp1GjwAOdolFzeuuDl99-BQAA__9VD11Q
 
 # EXCEPT ALL and EXCEPT with some overlap.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz WHERE x >= 1) EXCEPT ALL (SELECT y FROM xyz WHERE x < 3) ORDER BY y]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzElk1v2kAQhu_9FdacWnWRvWubD0uRqKpUjRQlUcKhUuuDg7cBiWBrbaTQiP9eAaGpbbKvFwdzC4HHw-w8L7PPNE9ieRU9yoyCn8SJkSBGLjHyiJFPIaNUJWOZZYlaf2QLXMRPFDiMpvN0ka__HTIaJ0pS8Ez5NJ9JCmgU3c_krYxiqWyHGMUyj6azTZlUTR8jtRw-Lf8Qo7s0mmeB1bHXlb9NZ7lUgTXk1q-F47jyzOJBEFxcjfrE6HqRB9ZQULhilCzyl-KvNe-X1iTKJsVqQ07hKmSU5dGDpICv2GFN-Ac3Mbbc9-1BvNnD63MW80TFUsm48KRwTaKP7DmI71E2uZP5dWrz0jBHy1QG1vmPr-c3I-vL5SUxmsnf-cch_3Smpg-TzV__-ualvl97ck3mcpeoXCqb--Vj-vzm870aZ7bvOF4euudLXCWdJLWFUz7gveX9QnleXzteQztbdGz3BOkxaKPboI0j54e3mx_eRn7AZHb56R6aH1F_8qLO5N2O7Z1AYIM2eg3aOLLAol2BRRsCg8nsBO4dKrBbf_Juncl7nc0FoW2BDdroN2jjyAK77QrstiEwmMxO4P6hAnv1J-_VmbzfOYG-Bk0MDm7iyPJ67crrtSEvmMtO3sF7XL_3PP9WZmkyz2Stm7WzPjAZP8jtALJkocbyRiXjTZnty-sNt7kWxTLLt--K7YuL-fat9ResD_eawJw3ov1G9EBPc4MzE2ZwrwlcOjNT2m9ED_S0KNPO_7RbgJ0y7GphTz8tTwsLri_tN8mHHgb50MMoH4AG-QA0yEe3ST70MMiHHkb5ADTIB6BBPnpaS_t6SftN8jFoYrgeBobrYWQ4oIHhgEYbwGRtVn9JTfamKQ2XgNHmNMaB5ryyRQqqcqEXnevXCDCdV_aIieqABq4DGsmOcGA7wpHulR1qpLueRrrraag7wJHuAEe6VxZpUfcu0L2yU4x0r-wUI931NNJdT0PdAY50BzjSvbJPjXTX00h3PQ11BzjSHeBI98pWLd61Hb3uorJbtLqHqw9_AwAA__-YNKfo
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzElt9u2jAUh-_3FNa5KlpQYifhT6RKdG2qIjHoAGmdulykxCtIlGROkKAV7z4BZRRCfWJS0rtS8tk5Pt-P4xeI_47BgZ7bci_7ZCrG5Lrb-U7u3bvb1kWzTc6umr1-70erRM5en5mvn5jNn8nPG7frkhn5PTUMk58TWiLu3aV72ycXrRYKDIhZIp3uldsl336RuQcaTMKAt_0nHoNzDxQ0YKCBCRpYoIENngaRCAc8jkOxfORlBTSDGTiGBqNJNE2W__Y0GISCg_MCySgZc3Cg7z-MeZf7ARe6ARoEPPFH49U2kRg9-WLemM2fQYNe5E9ih5T15c7Xo3HChUMadFui4zjNdr8GGnSmiUMaDLyFBuE0ed18u-fDnAz9eLi7W4OCt_A0iBP_kYNDF9pxRdhHFzEg5sfWwN6tYbvOdBKKgAse7KzkLUnskQMHcePHwx5POpFO95rZn0fceSMhaDDmf5KzBi2di9HjcPXX_7rpXt3bmkyVvvRCkXChU3v_mL6-u76V4cwOHcfrogdeoh2Ww0hnxv4BH9ze3tmeZteOZtBOZ2Xd_IT0KJRRyVHGifNDi80PLSI_SGc2-akcmx-WvfMsS-fNsm59gsAKZVRzlHFigVmxArMiBEY6sxG4eqzAZvbOm1k6b5VXF4SiBVYoo5ajjBMLbBYrsFmEwEhnNgLXjhXYyt55K0vn7fIn6KtQRP3oIk4sr1WsvFYR8iJ92chb_4jr94H1uzyOwknMM92sjeWB8eCRrxsQh1Mx4LciHKy2WX_srLjVtSjgcbL-lq0_NCfrr5YvmB2u5oEpzUXbuei6nKYKZ8bU4GoeeO_MVGk7F12X02yfNt7S5g5s7MOmFLbk3bKkMKPyre08-ZDDSD7kMJYPhEbygdBIPip58iGHkXzIYSwfCI3kA6GRfFSlltbkktby5KOex3A5jBguhzHDERoxHKGxCaAyNtO_pCpzU5VGh4DS5FTGEc1paorsqEqZXHQqHyOI6TQ1R1RUR2jEdYTGZMdwxHYMx3RPzVAl3eU0prucRnVHcEx3BMd0Tw3SXd0riO6pmaKke2qmKOkupzHd5TSqO4JjuiM4pntqnirpLqcx3eU0qjuCY7ojOKZ7aqru3rUNue4sNVukunuLL_8CAAD__7KvzmY=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz WHERE x >= 1) EXCEPT (SELECT y FROM xyz WHERE x < 3) ORDER BY y]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mFtr40Ycxd_7KcQ8tVRGmosvESy4tFsaWJJlk4dCmwetNU0EXktIMmwa8t2L7caONdb_zGhkv_l2Zo7O_M8PyS9sVWT6Jv2ma5b8xTgLmWAhkyxkioVszB5CVlbFQtd1UW1-shNcZ99ZEocsX5XrZvPxQ8gWRaVZ8sKavFlqlrD79OtSf9FppqsoZiHLdJPmy-02ZZV_S6vn-ffnf1nI7sp0VSfBKNrs_Hu-bHSVBHMe_L2OY6k_BDxJkuub-xkL2e26SYK5YA-vISvWzWHzukkfNUv4a2hv8Le8bvLVoonGx-7mvLX-QfL1OXhK66cTvz94EC4e3ofE-6e0CKR9SLJXSHzYlFSnicM661VRZbrS2dFK21U6bYoY2DxYGJ_LAkrqYGHiYSHs5fKPtH66081tGclWUvfPpU6Cj3_--vHzffDLp08sZEv9T_PjnP_0ocofn7av9uPVfU1Tl_G6K6pGV5E0Ivu5c_2ZRWan4vh_0RMmbopRUUYqbgd8cvuro-25Q70t2h2JUSQHpiCwuB_byRkp6BKTT04eHLSNiQ-bk-o04Qkh3pODA1pASXVx0M2CNwf5JTgIxuuNg0ZkthwU9g0TNgWTo0gNDCJgcT830zOCyCEm7pOTB4hsY-LD5qQ6TXhSQPQE0YAWUFJdIHKz4A0icQkQgfF6A5ERmS2IpH3DpE3B1Gj7fDYkiIDF_dzMzggih5i4T04eILKNiQ-bk-o04UkB2RNEA1pASXWByM2CN4jkJUAExusNREZktiBS9g1TNgUbjwbGEDC4n5qrM2LIISTePyUPCNmGxIdNSXWa8CSA6gmhAS2gpLog5GbBG0LqEhAC4_UGISOyPn9PnVj_i67LYlVrq3-e4k1gOnvUuwOoi3W10J-rYrHdZvf2dqvbfpDputl9y3dvrle7rzYG34t5W8zfi9WRmLuJufRRC-6lvvJRyymtFmTikk5ckluP6Z1pMQfnRauF8FHL2Es9o9WKTHxCi8cOYtEWT0jxlD7rKSkG1zwjxQoU-4qmQgywYEDFiQu0GoKBlkMyADlCAy1HbOAGWo6DFyB4gy0ueABqxAcgR4AAckQIJAd14QZhjoNH0dGIackNTHAaMnwCjp3GDLp0mjN8BjY3SONUdloNy07LYdmBHJWdlsOy05QVgLKCRg2YWKBGZQdyVHYgR2VHcjDxgqasAEMn6Du4ltwou6BRIxQ4dho16NJp0ghAGmGQxqXsQI3KDuSo7EgOyg7k8K6fpqwAlBU0alDZAWXRuQFMorIDTKKyAzmaeJqyEkyNpB-QW3Kj7JJGjQQ3dJJGDbh0SZNGAtJIgzQuZQdqVHYgR2VHclB2IEdllzRlJaCspFGDnvIBZdG5AUyi53yASfSgD-Ro4mnKSnTs9FNzS26WnUaNAjd0ikZN-9IfXn_4LwAA__9DIDfY
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1v2kgYhe_3V4zmKtEawXzwEUuV6DZURWJDFpC2qy4XFGYTJIpZ20ihUf57BQQINn6PhzG5S8DHc-bMex7ZPPPo_xn3eb_VaX0asGU4Y5973T_Zt9bX-87H9h27um33B_2_Otfs6vWa1faKp9VP9veXVq_Fnti_y0pFmQ9MXLPW10-t-wG8eMzUNev2bls99sc_bDXkHp8HE3M3-mEi7n_jgntcco8r7nHNPV7lQ48vwmBsoigI15c8bwTtyRP3Kx6fzhfLeP3x0OPjIDTcf-bxNJ4Z7vPB6PvM9MxoYsJyhXt8YuLRdLZZZhFOf4zCVfNp9ZN7vL8YzSOflcrrlT9PZ7EJfdYUh-35vt--GzS4x7vL2GdNyYcvHg-W8WHxKB49GO6LFy-_wdtpFE_n47hcPXbXFIn7HyTfV-xxFD2euP7gQdp4eBuSOD-lMVP5Q1JnhSSKTUlnmjjcZzkPwokJzeToTpu7ZNqUFWDzYKF6KQsoqYOFmoMF7yyXX0bRY9_E3UVZJZIarBbG34HkY6fDPT4z_8VXTXH9IZw-PG7-2o9X9p7qNuPVD8LYhGWViuz3zPs3cmR2Ko7Xm54wcReUgkVZV5IBn1z-5mh5YVHvHO0uy1JZFUxBYHE_trULUtAmJpecHDiYNyZRbE4604QjhMSZHCzQAkoqi4N2Fpw5KN6Dg2C8dhxMRZaXgzJ_w2SegqlSWRcMImBxPzf1C4LIIibhkpMDiPLGJIrNSWeacKSAPBNEBVpASWWByM6CM4jke4AIjNcORKnI8oJI5W-YylMwXdq8nxUJImBxPzeNC4LIIibhkpMDiPLGJIrNSWeacKSAOhNEBVpASWWByM6CM4jUe4AIjNcORKnI8oJI52-YzlOwaqlgDAGD-6m5uSCGLEIS56fkAKG8IYliU9KZJhwJoM-EUIEWUFJZELKz4Awh_R4QAuO1g1AqsnN-njpx_56JFsE8Mrl-eaqsAzOTB7M9gChYhmNzHwbjzTLbf7sb3eaDiYni7bdi-097vv1qbfCtWCTF4q1YH4mFnVgoF7UUTuobF7Wq02pJJq7oxBW5dJVemRYLcF60WkoXtao4qRu0WpOJ12hx1UIsk-IaKa7TZ10nxWDPDVKsQbFvaCpUABZSULHiAq2GYKDlkAxAjtBAyxEbRAotx8FLEHyKLTZ4AGrEByBHgAByRAgkB3URKcIcB4-ioxGTkKcwIWjIiBo4dhozaOs0Z0QDLJ4ijVXZaTUsOy2HZQdyVHZaDstOU1YCykoaNWBigRqVHchR2YEclR3JwcRLmrISDJ2kn-AS8lTZJY0aqcGx06hBW6dJIwFpZIo0NmUHalR2IEdlR3JQdiCHT_00ZSWgrKRRg8oOKIvODWASlR1gEpUdyNHE05RVYGoU_YKckKfKrmjUKPBAp2jUgK0rmjQKkEalSGNTdqBGZQdyVHYkB2UHclR2RVNWAcoqGjXoLR9QFp0bwCR6zweYRC_6QI4mnqasQsdOvzUn5Omy06jR4IFO06hJbn348tuvAAAA__-0tF1d
 
 # EXCEPT ALL and EXCEPT with swapped column orders.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x, y FROM xyz EXCEPT ALL SELECT y, x from xyz]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzEllFr2zwUhu-_XxHO1TeQcSTbaWMYZIzCCqUpbS4GwxdurCWB1DKSA81K_vuwvZLFyXSsncS7dOxHeqXzQN43yFUm79MXaSD-BhwYCGAQAIMQGESQMCi0mktjlK4-aYDb7BXiIYNVXmzK6ueEwVxpCfEblKtyLSGGWfq8lo8yzaT2h8Agk2W6WtfbFHr1kurt5HX7Axg8FWlu4oHnVztPN2U8mHA2EZDsGKhN-WuH_cLP28EyNcvDJd-RhIEp04WEmO_Y34WNHMMKNuHUsOKPYfdLbXKlM6lldrBYUpHYJydO_CU1yydZTguft6Yz2xYyHtx8_XzzMBt8ursDBmv5vfy_Tv3ho14tlu8PtoHtDxcQDnci-b3yVOHzqH0NJ_cOD_bm3S3gHSzwhecHF5TWIe7IOe75teX9ast71VZ0n4XoMovA88MLquMQ98o57vnVEf2qI3pVJ-g-i6DLLEKv_o-6lDoOca-d455fnaBfdYJe1Qm7zyLsMovIu6A4DmHHjmHPr03YrzbhP-tYJ3I9SlOo3MhODWpYnUxmC9nclFEbPZcPWs3rbZrHac3VDSCTpmzeiubhNm9eVQG7wyMKPKbAnJSbR3aaO1yZcINHFHhMgTkpd-vKjmjRpoe_04H9vgMrzA_vbNimQ4rgdhgR3A4jgtthTHCERgSPKILbYURwO4wIbocxwREaEXxEEfyKoqgdRhS1w4iidhhTFKERRa8pitphRFE7jChqhzFFERpRdExRlJN6AkIjkiI0YilCY5piONYVaGWB1hZodYHYF2iFgZMaAz-qDE622mnMVjuN2WqnUVsRHLPVpSwdz8ylLbnSmK1OfckZx2w9Kg9WW5Pdfz8DAAD__7IPavA=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll1v2jAUhu_3K6xz1UpGwU6gJdIkqo5pSKx0hYtKVS5S4hUkSjI7kUir_vcpSbuWj_nEM2SXIXns1z6PxPsM6tcSfJgMRoPLKcnkkny9GX8nd4Pb69HF8IqcfBlOppMfo1Py-smakrz6Zp0_kcHt5eB6Si5Go7f3OSXrP-8DoLCKI3EVPgoF_h0woMCBggsUPKDQgYBCIuOZUCqWxSfPJTCM1uC3KSxWSZYWPwcUZrEU4D9DukiXAnyYhvdLcSPCSEinDRQikYaLZblNIhePocz76_wJKEyScKV80nKKncdZ6pM-o30OwQuFOEtfd3hf-D4n81DNN5d8QwIKKg0fBPjshf5b2I5hWE77zDYs_2vY96WyVSwjIUW0sVhQkNgne078LVTziUjHicO2pjPNE-F_UAcoLMXP9KRMffpZLh7mbw-6gb0fzrU43J7kV3ErThzW2b6GvXt7G3uz-hawGhY4vOW4R5TWIG7XOO7htWXNassa1ZbXnwWvMwu35XhHVMcg7plx3MOrw5tVhzeqjlt_Fm6dWXit8j_qWOoYxD03jnt4ddxm1XEbVcerPwuvziw6rSOKYxC2Zxj28Np4zWrj_beOtSfXjVBJvFKiVoNqFycT0YOobkrFmZyJaxnPym2qx3HJlQ0gEiqt3vLqYbiqXhUB68NdG7hnAzOr3Kyjp5nBlXEzuGsD92xgZpV768p2aL5Ntz_Srv6-XS3MNu-svU17NoLrYURwPYwIrocxwREaEbxjI7geRgTXw4jgehgTHKERwbs2gp_ZKKqHEUX1MKKoHsYURWhE0XMbRfUwoqgeRhTVw5iiCI0o2rNRlFn1BIRGJEVoxFKExjTFcKwr2JUFu7ZgVxcs-4JdYWBWjYHtVAYjW_U0ZquexmzV06itCI7ZalKWdmdm0pZMacxWo75kjGO27pQHra3By6ffAQAA__-YZoZN
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x, y FROM xyz EXCEPT SELECT y, x from xyz]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF9r4kwYxe_fTyFz9S5E4jOT-Cew4LJb2EJpS9uLhcWL1MxWwZqQRKhb-t0XldWamOfMJKZ7ae0vc3LynJMZX8UyjvR1-KwzEfwUJBwhhSOUcIQnHOGLiSOSNJ7qLIvTzb_sgMvoRQQ9R8yXySrf_HniiGmcahG8inyeL7QIxEP4uNB3Oox06vaEIyKdh_PFdpkknT-H6Xr8sv4tHHGfhMss6HTdzco3qzzojMkZSzF5c0S8yg8rZHn4pEVAb465im_zLJ8vp7nrH0s4tcSBelx3ZmE2O40clEgbJe_9IFtDpDOmSkNULUOoDUe8SimHS62WcRrpVEdHF9tepVKs7GGxBxV-WyoMLDuo6DdQ4dQS-j3MZvc6v0lcVfDrYZ3ooHPx4-vF7UPny9WVcMRC_8r_397Bp8_p_Gn294NZCAfntfg67saJq_yiDSfXHh6tTRaxM0idK7uuqlNEQMd-iPqtF5GNI_aWWFSRqSXUhidepZSGJUD1q-iMKgwsq6oiOxWNq4g-tIqk-fBLk9lXXderUwdAx_5BDlqvAwtHyN4SizowtYTa8MSrlNIwiLJ-HZxRhYFlVXVgp6JxHcgPrQNlPvzKZPa97vYkYV0HQMf-QQ5brwMLR8jeEos6MLWE2vDEq5TSMIiqfh2cUYWBZVV1YKeicR2oD60Dz3z4PZPZ97t1ygCo2D_GUetlYOEH2RpiUQWmhlAbjniVUhqG0KtfBWdUYWBZVRXYqWhcBd4_-83ihK47nSXxMtNGv0j0Nnemoye9cyqLV-lU36bxdLvM7uPNltv-IdJZvvuWdh8ul7uvNgLfw1SE6T3sHcFkB5NsRI-a0LLfhFaKpyXruOIdV-zSPr8yDxPQzdOy14geNKEVmDSPdRw8bN8ClkW4z8Lgpgf8oPT5SRmy9IiHR02CzcMo2IAGweZpFGyeRsEm0KWoTPlaAdkGNAo3wFG6EQ4mHeAo38RXKiG81C4cXso48fWCbp3vFwIpp1LDWL2CeRq-gwGOXsI8Dt_CPA7TytcrDYHxpX61SitPw7TyOEwrwNHI8jhMa6llj4yXBLZPfMsW8FJaZalqbNIq-aaRYPcm-X0MMA7QKK0IB2kFOEorwOGmmS9Z6QPjSy1rk1ZAo7QCHKUV4WhkeRylVfJbWDkEON-yBbycVn4Xi26dbxrVA2etUtPYpBXQKK0IB2kFOEorwFFaFV-ySgLjSy1rdcrlaXjM5XF4zgU4OujyOEqr4reyClnHt2wBL6VV8XvZ4q1P3v77EwAA__8vwwiq
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmFFv2kgUhd_3V1j3qZUGwcwYQiytlKpltZHYJBt4qFTx4MJsgkQxaxsJGuW_rzAbCHZ8z4yN00cwn-f4-J7jMU-U_LuggEaD4eDz2FvHC--P-9u_vG-Dr3fDT9c33ocv16Px6O_hR-__n2yEt93_ZrP96Q2-fh7cjV-ObYW3ORybkKBlNDM34Q-TUPCNJAlSJEiTIJ8EdWkiaBVHU5MkUbz7yVMGXM82FHQEzZerdbr7eiJoGsWGgidK5-nCUEDj8PvC3JtwZuJ2hwTNTBrOF9kyq3j-I4y3V5vtTxI0WoXLJPBa7d3Kt-s08K6kuFI0eRYUrdPjCkkaPhgK5LOwV_FlnqTz5TRtd08lvLXEkfq-9R7D5PFt5KhEuSh57Yd0NUSJK1lqiK5kiGzCEb9UyvFU62UUz0xsZicny85SKlZ1sNijim5TKiwsO6ro1VAhKgn9M0weRya9XbV1zq_xdmWClyr4NBySoIX5J_2QXcHH3-P5w-PLB7sQXpzX4puoFa3aupu34c21-ydrS4fYWaSurVptXaWIgI7DEPUaLyIXR9wtcagiW0tkE574pVJqloCsXkVnVGFhWVkVuamoXUXyXatI2Q-_spl93Wr7VeoA6DjcyIvG68DBEeluiUMd2Foim_DEL5VSM4iqeh2cUYWFZWV14Kaidh2od60DbT_82mb2_Vb2JuFcB0DH4Ub2G68DB0ekuyUOdWBriWzCE79USs0g6up1cEYVFpaV1YGbitp1oN-1Dnz74fdtZr_bqlIGQMXhNl42XgYOfkhXQxyqwNYQ2YQjfqmUmiH0q1fBGVVYWFZWBW4qaleB_8v-s3hD171JVtEyMVb_SHR2V2ZmD2bvVBKt46m5i6Nptsz-423GZV_MTJLuj8r9h-vl_tBO4GtY5mH5GvZPYOkGS1WLvqxDq14dWmueVqzjmndcs0t3-ZV5WALdPK06teiLOrQGk-azjoOb3XWAVR7usTC46At-UHr8pPRZ-pKHL-sEm4dRsAENgs3TKNg8jYItQZeiMuVrBWQb0CjcAEfpRjiYdICjfEu-UiXCC-3C4YWMS75e0KXz_SJBymWhYZwewTwNn8EARw9hHodPYR6HaeXrVfaB8YV-dUorT8O08jhMK8DRyPI4TGuhZU-MVxJsn_iWzeGFtKpC1bikVfFNo8DuTfH7GGAcoFFaEQ7SCnCUVoDDTTNfsqoLjC-0rEtaAY3SCnCUVoSjkeVxlFbFb2FVH-B8y-bwYlr5XSy6dL5pdAe8axWaxiWtgEZpRThIK8BRWgGO0qr5ktUKGF9oWae3XJ6Gr7k8Dt9zAY5edHkcpVXzW1mNrONbNocX0qr5vWz-0ifPv_0XAAD__6dTIw4=
 
 # EXCEPT ALL and EXCEPT with different ORDER BY types.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) EXCEPT ALL (SELECT y AS x FROM xyz ORDER BY z) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lk1r20AQhu_9FWZOLV0j7Uryh6CQUgINhCQkORSKD4q1jQ2OJVYyxA3578VyTCrLmVdrybrVtZ7d8czzZvRCyyTWV9GTzij8TZIEKRLkkSCfBAU0EZSaZKqzLDGbR7bARfxMoStovkxX-ea_J4KmidEUvlA-zxeaQrqPHhb6VkexNo5LgmKdR_NFcU1q5k-RWZ89r_-SoLs0WmZhr-9sbr5e5WHvTNLkVVCyyt-Ofz_1Yd2bRdmsfF7x_ERQlkePmkL5Ko4rM7AsUzUqU31Y5vs5q2ViYm10XDppsiHRIwd-688om93p_Dp15N5E7tepDnvnv36c39z3vl9ekqCF_pN_PpNfvpn546z414fjef9Nnk3r7xKTa-PIYL9NXz8836_Rs0PteDv0QBFXST9JHeXuN_jg9UHpelnfLFnDLEf1He8kEbAodGBdaJshkN2GQHYRAtD8XQgGx4ZA1R-uqjNcr-_4J7HQotChdaFtWqi6tVB1YSFo_s7C4bEWevWH69UZrt8vtnH7FloUOrIutE0LvW4t9LqwEDR_Z-HoWAv9-sP16ww36J_EQYsyx5Zltmmg362BfhcGgtbvDBy38Up64PxbnaXJMtO13jbdTcN0_Ki3A8iSlZnqG5NMi2u2H68LrnjLiHWWb79V2w8Xy-1XmwLrw8MmsJSN6KARPeZpadEzZQcPm8B7PbOlg0b0mKfVPu3-T3sl2N2HPRb2-Wn5LKwkf3XQJB88DPLBwygfgAb5ADTIx6BJPngY5IOHUT4ADfIBaJCPIWvpiJd01CQf4yaG8zAwnIeR4YAGhgMabQCbtVn9S2qzN21puASsNqc1DjSXlS1SUlUqXnTJrxFguqzsERvVAQ1cBzSSHeHAdoQj3Ss71Ep3nka68zTUHeBId4Aj3SuLtKz7AOhe2SlWuld2ipXuPI1052moO8CR7gBHulf2qZXuPI1052moO8CR7gBHule2avld2-V1V5Xdwuo-ef30LwAA__-bP1n6
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll9v4jgQwN_vU1jzVHRGwU7Cn0gntddyOiS2dAkPXVV5SIm3IFGSdYJEWvW7rwhlaQj1xITmDYp_48nMbzp5hfjXAhxw-8P-9YSs5IL8Nx59Iw_9-7vh1eCWXNwM3In7fdggF-9n1tsT6_SFjMY3_TH59wdJG6R_f92_m5Cr4fDPyZRcuUePvzT2n9ceUFiGgbj1n0UMzgMwoMCBggkULKBgg0chkuFUxHEoN0deM2AQrMFpUZgvo1Wy-bNHYRpKAc4rJPNkIcCBif-4EGPhB0IaLaAQiMSfL7JrIjl_9mV6uU5fgIIb-cvYIU1jc_NolTjkkoH3RiFcJe_h91EfUzLz41k-XnbeoxAn_pMAh73R09K0NdPkldLkn6a5j7NahjIQUgS5SN6GxI4cedb__XjmimQUGeygI5M0Es4HkYDCQvxMLi5Z4x85f5plnz5tz_6ZTJ3Su6FMhDSYfVimvz-Nb5Wo2bFyvAc9ksRt2Awjg7cOC3z0ejt3PStvFithlsGbhvklI6CRaFs70XMOAat3CFgdQ4AUfzcE7VOHgJdvLi_TXLNpWF9ioUaiHe1Ez2khr9dCXoeFSPF3FnZOtdAs31yzTHOtZraNz2-hRqJd7UTPaaFZr4VmHRYixd9Z2D3VQqt8c60yzbWbX-KgRpo9zTTPaaBVr4FWHQYipd8Z2DvHK-mR-GMRR-EyFqXeNlubgongSWwbEIcrORV3Mpxm12y_jjIue8sIRJxsf-XbL4Pl9qdNguXhThWYsUq0XYnuqWmmUTOuB3eqwAc106XtSnRPTfNDuvWRNnNw6xA2lbCl7palhDlTX21XmQ81jMyHGsbmA6GR-UBoZD7aVeZDDSPzoYax-UBoZD4QGpmPjtLSrlrSbpX56FUxXA0jhqthzHCERgxHaGwD6KzN4n9Snb2pS6NLQGtzauOI5qywRXKqMq4WnanXCGI6K-wRHdURGnEdoTHZMRyxHcMx3Qs7VEt3NY3prqZR3REc0x3BMd0LizSvexvRvbBTtHQv7BQt3dU0pruaRnVHcEx3BMd0L-xTLd3VNKa7mkZ1R3BMdwTHdC9s1fy7dkutOy_sFqXu3ttfvwMAAP__deR-jA==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) EXCEPT (SELECT y AS x FROM xyz ORDER BY z) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1r4kwcxe-fTyFz9SwbifPiW2Chy25hC6UtbS8WFi9SM1sFa0ISoW7pd1_UVWvG_M9MEr3z7cycnPmfH4lvbB5H-iZ80RkLfjHOPCaYxyTzmGIe67KRx5I0Hussi9PVTzaCq-iVBR2PTefJIl99PPLYOE41C95YPs1nmgXsMXya6XsdRjr1O8xjkc7D6Wy9TZJOX8J0efG6_MM89pCE8yxotf3VzreLPGhdcDZ691i8yPfLZ3n4rFnA3z17C9-nWT6dj3O_e7i_sf5e8rRsTcJscuT3ew_CxcPHGLhrDqI0B1kpB95sEKrUxH6dxTxOI53q6GCl9SqlNkUH2Nxb6J7KAkpqb6FXw4JXyeWPMJs86Pw28WUhqcdlooPW5c9vl3ePra_X18xjM_07__-Cf_qSTp8n61cWNeu7jNdDnOY69aUR2efS9QcWmR2L49-iR0zcxO048VWnGPDR7YcH23OHBlsU2BdtXzqjDJjYDWbvhChzCcI9CVuY2SbBm41ClZqoSRJeEWYNWkBJlcHMzUJtmPFzwAyM1xZmRmS2MBP2JRI2HZJtXznTBJjYTUb_hDRxCIK7J2FLE9skeLNRqFITNassKtKkQQsoqTKauFmoTRNxDpqA8drSxIjMlibSvkTSpkOqvX4YcqMJMLGbjMEJaeIQBHdPwpYmtknwZqNQpSZqVllWpEmDFlBSZTRxs1CbJvIcNAHjtaWJEZktTZR9iZRNh7ptZ5YAC7u5GJ6QJQ4xcNccbElimwNvNghVaqJmjVVFkjRoASVVRhI3C7VJos5BEjBeW5IYkVX5y-bI-vc6S-J5pq3-jemsAtPRs94cQBYv0rG-S-PxepvN29u1bv1BpLN88y3fvLmab75aGfwo5kUx_yhWB2LuJuayjlrwWuphHbXs02pBJi7pxCW5dZfemRZzcF60Wog6atmppR7QakUm3qPFXQexKIp7pLhPn3WfFINrHpBiBYo9pKnQAVgwoOLEBVoNwUDLIRmAHKGBliM2cAMth8ELELzBFhc8ADXiA5AjQAA5IgSSg7pwgzCHwaPoaMQU5AYmOA0Z3gPHTmMGXTrNGT4AmxukcSo7rYZlp-Ww7ECOyk7LYdlpygpAWUGjBkwsUKOyAzkqO5CjsiM5mHhBU1aAoRP0HVxBbpRd0KgRChw7jRp06TRpBCCNMEjjUnagRmUHclR2JAdlB3J4109TVgDKCho1qOyAsujcACZR2QEmUdmBHE08TVkJpkbSD8gFuVF2SaNGghs6SaMGXLqkSSMBaaRBGpeyAzUqO5CjsiM5KDuQo7JLmrISUFbSqEFP-YCy6NwAJtFzPsAketAHcjTxNGUlOnb6qbkgN8tOo0aBGzpFo6Z46aP3__4GAAD__zkG6ds=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1v4kYYhe_7K6y5SlQjmA8-YqlS0g1VI9GQAhdbrbjwwjRBYjG1jQSJ8t8rYIHgwe-ZwSZ3CfjMHJ95zyObN5b8N2UB67c77S8DbxFPvT963b-8b-2vT527h0fv6v6hP-j_3bn2rn5es9xesVy9et3efbvn_f6Pt7r22l-_tJ8G-6tW3l3_5KWv14e_l0Pms1k01o_hD52w4BvjzGeC-Uwynynmszob-mweRyOdJFG8vuRtI3gYL1lQ89lkNl-k64-HPhtFsWbBG0sn6VSzgA3C71Pd0-FYx9Ua89lYp-FkutlmHk9-hPHqdrl6ZT7rz8NZEniV6nrn7iINvFvOhu8-ixbpYfkkDZ81C_i7b2_hfpKkk9kordaP9zfWP0i-r7yXMHk5cf3Bg3Dx8DEG7pqDyM1BnpUDLzcIlWvisM5iFsVjHevx0UqbVXJtihqwebBQv5QFlNTBQqOABf8sl3-GyUtfp915VWaSGqzmOtjB4K7TYT6b6n_Tq1t-_Vs8eX7Z_GVRs6bLePWjONVxVRqR_Zq7fssis1Nx_Fz0hInHqBLNq6qWDfjk9jdH23OHBlsUuCoqVemMMmBiP5iNC6LMJQj3JGxhZpsELzcKlWuiIEn4mTAr0QJKKg9mbhYKw4x_BszAeO1gZkRmCzNhXyJh0yFZqSpnmgAT-8loXpAmDkFw9yRsaWKbBC83CpVromCVxZk0KdECSiqPJm4WCtNEfAZNwHjtaGJEZksTaV8iadMhVdm8DLnRBJjYT0brgjRxCIK7J2FLE9skeLlRqFwTBassz6RJiRZQUnk0cbNQmCbyM2gCxmtHEyMyW5oo-xIpmw7VK84sARb2c3FzQZY4xMBdc7AliW0OvNwgVK6JgjVWZ5KkRAsoqTySuFkoTBL1GSQB47UjiRHZOT_ZnFi_p5N5NEu01a8xtXVgevystweQRIt4pJ_iaLTZZvtvd6PbfDDWSbr9lm__eZhtv1ob_CjmWTH_KFZHYu4m5rKIWvBC6psiatmk1YJMXNKJS3LrOr0zLebgvGi1EEXUslZI3aLViky8QYvrDmKRFTdIcZM-6yYpBvfcIsUKFPuGpkINYMGAihMXaDUEAy2HZAByhAZajtjADbQcBy9A8AZbXPAA1IgPQI4AAeSIEEgO6sINwhwHj6KjEZORG5jgNGR4Axw7jRl06zRneAtsbpDGqey0GpadlsOyAzkqOy2HZacpKwBlBY0aMLFAjcoO5KjsQI7KjuRg4gVNWQGGTtBPcBm5UXZBo0YocOw0atCt06QRgDTCII1L2YEalR3IUdmRHJQdyOFTP01ZASgraNSgsgPKonMDmERlB5hEZQdyNPE0ZSWYGkm_IGfkRtkljRoJHugkjRpw65ImjQSkkQZpXMoO1KjsQI7KjuSg7ECOyi5pykpAWUmjBr3lA8qicwOYRO_5AJPoRR_I0cTTlJXo2Om35ozcLDuNGgUe6BSNmuytD99_-T8AAP__2B4Ngw==
 
 # EXCEPT ALL and EXCEPT with different numbers of ORDER BY columns.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) EXCEPT ALL (SELECT x FROM xyz ORDER BY y, z) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll1r2zAUhu_3K8K52piCLdnOh2HQMQorlLa0vRiMXLix1gTSyMgONCv97yNOQ-c41mvFje6axo_0-ug5OXqhpUrlVfIkc4p_EydGghgFxCgkRhFNGGVaTWWeK715ZAtcpM8U-4zmy2xVbP49YTRVWlL8QsW8WEiK6T55WMhbmaRSez4xSmWRzBflNpmePyV6ffa8_kuM7rJkmce9vrfZ-XpVxL0zTpNXRmpVvC3_vurDujdL8ll1vfL5CaO8SB4lxfyVHRczchpTNMZ8X2e1VDqVWqaVlSYbEj1y4F1_JvnsThbXmcf3TuR-ncm4d_7rx_nNfe_75SUxWsg_xecz_uWbnj_Oyr8a3_v9nQKb0t8pXUjt8Wi_TF8b1w9b1OxQOd4WPRDiSvVV5gl_v8AHt48q2_P2ZvEWZnmi7wUnaQGLoAPHQUVjUAdNwF00ASj-rgkGxzaBaH-4os3hBn0vPImFFkGHjoOKxqAOLBQuLATF31k4PNbCoP3hBm0ON-yX0_jjLbQIOnIcVDQGdWBh4MJCUPydhaNjLQzbH27Y5nCj_kkctIg5dhpTNMZ0YGDowkBQ-p2B44-4kh5Y_1bmmVrmstVt098UTKaPcnsAuVrpqbzRalpus_14XXLlLSOVebH9Vmw_XCy3X20CtoeHXWDOO9FRJ3psprlFzYQdPOwC79XMlo460WMzLfZp_386qMD-PhwY4dB8WqERFty8ddSlP8ww6A8zjPoD0KA_AA36Y9ClP8ww6A8zjPoD0KA_AA36Y2i0dGSWdNSlP8ZdDDfDwHAzjAwHNDAc0GgC2IzN-i-pzdy0peEQsJqc1jjQnNemSEVVLsyic_MYAabz2hyxUR3QwHVAI9kRDmxHONK9NkOtdDfTSHczDXUHONId4Ej32iCt6j4AutdmipXutZlipbuZRrqbaag7wJHuAEe61-aple5mGulupqHuAEe6AxzpXpuq1bu2b9Zd1GaLUffJ66d_AQAA__8uW1n1
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lk9v4joQwO_vU1hzKnpGiZ2EP5Ge1L6W1SKxpQscuqpySIm3IFGSdYIErfrdV4QiGkI8MWlzaxr_7MnMbxi_QvxnAS6Me4Pe9YSs5IJ8Gw1_kIfe_d3gqn9LLm7648n456BBLt7XrHcr1psXMhzd9Ebk_19k0yC9--ve3YRcDQbqlZS8NA6Paw8oLMNA3PrPIgb3ARhQ4EDBAgo2UHDAoxDJcCriOJTbJa8p0A_W4JoU5stolWz_7VGYhlKA-wrJPFkIcGHiPy7ESPiBkIYJFAKR-PNFekwk58--3FyuNy9AYRz5y9glTWN78nCVuOSSgfdGIVwl79sfdn3ckJkfz7L7pes9CnHiPwlw2Rs9L0yn1jB5YZiHfVbLUAZCiiCzk7clsSUnvvW7H8_GIhlGBjuqyGQTCfeDRkBhIX4nF5es8Z-cP83Svwq_-_BNlk7qx6FMhDSYc5ymfwv3t0vk7FQ63jc9EcRt2Awjg5vHCT55vJM5npU3i5Uwy-BNw_qSFtAItFVzoLww0BqagNXRBEjy903QOrcJePni8jLFtZqG_SUWagTarjlQXhhoDRbyOixEkr-3sH2uhVb54lplims302n8-RZqBNqpOVBeGGgNFlp1WIgkf29h51wL7fLFtcsU12l-iYMaYXZrDZMXhlmDgXYdBiKp3xvY_Ywr6Yn9RyKOwmUsSt02zW3CRPAkdgWIw5WcijsZTtNjdo_DlEtvGYGIk91bvnvoL3evtgGWh9tVYMYq0U4luqummUbOuB7crgIf5UyXdirRXTXNj2nzI21lYPMYtpSwra6WrYQ5Ux_tVOkPNYz0hxrG-gOhkf5AaKQ_WlX6Qw0j_aGGsf5AaKQ_EBrpj7bS0o5a0k6V_uhWMVwNI4arYcxwhEYMR2hsAuiMzfwvqc7c1KXRIaA1ObVxRHOWmyIZVRlXi87UYwQxneXmiI7qCI24jtCY7BiO2I7hmO65Gaqlu5rGdFfTqO4IjumO4JjuuUGa1b2F6J6bKVq652aKlu5qGtNdTaO6IzimO4JjuufmqZbuahrTXU2juiM4pjuCY7rnpmr2rm2qdee52aLU3Xv7528AAAD__6Lfff8=
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) EXCEPT (SELECT x FROM xyz ORDER BY y, z) ORDER BY x]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mE9r60YUxff9FGZWLZWRZ-74n6CQ0j7og5CEJItC8UKxprHBsYQkQ9yQ715sP9uxxrpHI8ne-d-ZOTpzzw_JH2IZR-YufDOZCP4RUnhCCU-Q8IQWnuiLiSeSNJ6aLIvTzU92gu_Ruwh6npgvk1W--XjiiWmcGhF8iHyeL4wIxHP4sjCPJoxM6veEJyKTh_PFdpsknb-F6frmff2f8MRTEi6zoNP1Nzvfr_KgcyPF5NMT8So_Lp_l4asRgfz0qlv4c57l8-U09_un-1vrHyUv684szGZnfn_0oFw8fI1BtpcD1cpBthuELjVxXGe1jNPIpCY6WWm7SqlN1QM2jxb6l7KAkjpaGDSw4NVy-VeYzZ5Mfp_4VEjqeZ2YoPPt7z--PTx3fr-9FZ5YmH_zn2_kL7-l89fZ9lWF8Rq6jNdTnOYm9cmK7NfS9UcVMjsXx49Fz5i4i7tx4uteMeCz249PtpcODa5QYF91fXJGGTBxGMzBBVHmEkSbSVCtJGS7UehSEw1JImvCrEULKKkymLlZaAwzeQ2YgfHaw8yKrCrMVPUSqSodoq6vnWkCTBwmY3hBmjgEIdtMgmolIduNQpeaaFhlVZMmLVpASZXRxM1CY5qoa9AEjNeeJlZkVWlC1UtEVTqku9uHITeaABOHyRhdkCYOQcg2k6BaSch2o9ClJhpWmWrSpEULKKkymrhZaEwTugZNwHjtaWJFVpUmunqJdJUO9bvOLAEWDnMxviBLHGKQ7eVAtXKQ7QahS000rLGuSZIWLaCkykjiZqExSfQ1SALGa08SK7I6f9mcWf_RZEm8zEylf2N6m8BM9Gp2B5DFq3RqHtJ4ut1m9_Z-q9t-EJks330rd2--L3dfbQx-FcuiWH4V6xOxdBNLaqJWspF63ERNQ16t2MSJT5zYrfv8zrxYgvPi1Uo1UVOvkXrEqzWb-IAX9x3EqigesOIhf9ZDVgyuecSKNSj2mKdCD2DBgooTF3g1BAMvh2QAcoQGXo7YIC20nAavQPAWW1zwANSID0COAAHkiBBIDuoiLcKcBo-i4xFTkFuYkDxk5AAcO48ZdOk8Z-QIbG6RxqnsvBqWnZfDsgM5Kjsvh2XnKasAZRWPGjCxQI3KDuSo7ECOyo7kYOIVT1kFhk7xd3AFuVV2xaNGaXDsPGrQpfOkUYA0yiKNS9mBGpUdyFHZkRyUHcjhXT9PWQUoq3jUoLIDyqJzA5hEZQeYRGUHcjTxPGUJTA3xD8gFuVV24lFD4IaOeNSASyeeNARIQxZpXMoO1KjsQI7KjuSg7ECOyk48ZQlQlnjUoKd8QFl0bgCT6DkfYBI96AM5mniesoSOnX9qLsjtsvOo0eCGTvOoKV765POn_wMAAP__mkXp1g==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1v4kYYhe_7K6y5SlQjMx98xFKlbDdUjURDClxsteLCC9MEicXUNhIkyn-vgBCCB7_HYxvuQvCZOT7znkc2ryz-b8Z8Nuh0O1-HzjKaOX_0e3853zvfHrtf7h-cq7v7wXDwd_fauXq_ZrW7YrV-cXr9u07f-f0fZ33tdL597TwO6atc5-X68HE1Yi6bhxP9EPzUMfO_M85cJpjLJHOZYi5rsJHLFlE41nEcRptLXreC-8mK-XWXTeeLZbL598hl4zDSzH9lyTSZaeazYfBjpvs6mOjIqzOXTXQSTGfbbRbR9GcQrW9X6xfmssEimMe-U_M2O_eWie_ccjZ6c1m4TA7Lx0nwpJnP39z8Fu6mcTKdjxOvcby_sf5B8mPtPAfx84nrDx6EjYfPMfDqcpCFcuDVBqEyTRzWWc7DaKIjPTlaabtKpk1RBzYPFhrnsoCSOlholrDgFnL5ZxA_D3TSW3gyldRwvdD-HgVful3mspn-N7m65de_RdOn5-1fOcarZTNegzBKdORJI7JfM9dv58jsVBzvi54w8RDWwoWn6umAT25_c7Q9t2hwjgJ7ouZJa5QBEx-D2TwjymyCqDIJWSgJXm0UKtNESZLwgjCr0AJKKgtmdhZKw4xfAmZgvPYwMyLLCzORv0QiT4dkzVPWNAEmPiajdUaaWATBq0xCFkqCVxuFyjRRssqiIE0qtICSyqKJnYXSNBGXoAkYrz1NjMjy0kTmL5HM0yFV274M2dEEmPiYjPYZaWIRBK8yCVkoCV5tFCrTRMkqy4I0qdACSiqLJnYWStNEXoImYLz2NDEiy0sTlb9EKk-HGjVrlgALH3Nxc0aWWMTAq8tBFsqBVxuEyjRRssaqIEkqtICSyiKJnYXSJFGXIAkYrz1JjMiK_GRzYv2-jhfhPNa5fo2pbwLTkye9O4A4XEZj_RiF4-02u4-9rW77j4mOk923fPfhfr77amPws5inxfyzWB2JuZ2YyzJqwUupb8qoZYtWCzJxSScuya0b9M60mIPzotVClFHLeil1m1YrMvEmLW5YiEVa3CTFLfqsW6QY3HObFCtQ7BuaCnWABQMqVlyg1RAMtBySAcgRGmg5YgM30HIcvADBG2yxwQNQIz4AOQIEkCNCIDmoCzcIcxw8io5GTEpuYILTkOFNcOw0ZtCt05zhbbC5QRqrstNqWHZaDssO5KjstByWnaasAJQVNGrAxAI1KjuQo7IDOSo7koOJFzRlBRg6QT_BpeRG2QWNGqHAsdOoQbdOk0YA0giDNDZlB2pUdiBHZUdyUHYgh0_9NGUFoKygUYPKDiiLzg1gEpUdYBKVHcjRxNOUlWBqJP2CnJIbZZc0aiR4oJM0asCtS5o0EpBGGqSxKTtQo7IDOSo7koOyAzkqu6QpKwFlJY0a9JYPKIvODWASvecDTKIXfSBHE09TVqJjp9-aU3Kz7DRqFHigUzRq0rc-evvl_wAAAP__chwM9g==
 
 # EXCEPT ALL and EXCEPT with compatible ORDER BY columns that are not in the final result.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz ORDER BY z) EXCEPT ALL (SELECT y FROM xyz ORDER BY z)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ltFq2zAUhu_3FOFcbSDjSLbTxjDIGIUVSlPaXAyGL9z4LAmktpEcaFby7sP2WBYn0bGmRndN7U_6dfSB_zfIiwzv0xdUEP8ADgwEMAiAQQgMIkgYlLKYo1KFrF9pgdvsFeIhg1Vebqr63wmDeSER4jeoVtUaIYZZ-rzGR0wzlP4QGGRYpat1s00pVy-p3E5et7-AwVOZ5ioeeH6983RTxYOJgGTHoNhUf5bfr_q8HSxTtTxcb8Ih2SUMVJUuEGK-Y_8XM3IaU5yNuV9nkxcyQ4nZwUpJTVKvnDjrt1Qtn7Calj7v3MhsW2I8uPn-9eZhNvhydwcM1viz-jjhnz7L1WLZ_PX33Lxz7v2ZAosznQh8X3hF6fOoe_qTe4cHe_P-1857XLsvPD-4iJ8GQUeOg4qzQR0Yyl0YKvoPX_QZfuD54UUsMQh65TioOBvUgSXChSVB_-EHfYYfes2n5v0tMQh67TioOBvUgSWBC0vC_sMP-ww_8i7iiEHMsdOY4mxMB4aErvvQiTiPqMoiV9ir7QzrA2G2wHZAqtjIOT7IYt5s0_6cNlzz5c5QVe1T0f64zdtHdcD-8MgGHtvA3Co3j_Q0NxiZMINHNvDYBuZWuTsjO6JFlx7-Swf6eQdamB_ObNilQxvB9TAhuB4mBNfDlOAETQge2QiuhwnB9TAhuB6mBCdoQvCRjeBXNorqYUJRPUwoqocpRQmaUPTaRlE9TCiqhwlF9TClKEETio5tFOVWPYGgCUkJmrCUoClNKZzqCnZlwa4t2NUFy75gVxi4VWPgR5XByFY9Tdmqpylb9TRpK4FTtpqUpeM7M2lLpjRlq1FfMsYpW4_Kg9bWZPfhdwAAAP__ubNVYA==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lkFv2jAYhu_7FdZ3aiWjYCfQEmkSXcs0JFY64NCpyiElXkGiJLODVFrx3yeSai0B_MXz6lspfuzXnx-J9wXU7wWEMO4NepcTspIL8nU0_E7uerc3g4v-NTm56o8n4x-DU3LyumZdrnhaP5Ph6Ko3Il9-kudT0ru97N1MyMVggKyMgMIyTcR1_CgUhHfAgAIHCj5QCIBCCyIKmUynQqlUbpe8FEA_eYKwSWG-zFb59t8RhWkqBYQvkM_zhYAQJvH9QoxEnAjpNYFCIvJ4viiOyeT8MZbr7tP6GSiMs3ipQtLwticPV3lIuhyiDYV0lb9u_7br_ZrMYjXb3a_LINpEFFQePwgI2Yb-W8yW05j8aMy3fVbLVCZCimRnp2hLYksO3PVbrGZjkQ8zj1VeZLLORPhOHKCwEL_yky47_SznD7Pir7_3ZpV7v93Jt7jTgcDXaSPNPNaq3v7g2cHO2az-s7Maz-7xhud_iJ8GQduOg_KjQR0YylwYyusPn9cZvt_wgg-xxCDomeOg_GhQB5ZwF5b49Yfv1xl-0Ch-av6_JQZBzx0H5UeDOrDEd2FJUH_4QZ3htxof4ohBzI7TmPxoTAeGBK770IE4I6GydKlErbbT3F5IJA-iHJBKV3IqbmQ6LY4pPw4LrvjlToTKy295-aG_LL_aBqwPt23gjg3MrHKzlp5mBiPjZnDbBu7YwMwqd2VkezSv0s33tK-ft6-F2e7MmlU6sBFcDyOC62FEcD2MCY7QiOAtG8H1MCK4HkYE18OY4AiNCN62EfzMRlE9jCiqhxFF9TCmKEIjip7bKKqHEUX1MKKoHsYURWhE0Y6NosyqJyA0IilCI5YiNKYphmNdwa4s2LUFu7pg2RfsCgOzagxsrzIY2aqnMVv1NGarnkZtRXDMVpOytP9mJm3JlMZsNepLxjhm61550NoabT79CQAA___VGXW5
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) (SELECT y FROM xyz ORDER BY z) EXCEPT (SELECT y FROM xyz ORDER BY z)]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1r-kgYxe_3U8hc7UIkPjOJL4EFl90_bKG0pe3FwuJFamarYE1IItQt_e5_VNCaNM_JZEbv-uIvc-bkOScTP8Q6TfRd_KYLEf0rSHhCCk8o4YlAeCIUM09keTrXRZHmu48cgJvkXUQDTyzX2abc_XnmiXmaaxF9iHJZrrSIxHP8stKPOk507g-EJxJdxsvVfpksX77F-Xb6vv1feOIpi9dF1Ov7u5XvN2XUm0ox-_REuilPly_K-FWLiD699hL-Whblcj0v_fB8_SlVrn9CXra9RVwsvvn8SYM00fDVBnLng-rkA7k1ImgUcbrOZp3mic51cnal_VUaZcoBkHmSEF5KAnLqJGFoIcHrpPLvuFg86fI-81XFqedtpqPej3_-_PHw3Pvj9lZ4YqX_K3-d0m-_58vXxf6n43g172nk1ta7tJ9mvgqru_927fHZ2mQQrxbp8mXfV8Y9A0Qcp2Z4wZ4xMcKlE6qTE-TWiqBRhGXMqWPTOJSAnGpqGjMJ1k1D12ga2X7IZZsZV30_ME47EHG8c6MLpt3ACHLphOrkBLm1ImgUYRk12THtDiUgp5rSbibBOu3yGmlX7YdctZnxoL8_6ZulHYg43rnxBdNuYAS5dEJ1coLcWhE0irCMmuqYdocSkFNNaTeTYJ12dY20B-2HPGgz42HfOOtAwvG-TS6YdQMbyJ0PqpMP5NaIoFGEZcyCjkl3KAE51ZR0MwnWSQ-u_X3BN3IedZGl60K3-jZgsNuQTl71waAi3eRz_ZCn8_0yh1_v99z-D4kuysN_6fDLzfrwr53ArzBVYfoKB2cwmcEkreiJDS2HNrRSPC1ZxxXvuGKXDvmVeZiAbp6WAyt6ZEMrMGkB6zi42aEBLKvwkIXBpkf8oAz5SRmz9ISHJzbB5mEUbECDYPM0CjZPo2AT6FJUpnytgGwDGoUb4CjdCAeTDnCUb-IrlRBeaxcOr2Wc-HpBW-f7hUDKqdYwRo9gnobPYICjhzCPw6cwj8O08vVKY2B8rV-N0srTMK08DtMKcDSyPA7TWmvZM-MlgeMT37IVvJZWWasak7RKvmkkOL1J_hwDjAM0SivCQVoBjtIKcHho5ktWhsD4WsuapBXQKK0AR2lFOBpZHkdplfwRVo4BzrdsBa-nlT_Foq3zTaMG4F2r1jQmaQU0SivCQVoBjtIKcJRWxZesksD4WssaveXyNHzN5XH4ngtw9KLL4yitij_KKmQd37IVvJZWxZ9lq1ufff7yMwAA__8wq-az
+https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mNFvqkgYxd_3ryDfU5tgdGbQWpJNevfWzTZxa1d9uJsbH7gy25pYYQGT2qb_-0bcqxXKdxhA31rlxxwO3zkMvlH875JcmgyGg69Tax0trd_Hoz-t74NvD8Mvd_fWxe3dZDr5a3hpXfx_zGZ3xMvm1RqNbwdj67e_rddLa_Dt6-BhCo6akU2rwNf33rOOyf1OgmySZJMimxyyqUszm8IomOs4DqLtIW8pcOe_kNuxabEK18n245lN8yDS5L5RskiWmlyaej-Weqw9X0ftDtnk68RbLNNlwmjx7EWbm5fNK9k0Cb1V7Fqt9nbl0TpxrRtJs3ebgnVyOH2ceI-aXPFul5dwu4iTxWqetLvH69-IzPkPyI-N9eTFT58cf9AgTTR8tEE054Oq5INo1ginUMThPOtVEPk60v7RmdKzFMqUHSDzIKF7KgnIqYOEXg0JdiWVf3jx00Qno7CtMk5NN6F2f4b_y3BINi31P8nFjbj8NVo8PqV_7cer-JqumrX1PmgFYVt1s1f_6dr9o7WFQbxKpKstW21l3DNAxH5qeifsGRMjmnRCVXJCNGuFUyiiZsxFxaZpUAJyqqhpzCTUbhpxjqaR5Ydclplx1Wo7xmkHIvZ37uqEaTcwQjTphKrkhGjWCqdQRM2oyYppb1ACcqoo7WYSaqddniPtqvyQqzIz7rTSnb5Z2oGI_Z3rnzDtBkaIJp1QlZwQzVrhFIqoGTVVMe0NSkBOFaXdTELttKtzpN0pP-ROmRnvtoyzDiTs79v1CbNuYINozgdVyQfRrBFOoYiaMXMqJr1BCcipoqSbSaiddOfcvxd8Imes4zBYxbrUrwGd7QVp_1HvDIqDdTTXD1EwT5fZ_TtKufQDX8fJ7lux--dutftqK_AjLLKw-Ag7R7Awg4WsRV_XoWWvDq0UT0vWccU7rtilu_zKPCyAbp6WnVr0VR1agUlzWMfBze4awDIL91gYXPQVPyg9flL6LH3Nw9d1gs3DKNiABsHmaRRsnkbBFqBLUZnytQKyDWgUboCjdCMcTDrAUb4FX6kC4bl24fBcxgVfL-jS-X4RIOUi1zBGj2Cehs9ggKOHMI_DpzCPw7Ty9Sr6wPhcvxqlladhWnkcphXgaGR5HKY117JHxksBtk98y2bwXFplrmpM0ir5ppFg9yb5fQwwDtAorQgHaQU4SivA4aaZL1nZBcbnWtYkrYBGaQU4SivC0cjyOEqr5Lewsg9wvmUzeD6t_C4WXTrfNKoD3rVyTWOSVkCjtCIcpBXgKK0AR2lVfMkqCYzPtazRWy5Pw9dcHofvuQBHL7o8jtKq-K2sQtbxLZvBc2lV_F42e-mz91_-CwAA__93TQYi
 
 # EXCEPT ALL and EXCEPT with a projection on the result.
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x FROM ((SELECT x, y FROM xyz) EXCEPT ALL (SELECT x, y FROM xyz))]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzEltFq4kAUhu_3KeRc7cKEOJPE1sCCy1LYQqml9WJhyUVqzqpgkzAToW7x3ZckW1yjzsl0MLmM-mX-OecD_zdIswTv4xdUEP4CDgwEMPCAgQ8MAogY5DKbo1KZLH9SA7fJK4RDBqs03xTlxxGDeSYRwjcoVsUaIYRZ_LzGR4wTlO4QGCRYxKt1dUwuVy-x3E5et3-AwVMepyocOG558nRThIMJZxMB0Y5Btin-nbB_8fN2sIzV8vCV70jEQBXxAiHkO_axsEEPYcXZsPtXbdJMJigxOXhZVJLUT07c-Eeslk9YTHOXN7Yz2-YYDm5-fr95mA2-3d0BgzX-Lj5Xqb98lavF8v1hP4PGAPY38yxudiL2feZkucuD5gxOnu0fnM3bK8BbKOAKx_UuaKxB3FEvccXZuB04y7tzVrRfhGizCM9x_Qt6YxD3qpe44mzcDrwR3XnjtV-E12YRvlP9NV3KG4O4173EFWfjduCN1503fvtF-G0WETgXtMYg7LiHsOJs2A6c8fvpVSdCPaLKs1Rhq9Y0LK-FyQLrMalsI-f4ILN5dUz9OK246l8_QVXU34r64TatvyoDtodHNvDYBuZWuXmgp7nByIQZPLKBxzYwt8rdGNkRLZr08H_a08_b08L8cGbDJu3bCK6HCcH1MCG4HqYEJ2hC8MBGcD1MCK6HCcH1MCU4QROCj2wEv7JRVA8TiuphQlE9TClK0ISi1zaK6mFCUT1MKKqHKUUJmlB0bKMot-oJBE1IStCEpQRNaUrhVFewKwt2bcGuLlj2BbvCwK0aAz-qDEa26mnKVj1N2aqnSVsJnLLVpCwd78ykLZnSlK1GfckYp2w9Kg9aW6Pdp78BAAD__7amZ9o=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzEllFr4kwUhu-_XzGcK4WROJNoa-CDlq7LCm7tVi8KJRepma2CNdmZCNrS_76YtFijzsnsYHI5Os_MO-c8kPMG6s8CfBj3h_2bCVnJBfl-P_pJHvsPd8PrwS1pfBuMJ-Nfwyb52LLONzQan2tKNvlP681rk_Qfbvp3E3I9HJLjO5oBUFjGkbgNX4QC_xEYUOBAwQUKHlDoQEAhkfFUKBXL7Za3DBhEa_DbFObLZJVufw4oTGMpwH-DdJ4uBPgwCZ8W4l6EkZBOGyhEIg3ni-yaRM5fQrm5Wm9egcI4CZfKJy1ne_NolfrkitErDsE7hXiVftywO_hpQ2ahmu0f-YkEFFQaPgvw2Tv9t7CdGsLyk2F3R62WsYyEFNHeYcGWxLYcefGPUM3GIh0lDit0Z7JJhP_FHqCwEL_TRpa6-b-cP88-F7saFAqwe5lr8bIjsW_jVpw4rFOswdG7vb27WXkFWAkFHN5y3DMaaxC3W0tcfjJuBc6y6pzl5RvByzTCbTneGb0xiHtRS1x-Mm4F3vDqvHHLN8It0wivlX2azuWNQdzLWuLyk3Er8MatzhuvfCO8Mo3otM5ojUHYXg1h-cmwFTjj1TNXHQl1L1QSL5UoNTW1t88S0bPIy6TilZyKOxlPs2vy5Sjjsq9-JFSa_8vzxWCZ_7UNWB7u2sA9G5hZ5WYdPc0MSsbN4K4N3LOBmVXuQskOaF6k219pV19vVwuz_Zq1i7RnI7geRgTXw4jgehgTHKERwTs2guthRHA9jAiuhzHBERoRvGsj-IWNonoYUVQPI4rqYUxRhEYUvbRRVA8jiuphRFE9jCmK0IiiPRtFmdWcgNCIpAiNWIrQmKYYjs0KdsOC3bRgNy5Yzgt2AwOzmhjYwchgZKuexmzV05itehq1FcExW02GpcOemUxLpjRmq9G8ZIxjth4MD1pbg_f__gYAAP__BJKH9g==
 
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT x FROM ((SELECT x, y FROM xyz) EXCEPT (SELECT x, y FROM xyz))]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmE9r40gUxO_7KUyfdkFGft2S_wgWsuwEJhCSkOQwMPigWD2xwbGEJEM8Id99sM3YsWS9UqulzNFxfurq0qtSy29iFUf6JnzRmQi-CxKOkMIRSjjCE47wxdQRSRrPdJbF6fZf9sBV9CqCgSMWq2Sdb_88dcQsTrUI3kS-yJdaBOIxfFrqex1GOnUHwhGRzsPFcrdMki5ewnRz8br5KRzxkISrLOj13e3Kt-s86F2QcyHF9N0R8To_rpDl4bMWAb079VV8WWT5YjXLXf9UwrkljtTTpjcPs_l55KhEmij56Ae1aohqZAh14YhXKeV4qfUqTiOd6ujkYrurVIqVAyz2qMLvSkUNy44qhhYqnEZCv4bZ_EHnt4mrCn49bhId9C6__X9599j77_paOGKpf-R_73bwz7_p4nn--8Nx5ip3NmrX35u4Hyeu8osenF17fLI2GWSuRuRc2XdVkxYCOg4TNOy8hUwcadkS1cgS6sITr1KKZQNQ8x5qUUUNy6p6yEyFdQ_R5_WQrD_5ss7gq77rNekCoONwF0edd4GBI9SyJaqRJdSFJ16lFMsUyuZd0KKKGpZVdYGZCusukJ_XBar-5Ks6g-_1dy8Qxl0AdBzu4rjzLjBwhFq2RDWyhLrwxKuUYplC1bwLWlRRw7KqLjBTYd0F6vO6wKs_-V6dwff7TZoAqDjcw0nnTWDgB7VqiGpkCHXhiFcpxTKBXvMeaFFFDcuqesBMhXUPeH_md4ozou51lsSrTNf6FWKw3ZaOnvXepixepzN9l8az3TL7j7c7bveHSGf5_lvaf7ha7b_aCvwIUxGmj7B3ApMZTNKKntjQcmhDK8XTknVc8Y4rdmmfX5mHCejmaTmwokc2tAKT5rGOg5vtG8CyCA9ZGGx6xA_KkJ-UMUtPeHhiE2weRsEGNAg2T6Ng8zQKNoEuRWXK1wrINqBRuAGO0o1wMOkAR_kmvlIJ4aV24fBSxomvF7R1vl8IpJxKDWP0COZp-AwGOHoI8zh8CvM4TCtfrzQGxpf61SitPA3TyuMwrQBHI8vjMK2llj0xXhI4PvEtW8BLaZWlqjFJq-SbRoLTm-TPMcA4QKO0IhykFeAorQCHh2a-ZKUPjC-1rElaAY3SCnCUVoSjkeVxlFbJH2HlGOB8yxbwclr5UyzaOt80agDetUpNY5JWQKO0IhykFeAorQBHaVV8ySoJjC-1rNFbLk_D11weh--5AEcvujyO0qr4o6xC1vEtW8BLaVX8Wba49en7X78CAAD__-LGBZQ=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF9v4kYUxd_7Kaz7lEiDYGYMIZYqZbVL1Ug0SQMPK6148MI0QWKxaxspbJTvXmGaEGx8j8d_so_8-TFnju85HvNM8b8r8mgyGo8-T51NtHL-uL_9y_k2-no3_nR945x9uZ5MJ3-Pz53_v_K0_8LZ2etr4Wz3bz1tf547o6-fR3dT5_Sn5zMStA4W5sb_YWLyvpEkQYoEaRLkkqA-zQSFUTA3cRxEu688p8D14om8nqDlOtwku7dnguZBZMh7pmSZrAx5NPW_r8y98Rcm6vZI0MIk_nKVLhNGyx9-tL162v4kQZPQX8ee0-nuVr7dJJ5zJcWVotmLoGCTHFaIE__BkCdfRHkVX5ZxslzPk27_WMKpJQ7U963z6MePp5GDEmWj5L0fslFDdCVDZBuOuIVSDj-1WQfRwkRmcfRj6a8UilU9LPagot-WihKWHVQMaqgQlYT-6cePE5Pchl2d8Wu6DY332gafxmMStDL_JGfpDs5_j5YPj68vDjNXuLOLZv29CTpB2NX9rAcn1x4erS0tMlcicl3V6eoqLQR0vE3QoPUWsnGkYUt0JUtkG564hVJqNoCs3kMNqihhWVEP2amo3UPy43pIlZ98VWbwdafrVukCoOPtKl603gUWjsiGLdGVLJFteOIWSqmZQlW9CxpUUcKyoi6wU1G7C9THdYEuP_m6zOC7nfQBwroLgI63qzhsvQssHJENW6IrWSLb8MQtlFIzhbp6FzSoooRlRV1gp6J2F-iP6wK3_OS7ZQa_36nSBEDF2zW8bL0JLPyQjRqiKxki23DELZRSM4Fu9R5oUEUJy4p6wE5F7R5wf83_FCdE3Zs4DNaxKfUvRG-3LbN4MHub4mATzc1dFMzTZfYvb1MufWNh4mT_qdy_uF7vP9oJfA_LLCzfw-4RLO1gqWrRl3VoNahDa83TinVc845rduk-vzIPS6Cbp1WvFn1Rh9Zg0lzWcXCx-xawysIDFgabvuAHZcBPypClL3n4sk6weRgFG9Ag2DyNgs3TKNgSdCkqU75WQLYBjcINcJRuhINJBzjKt-QrVSI81y4cnsu45OsFbZ3vFwlSLnMNY3UL5ml4DwY4ugnzOLwL8zhMK1-vcgiMz_WrVVp5GqaVx2FaAY5GlsdhWnMte2S8kuD4xLdsBs-lVeWqxiatim8aBU5vij_HAOMAjdKKcJBWgKO0AhwemvmSVX1gfK5lbdIKaJRWgKO0IhyNLI-jtCr-CKuGAOdbNoPn08qfYtHW-abRPfCslWsam7QCGqUV4SCtAEdpBThKq-ZLVitgfK5lrZ5yeRo-5vI4fM4FOHrQ5XGUVs0fZTWyjm_ZDJ5Lq-bPstmtz15--y8AAP___oUktw==
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/lookup_join b/pkg/sql/opt/exec/execbuilder/testdata/lookup_join
index 9ab89b6f2ff0..a2dddadb2777 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/lookup_join
+++ b/pkg/sql/opt/exec/execbuilder/testdata/lookup_join
@@ -169,7 +169,7 @@ render            ·                      ·                            (a, b, c
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM (SELECT * FROM data WHERE c = 1) AS l NATURAL JOIN data AS r]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzElEFr2zAUx-_7FOKdZWxJTpoKBj4NMkY6ut6GD1r06LylkpFk2Cj57sPxoE5IZEFMerSsP_8fvyfeKxircaNe0IP8DgwocKAggEIJFBZQU2id3aL31vVXhsBa_wFZUGhM24X-uKawtQ5BvkJowg5BwpP6scNHVBpdXgAFjUE1u0NN65oX5f5WWgUFFL61ynhJspwRZTRhxIaf6IDCp2YX0ElSCfKRMCnlevO0gnpPwXbhrdkH9Ywg2Z6m0322jfkPt4jCfbH2d9eSX7YxxBpJKkYrTitBq17QQxeOjy7B8Ytwb0ydsU6jQ30EVO_P4G9sZtucFSc3z3eLo26WPjaWMracZTmfcXATfKPBLW8_OJ4ujyfJ41kuZpQ3wTeSd3d7eSJdnkiSJ7K8nFHeBN9I3ur28sp0eWWSvDLLFzPKm-Abybt_3317Bu4RfWuNx6RtWvT7GPUzDsvb285t8auz20PN8PlwyB0ONPow_GXDx9oMv3rAcZhFw_wozE7DPN48US2i6TIeLq_hXkTDy3jz8prmu2h4FW9eXdN8H59VMfFM4o_stLvef_gXAAD__0eIKhg=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzElNFq2zAUhu_3FIdz1Q4ZR7bTpoKBw5Yyl8zp4owNii-8-NB5cy1PlmEj5N2H40KTkMqGhOxSyvn5v3zHaIXV7xwFRpPp5P0CapXD7Xz2CR4m3-6n4yCEiw9BtIg-Ty_heeRtO3Cxe0wTncDXj5P5BJbwDvgljCPIIRwvvszHU7ibBWE7M45AxciwkCmFyRNVKB6QI0MHGbrI0EOGQ4wZlkouqaqkakZWm0CQ_kExYJgVZa2b65jhUipCsUKd6ZxQ4CL5ntOckpSUPUCGKekkyzc1pcqeEvXXb0CQYVQmRSXAsjkkRQocpP5BChneZrkmJcB3m78ihAjCxQjjNUNZ65fmSiePhIKvWX-6O5kVz3BDI9xUyl91CT9lVoAsBPic-Q7zXeY3gma13r16Dc55Fe6FqS6kSklRugMUrw_gh9KSpc0He5OHu92dbt5_bbzP2mxu2c4JF9fBt7W4q_Mvzukvz-klz7Fs94TyOvi25F2fX57bX57bS55r2d4J5XXwbckbnV-e11-e10ueZ9nDE8rr4NuSd_N_39sDcHOqSllU1Os1HTTvMaWP1D7elazVku6VXG5q2uNsk9tcpFTp9lfeHoKi_akB3A5zY9jZCfP9sGNu7qh2jWnPHPaO4R4aw1fm5qtjmq-N4ZG5eXRM8415V4OOz8T8ke13x-s3_wIAAP__KNhJ9Q==
 
 statement ok
 CREATE TABLE books (title STRING, edition INT, shelf INT, PRIMARY KEY (title, edition))
@@ -265,7 +265,7 @@ NULL       NULL     {5}       5
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT DISTINCT authors.name FROM books AS b1, books2 AS b2, authors WHERE b1.title = b2.title AND authors.book = b1.title AND b1.shelf <> b2.shelf]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyck89q3DAQh-99CnVOCSjsyn9SEAR06KEpZbekvZU9KNZ0V42jMZIMLWHfvcgubGxipZujpPlG3_xsPYEjgxv9iAHkDxDAoYYdh85TgyGQT9tj0a35DXLNwbquj2l7x6EhjyCfINrYIkjY0BV1qxo4GIzatkPZkQP18QSFqPcI8vrInzUW-cbf9X2Ld6gN-tV60h46bx-1_6N0Hw_Jl8O3Trsg2RVw2PZRMiW4KmDJQ7zVQ7zscU_0sGRRLloUixany3tH3qBHM8_39ZIXRvmkw-EzWYd-VUwnafFnvFDF5Y23-0O8UOJykiRXJVfV4iTlOXkmgX9xlpk4k-AXooe-Y7_IOkZOMpWA7Yapir2_YerDyXFRrTpH7aMN0bomrqqpWKZ_Pen_ylu5w9CRC_hfj2WdviCaPY5_RKDeN_jVUzNcMy63AzdsGAxxPL0eF7duPEqCz2GRhcsJLOZwcQZczOEyC1d57SoL13m4zsLrGbw7vvsbAAD__5P3rXQ=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyck19v2jAQwN_3KW73lEhuIX_opEiVggpTmVjoAGmTKh4ScoWswc5sR9qE-O6TEyoa1KRjbznf_c4_X-w9ql85BrgYT8d3SyhlDp_ns6_wOP7xMB1OIrBGk8Vy8W1qw7HExJPobglxqbdCqmse76iGEiGeFQwXkDisDtwqctlLMXy_H8_HYFmJc60znRPcQuLWnzYMoxFYL20Nb7LHQvuYTpxrtaX8CT5WZPVtr5AhFylF8Y4UBo_oIMMBrhgWUqxJKSHN8r4qmqS_MegzzHhRarO8YrgWkjDYY7UVBhiJK1H0BsgwJR1neVV2YChKfYKUjjeEwc2BvWrsdDdexklOc4pTkr1-oz0WMtvF8k94HAAyXBQxVwFcIcNZqQMIHRa62Obh_K-H87ZH9QNbLLxWC7fV4rR5yYVMSVJ6Pt_3S944yn2stl9Exkn23OZJcnrSVujatzLbbLUVOnZjkiz0WOi3nsS7ZJ5G4DhOr2OcRnAqxHNZwE-RcRA8gNAAswhC39zp8NPJsVXNv0RtlCmd8bXu-U2xjv6DRv933sqcVCG4on96LH3zByndUH0jlCjlmh6kWFfb1OGs4qqFlJSuszd1MOF1ygi-hp1O2GvAzjnsXgC757DXCfvd2n4nPOiGB51w_wxeHT78DQAA__8FW-lK
 
 query TTTTT colnames
 EXPLAIN (VERBOSE) SELECT a.name FROM authors AS a JOIN books2 AS b2 ON a.book = b2.title ORDER BY a.name
@@ -311,7 +311,7 @@ render          ·            ·               (title, edition, shelf, title, ed
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT * FROM authors INNER JOIN books2 ON books2.edition = 1 WHERE books2.title = authors.book]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkU9LMzEQh-_vpwhzntLN9q1ITrlWpJXam-wh3Qx1bZsJSRaUst9dsivYil31OH-eyUN-J3BsaWmOFEE9gQSEOVQIPnBNMXLI7WFpYV9BFQiN823K7Qqh5kCgTpCadCBQsOQJ-2kJCJaSaQ79WofAbfqEYjI7AjXr8OywHD-8MdsDrclYCtPi4jz40BxNeNOmTc_ZF-HRGxeVmADCmpyloIRUSi2Wm1sUWqLQJVyzkn-xuuPGfUjJ76W2zPuY_-Oeed968cKNE-yU0DPUmVm1SQldYq7_o56jvrnqVl64_RDFmqJnF-lXWRRdhUB2R0PckdtQ00Pgun9mKFc91zcsxTRMZ0OxcMMoC57DchQux-FyFC6-wFX37z0AAP__kSzobw==
+https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkdFr1EAQxt_9K4Z5Upm2l5wVWShENGLKmdTcgULJw_Z2qGvTnbi7AeW4_12S3GEr3qlvmW--35cvmQ2Gby0qXOaL_M0Ket_Cu7r6ANf556vF66KEp2-L5Wr5cfEMdpbnk0H38Yv4AEVZ5jVcVkUJNyJ3IYVq_3TKxkYrDi4ggU_v8zrfL6KNLcPFPuR0kBskdGK41PccUF1jgoTn2BB2XtYcgvhB3oymwnxHNSO0ruvjIDeEa_GMaoNjOCos5US6sxQJDUdt29G2JZQ-_oJC1LeMar6lB8HJ8eCVvmm5Zm3Yn80exWPn7b32P7LdhyHhstMuKDhBwpqdYa8gUUoV5eoVQZYQZCkeapX8T6tLsW5XKvlzqennI-FC5K7v4KtYB-IUZHPKBqbqo4IspWF-Qdk5ZS8PdksfdfvLKWoOnbjA_3SL2bYhZHPL07mD9H7NV17W42umsRq5UTAc4rSdT0PhptVQ8CGcHIXT43B6FJ79BjfbJz8DAAD__0gqE20=
 
 ####################################
 #  LOOKUP JOIN ON SECONDARY INDEX  #
@@ -432,7 +432,7 @@ render            ·            ·              (a, b)     +a
 query T
 SELECT url FROM [EXPLAIN (DISTSQL) SELECT t1.a, t2.b FROM small t1 LEFT JOIN large t2 ON t1.a = t2.a AND t2.b % 6 = 0 ORDER BY t1.a]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlcGK2zwUhff_U4gLP7RUxpbtZDKCgjdTyDDYJXVXxQs1vqRuHctIMnQY8u4l9tDYQyMLvMkuknI4535HWC_QyBJTcUQN_BswoBAChQgoxEBhBQWFVsk9ai3V-S-DYFv-Bh5QqJq2M-ftgsJeKgT-AqYyNQKHXHyvcYeiROUHQKFEI6q6t2lVdRTqOdFHUddA4UsrGs2J5zMimpIwIs0PVEAh6wwnCYPiREF25mKmjTggcHai7oEeZdW85llN8-TPLXLy9PApJ9nX_GFHHrNtCvRvzlqoAwKFJyl_dS35KauGyKZPRiFLybskIv-TNed8m-ab9-QjCV5_X2agSXR1jPDqGJf0UpWosJwGT9gHKE7_mDWVnmx9NuV-zT6a2DP3WplTrT7z_HBRsTORRsWub7nY0J1s6EY29PxoEdmZSCOyd7dMNnInG7mRjTw_XkR2JtKI7OaWycbuZGM3srHnrxaRnYk0Int_y2RnXqsd6lY2Gp2-4MH5DcDygMOboWWn9vhZyX1vMyyzXtdvlKjNcMqGxbYZjs4Bx2JmFYcTMXsrDu3OM9aRVR3bxfGS3CureG13Xi9xvrOKN3bnzRLne3tXwcw1sV-yt97F6b8_AQAA___pW1AI
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlV9r2zAUxd_3KS4XBglT6sh20lRQSLem4JLZnePBRvGDGovOm2t5sgwrJd99WC5rUlbb4Je8RX9Ozrm_K3yfsPydIcPNar36FEGlMrgKg89wu_p2s77wfBhdepto82U9hucrmp5wAto-uWtulg88y-BiA5rCenUVwXXg-ZBxdS_Mrg2BD6NaBee1jI_hwr-E0cj8xXuYj-EcpmMIwstVCB-_G4MYCeYyET5_ECWyW6RI0EaCDhJ0keAMY4KFkltRllLVV56MwEv-IJsSTPOi0vV2THArlUD2hDrVmUCGEb_LRCh4IpQ1RYKJ0DzNjE2h0geuHpemKCS4KXheMphYFHieAAWpfwiFBINKM1hSjHcEZaVfzErN7wUyuiP9A13LNH_OMzvMEz0WgjVYg6_RKjRwkfzLaTAjwbWUv6oCfso0B5mbZARr7kunRswY8_xoYUg__36pgSydN8uw3yzjJb1UiVAiOQy-pB8w3v2nVl9OZGHRQ-5v2TsH9rR_W2mvtlp0YtmDGtsRaa-x82NurN2frN2PrD2xnEFkOyLtkT09ZrJOf7JOP7LOxHIHke2ItEd2ccxk3f5k3X5k3Yk1G0S2I9Ie2bNjJtsxrUJRFjIvRa8v-LSeASK5F83MKGWltuJGya2xaZaB0ZmNRJS6OaXNwsubozrgvpi2iu0DMX0tttudO6ydVrXbLnaH5J61iuftzvMhzqet4kW782KI81l7r6Ydz6T9kb32jnfv_gYAAP__giJ4OQ==
 
 # Left join against covering secondary index
 query TTTTT
@@ -780,14 +780,14 @@ SELECT url FROM [ EXPLAIN (DISTSQL)
   SELECT a,b from small WHERE EXISTS (SELECT a FROM data WHERE small.a=data.a) ORDER BY a
 ]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll9v2jAUxd_3KdB92lSjxE7Cn0iTeNhLJ62dur1NPLjEg0g0RraRVlV89wkyKSKBe-0F6Fsp-XGPfc65yhtUulAP8kVZyH8BBwYCGCTAIAUGGcwZbIxeKGu12T9SA_fFH8hjBmW12br9v-cMFtooyN_AlW6tIIef8nmtnpQslIliYFAoJ8v1YczGlC_SvM7si1yvgcGPjaxsPhhGfCCrYsAH2q2UAQaPW5cPZpzNBMx3DPTW_ZvXjHl-HaykXR0PmHGY7-YMrJNLBTnfsf_TnZ3WXUgnu7JFLds2uluiG0EiRNCX0rqyWriIx51TMng0hTKqQMclZ8c1U3T9O-0Jd_VFnteUBWkK8y3tp5s1T22rU8-dPNo3ZZbqqy4rZSI-Ov7dtfrtPs743afPplyu6j-xmDZHyS5uwYMe6k0keOtEp8ePjsZz_wZwr-ZGfBiJW3Q3QPnIp7uIcM_yEoqaovCLlJe_QwnG1ymB8PdS-KVQDKPkFikMUD72SuF54Z4pJBQ1KRQXSaF4hxROrpPCxN_LxC-FyTBKb5HCAOUTrxSeF-6ZQkJRk8LkIilM3iGF0-ukMPX3MvVLYTqMslukMED51CuFe-HBySNUNMlLL5K89PbJE_H1X0VPSHhSdqMrq7zeMuP9IVSxVPW9WL01C_Xd6MVhTP3x8cAdXmQKZV39bVp_uK_qr_YC_eFpH5gnvehxH1pwnOZtOj6ij-C4DQsUJk6dBLglwuBpH7jlVig97kO33OrQKXrhGX7hGW414fWoT7lwmCgXDlPlImiiXDhNlWuM3vgEv_BJn3JN-wSF91qkBE2YTdCU2xRO2E3g5DLFtyknKsZ77VPeWS1BnndWS5DnOE15jtOk5wROeY7jpOf4WuUjwvPOhgnyHN8wlOedFRPkOU5TnuM06TmBU57jOOk5vl5FTLw2dbZMiOcCXzJtz-e7D38DAAD__xe8Uow=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll9v6kYQxd_7KVbzlChL7F2bf5Yi0TZUpUpCCpGaKuJhg7dgybGpbaQbRXz3K-xcWdiws3sN5I0_8_Oc3XNm5A9I_w_Bg-nwbvj7E1knIfljMr4nL8Pnx7tfRw_k4nY0fZr-fXdJPksEJa9FTfomwpD88-dwMiTD520ZufhRVFT4IhOfBXnxtSA3-Y_X4pKMJ7fDCfntXyJmQCGKffkg3mQK3gswoMCBggMUXKDQhhmFVRLPZZrGybbkIwdG_jfwbApBtFpn259nFOZxIsH7gCzIQgkePInXUE6k8GVi2UDBl5kIwrzNKgneRPI-yLUBhelKRKlHWhYjIvIJI3G2lAlQGK8zjwwYHXCYbSjE6-yzX9nm9Z0sRbrcbTBgMNvMKKSZWEjw2Ib-nO72ft3bm6zL5oXstNRdEV0K4iaCboM0C6J5ZjG7dkoK48SXifSV7ZyD7coucfGcaoer4iIPa2obaTLzzW2mm5ZV62hf3d6j3ctkIf-Kg0gmFuvsPjeU_2UXA3Z1eZMEi2XxURXT8ijto1vwELfilcVZ5UT723d22jP9CWBak2uxlsXPMbsGyjs6s6sQrjm8iKJyUNhRhpd9wRB0TzMEXN9LrpdC3rKcc6TQQHlXK4WHhWumEFFUppAfJYX8C1LYO00KHX0vHb0UOi3LPUcKDZT3tFJ4WLhmChFFZQqdo6TQ-YIU9k-TQlffS1cvhW7Lap8jhQbK-1op3Ao3Th6iokyee5TkuedPHrdP_yq6R8JEpqs4SqXWW6a9PYT0F7K4lzReJ3P5mMTzvE3xdZxz-YuML9Os-Nctvoyi4q-tQH243wRmTiO624TmTE2zKm3v0DuwXYW5EkZO7Ri4xc3gfhO44pYp3W1CV9yq0a7ywtvqC2-rrUa87jQZLjWMDJcaxoYLoZHhUtPYcHWVN95TX3ivyXD1mwSFNVqkCI2YjdCY2xiO2I3g6DJVb1OGjBhrtE9ZbbUYeV5bLUaeq2nMczWNeo7gmOdqHPVcvVZZB_G8tmGMPFdvGMzz2oox8lxNY56radRzBMc8V-Oo5-r1ym3ktam2ZUw85-olU_V8tvnlewAAAP__ZIJ4pw==
 
 query T
 SELECT url FROM [ EXPLAIN (DISTSQL)
   SELECT a,b from small WHERE a+b<20 AND EXISTS (SELECT a FROM data WHERE small.a=data.a AND small.b+data.c>15) ORDER BY a
 ]
 ----
-https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlVFr2z4Uxd__n0Lcp_6pjC3ZTlM9-aWFlC4Zbd62PGjRpfPmWEaSYaXkuw_HZbXLKmsEQh4t-XDO_R3BfYFaK1zKHVoQX4ABBQ4UUqCQAYUcNhQao7dorTbdL71goX6BSCiUddO67nhDYasNgngBV7oKQcBafqvwAaVCEydAQaGTZXWwaUy5k-a5sDtZVUDhsZG1FSSKGZG1Ioxo9x0NULgtK4dGkIuCkUtS8P_J1zZJ0i3hiRBisVzPgcKqdYIUjBYcNnsKunVvoayTTwiC7Wl48Dtd1q-583Hu9XODgtzf3K7J482nBblbLZZA_4yjpJNA4V7rn21DfuiyJrruonUhl-Si4N0Q-esQSFj-T0PwD4d4y66NQoNqHLtgl7DZ_2XSpY50E7NxOx_ZpyN7Fl4-Cyo_ZlHMT1L_RPRB_bPzrZ-H8-dh_HkUpyfhPxF9wP_qfPmn4fzTMP5pFGcn4T8RfcB_fr78s3D-WRj_LIrzk_CfiD7gf32-_Cd26APaRtcWgzZL0u0mVE_Y7zKrW7PFz0ZvDzb95-qgOxwotK6_Zf3Hou6vuoBDMfOK-UjM3ou533nCOvWqM784OyZ37hXP_M6zY5yvvOK533l-jPO1v6tk4pn4H9l7783-v98BAAD__0_IfTU=
+https://cockroachdb.github.io/distsqlplan/decode.html#eJzMleFrm0AYxr_vr3h5PxlyqZ6aNj0Y2K2WWVLTJYF1dPlw0aNzs547FVZK_vehpqspqzoKIR99vcfneX-PcI-Y_YqR4cKduh-XUKgYLuazK7h1b66nZ54P2rm3WC4-TwewPcIJrOsz2T2PY_jyyZ27oGkchrAewLfCMKwATGMAZ_45uDelHLQnca0Mec6fhNVXjji8r6ZHvNZp2_kahvU82H5aAB0PBjCbn7tz-PAV-AoJJjIUPr8XGbJbpEjQRIIWErSR4BhXBFMlA5FlUpVHHiuBF_5GZhCMkrTIy_GKYCCVQPaIeZTHAhku-ToWc8FDoXQDCYYi51Fc2aQquufqwalyIsFFypOMwUinwJMQKMj8u1BI8CKKc6EYaA6FIThmgxFjzPOXEyQ4K3IGDiWOiasNQVnkz6GynN8JZHRD-ge_lFGyzT3ezb18SAWDqXuxhIV75cHlzPOR_F2nhI0Ep1L-LFL4IaMEZFJGK0P6oDlmucS40cZ_LWG-usRzdqlCoUS4G9uhQ1xt_rGpL0cy1eluO6_ZWzv2tH_5tFf5Oh3p5l7q74jeqP_4cOs3-_M3-_E3R7q1F_4d0Rv8Tw6Xv9Wfv9WPvzXS7b3w74je4D85XP52f_52P_72SB_vhX9H9Ab_08Pl33GHzkWWyiQTvW4Wo7ybRHgn6rssk4UKxLWSQWVTP84qXTUIRZbXb2n94CX1qzJgU0xbxeaOmL4Um-3OHdZWq9puF9tvyT1uFR-3Ox-_xfmkVTxpd568xfm0vSuj4zdp_8leeq827_4EAAD__5SUslA=
 
 # Regression test for #35950: Make sure that lookup joins use a batch limit.