Fix multishard routing for Auxular expression in routing by expression (#1483)

Author: reshke

router/qrouter/proxy_routing.go

@@ -93,6 +93,7 @@ func (qr *ProxyQrouter) computeRoutingExpr(
 			ret = append(ret, b)
 			return nil
 		}
+
 		if len(rm.ParamRefs[*qualName][rExpr.ColRefs[i].ColName]) == 0 && len(rm.Exprs[*qualName][rExpr.ColRefs[i].ColName]) == 0 {
 			return nil
 		}
@@ -185,10 +186,10 @@ func (qr *ProxyQrouter) routingTuples(ctx context.Context, rm *rmeta.RoutingMeta
 						ExecTarget:         currroute,
 						TargetSessionAttrs: tsa,
 					})
-					return nil
-				}
-				if err := rec(lvl + 1); err != nil {
-					return err
+				} else {
+					if err := rec(lvl + 1); err != nil {
+						return err
+					}
 				}
 			}
 

router/qrouter/proxy_routing_test.go

@@ -368,6 +368,23 @@ func TestRoutingByExpression(t *testing.T) {
 	assert.NoError(err)
 
 	for _, tt := range []tcase{
+		{
+			query: `
+			WITH vals(x,y) AS (VALUES(5, 'jidw'), (100, 'jidw'))
+			SELECT * FROM distrr_mm_test d JOIN vals v ON d.id1 = v.x AND d.id2 = v.y;`,
+			exp: &plan.ScatterPlan{
+				ExecTargets: []kr.ShardKey{
+					{
+						Name: "sh2",
+					},
+					{
+						Name: "sh1",
+					},
+				},
+			},
+			err: nil,
+		},
+
 		{
 			query: "INSERT INTO distrr_mm_test (id1, id2) VALUES(100, 'jidw');",
 			exp: &plan.ShardDispatchPlan{

test/regress/tests/router/expected/expression_routing.out

@@ -144,7 +144,7 @@ NOTICE: send query to shard(s) : sh4
 WITH vals (x, y, z) AS (VALUES(1, 'ziziziz', 32), (2, 'ziiziziziz', 32)) 
     SELECT * FROM 
         tr JOIN vals ON tr.id1 = vals.x AND tr.id2 = vals.y;
-NOTICE: send query to shard(s) : sh3
+NOTICE: send query to shard(s) : sh3,sh4
  id1 |    id2     |  val   | x |     y      | z  
 -----+------------+--------+---+------------+----
    1 | ziziziz    | abab   | 1 | ziziziz    | 32
@@ -154,9 +154,34 @@ NOTICE: send query to shard(s) : sh3
 (4 rows)
 
 -- TODO: fix
---WITH vals (x, y, z) AS (VALUES (4, 'yyuyuyuyu', 32), (1, 'ziziziz', 32)) 
---    SELECT * FROM 
---        tr JOIN vals ON tr.id1 = vals.x AND tr.id2 = vals.y /* __spqr__engine_v2: true */;
+WITH vals (x, y, z) AS (VALUES (4, 'yyuyuyuyu', 32), (1, 'ziziziz', 32)) 
+    SELECT * FROM 
+        tr JOIN vals ON tr.id1 = vals.x AND tr.id2 = vals.y /* __spqr__engine_v2: true */;
+NOTICE: send query to shard(s) : sh1,sh3,sh4
+ id1 |    id2    |  val   | x |     y     | z  
+-----+-----------+--------+---+-----------+----
+   4 | yyuyuyuyu | ababba | 4 | yyuyuyuyu | 32
+   4 | yyuyuyuyu | saassa | 4 | yyuyuyuyu | 32
+   1 | ziziziz   | abab   | 1 | ziziziz   | 32
+   1 | ziziziz   | assaas | 1 | ziziziz   | 32
+(4 rows)
+
+WITH vals (x, y, z) AS (VALUES (4, 'yyuyuyuyu', 32), (1, 'ziziziz', 32), (0, 'aba', 3), (1, 'ziziziz', 3)) 
+    SELECT * FROM 
+        tr JOIN vals ON tr.id1 = vals.x AND tr.id2 = vals.y /* __spqr__engine_v2: true */;
+NOTICE: send query to shard(s) : sh1,sh2,sh3,sh4
+ id1 |    id2    |    val    | x |     y     | z  
+-----+-----------+-----------+---+-----------+----
+   4 | yyuyuyuyu | ababba    | 4 | yyuyuyuyu | 32
+   4 | yyuyuyuyu | saassa    | 4 | yyuyuyuyu | 32
+   0 | aba       | ababababb | 0 | aba       |  3
+   0 | aba       | asas      | 0 | aba       |  3
+   1 | ziziziz   | abab      | 1 | ziziziz   |  3
+   1 | ziziziz   | abab      | 1 | ziziziz   | 32
+   1 | ziziziz   | assaas    | 1 | ziziziz   |  3
+   1 | ziziziz   | assaas    | 1 | ziziziz   | 32
+(8 rows)
+
 UPDATE tr SET val = 1123 WHERE id1 = 1 AND id2 = 'ziziziz';
 NOTICE: send query to shard(s) : sh3
 DELETE FROM tr WHERE id1 = 1 AND id2 = 'ziziziz' RETURNING *;

test/regress/tests/router/sql/expression_routing.sql

@@ -47,9 +47,15 @@ WITH vals (x, y, z) AS (VALUES(1, 'ziziziz', 32), (2, 'ziiziziziz', 32))
 
 
 -- TODO: fix
---WITH vals (x, y, z) AS (VALUES (4, 'yyuyuyuyu', 32), (1, 'ziziziz', 32)) 
---    SELECT * FROM 
---        tr JOIN vals ON tr.id1 = vals.x AND tr.id2 = vals.y /* __spqr__engine_v2: true */;
+WITH vals (x, y, z) AS (VALUES (4, 'yyuyuyuyu', 32), (1, 'ziziziz', 32)) 
+    SELECT * FROM 
+        tr JOIN vals ON tr.id1 = vals.x AND tr.id2 = vals.y /* __spqr__engine_v2: true */;
+
+
+WITH vals (x, y, z) AS (VALUES (4, 'yyuyuyuyu', 32), (1, 'ziziziz', 32), (0, 'aba', 3), (1, 'ziziziz', 3)) 
+    SELECT * FROM 
+        tr JOIN vals ON tr.id1 = vals.x AND tr.id2 = vals.y /* __spqr__engine_v2: true */;
+
 
 UPDATE tr SET val = 1123 WHERE id1 = 1 AND id2 = 'ziziziz';