From d4fb7f6be89c596cd80ea59fb7d8a6517ca95502 Mon Sep 17 00:00:00 2001
From: "vitess-bot[bot]" <108069721+vitess-bot[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 07:39:01 +0530
Subject: [PATCH] [release-16.0] fix: cost to include subshard opcode (#14023)
 (#14026)

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: Harshit Gangal <harshit@planetscale.com>
---
 .../planbuilder/testdata/from_cases.json      | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/go/vt/vtgate/planbuilder/testdata/from_cases.json b/go/vt/vtgate/planbuilder/testdata/from_cases.json
index 5687c950bdc..cfc673ad3af 100644
--- a/go/vt/vtgate/planbuilder/testdata/from_cases.json
+++ b/go/vt/vtgate/planbuilder/testdata/from_cases.json
@@ -6499,5 +6499,90 @@
         "zlookup_unique.t1"
       ]
     }
+  },
+  {
+    "comment": "join query using table with muticolumn vindex",
+    "query": "select 1 from multicol_tbl m1 join multicol_tbl m2 on m1.cola = m2.cola",
+    "v3-plan": {
+      "QueryType": "SELECT",
+      "Original": "select 1 from multicol_tbl m1 join multicol_tbl m2 on m1.cola = m2.cola",
+      "Instructions": {
+        "OperatorType": "Join",
+        "Variant": "Join",
+        "JoinColumnIndexes": "L:0",
+        "JoinVars": {
+          "m1_cola": 1
+        },
+        "TableName": "multicol_tbl_multicol_tbl",
+        "Inputs": [
+          {
+            "OperatorType": "Route",
+            "Variant": "Scatter",
+            "Keyspace": {
+              "Name": "user",
+              "Sharded": true
+            },
+            "FieldQuery": "select 1, m1.cola from multicol_tbl as m1 where 1 != 1",
+            "Query": "select 1, m1.cola from multicol_tbl as m1",
+            "Table": "multicol_tbl"
+          },
+          {
+            "OperatorType": "Route",
+            "Variant": "Scatter",
+            "Keyspace": {
+              "Name": "user",
+              "Sharded": true
+            },
+            "FieldQuery": "select 1 from multicol_tbl as m2 where 1 != 1",
+            "Query": "select 1 from multicol_tbl as m2 where m2.cola = :m1_cola",
+            "Table": "multicol_tbl"
+          }
+        ]
+      }
+    },
+    "gen4-plan": {
+      "QueryType": "SELECT",
+      "Original": "select 1 from multicol_tbl m1 join multicol_tbl m2 on m1.cola = m2.cola",
+      "Instructions": {
+        "OperatorType": "Join",
+        "Variant": "Join",
+        "JoinColumnIndexes": "L:1",
+        "JoinVars": {
+          "m1_cola": 0
+        },
+        "TableName": "multicol_tbl_multicol_tbl",
+        "Inputs": [
+          {
+            "OperatorType": "Route",
+            "Variant": "Scatter",
+            "Keyspace": {
+              "Name": "user",
+              "Sharded": true
+            },
+            "FieldQuery": "select m1.cola, 1 from multicol_tbl as m1 where 1 != 1",
+            "Query": "select m1.cola, 1 from multicol_tbl as m1",
+            "Table": "multicol_tbl"
+          },
+          {
+            "OperatorType": "Route",
+            "Variant": "SubShard",
+            "Keyspace": {
+              "Name": "user",
+              "Sharded": true
+            },
+            "FieldQuery": "select 1 from multicol_tbl as m2 where 1 != 1",
+            "Query": "select 1 from multicol_tbl as m2 where m2.cola = :m1_cola",
+            "Table": "multicol_tbl",
+            "Values": [
+              ":m1_cola"
+            ],
+            "Vindex": "multicolIdx"
+          }
+        ]
+      },
+      "TablesUsed": [
+        "user.multicol_tbl"
+      ]
+    }
   }
 ]