use var->varoattno instead of varattno

funbringer · funbringer · commit 1f9d1763cfb3 · 2016-06-17T03:03:57.000+03:00
diff --git a/src/nodes_common.c b/src/nodes_common.c
@@ -149,7 +149,7 @@ append_part_attr_to_tlist(List *tlist, Index relno, PartRelationInfo *prel)
 		TargetEntry *te = (TargetEntry *) lfirst(lc);
 		Var			*var = (Var *) te->expr;
 
-		if (IsA(var, Var) && var->varattno == prel->attnum)
+		if (IsA(var, Var) && var->varoattno == prel->attnum)
 			part_attr_found = true;
 	}
 
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -1117,12 +1117,15 @@ handle_opexpr(const OpExpr *expr, WalkerContext *context)
 /*
  * Checks if expression is a KEY OP PARAM or PARAM OP KEY,
  * where KEY is partition key (it could be Var or RelableType) and PARAM is
- * whatever. Function returns variable (or RelableType) and param via var_ptr 
+ * whatever. Function returns variable (or RelableType) and param via var_ptr
  * and param_ptr pointers. If partition key isn't in expression then function
  * returns false.
  */
 static bool
-pull_var_param(const WalkerContext *ctx, const OpExpr *expr, Node **var_ptr, Node **param_ptr)
+pull_var_param(const WalkerContext *ctx,
+			   const OpExpr *expr,
+			   Node **var_ptr,
+			   Node **param_ptr)
 {
 	Node   *left = linitial(expr->args),
 		   *right = lsecond(expr->args);
@@ -1135,22 +1138,22 @@ pull_var_param(const WalkerContext *ctx, const OpExpr *expr, Node **var_ptr, Nod
 						(Var *) left :
 						(Var *) ((RelabelType *) left)->arg;
 
-		if (v->varattno == ctx->prel->attnum)
+		if (v->varoattno == ctx->prel->attnum)
 		{
 			*var_ptr = left;
 			*param_ptr = right;
 			return true;
 		}
 	}
-	
+
 	/* ... variable is on the right side */
 	if (IsA(right, Var) || IsA(right, RelabelType))
 	{
 		v = !IsA(right, RelabelType) ?
 						(Var *) right :
 						(Var *) ((RelabelType *) right)->arg;
 
-		if (v->varattno == ctx->prel->attnum)
+		if (v->varoattno == ctx->prel->attnum)
 		{
 			*var_ptr = right;
 			*param_ptr = left;
@@ -1245,7 +1248,7 @@ handle_arrexpr(const ScalarArrayOpExpr *expr, WalkerContext *context)
 		var = !IsA(varnode, RelabelType) ?
 			(Var *) varnode :
 			(Var *) ((RelabelType *) varnode)->arg;
-		if (var->varattno != prel->attnum)
+		if (var->varoattno != prel->attnum)
 			goto handle_arrexpr_return;
 	}
 	else

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ append_part_attr_to_tlist(List tlist, Index relno, PartRelationInfo prel)`
`149`	`149`	`TargetEntry te = (TargetEntry ) lfirst(lc);`
`150`	`150`	`Var var = (Var ) te->expr;`
`151`	`151`
`152`		`- if (IsA(var, Var) && var->varattno == prel->attnum)`
	`152`	`+ if (IsA(var, Var) && var->varoattno == prel->attnum)`
`153`	`153`	`part_attr_found = true;`
`154`	`154`	`}`
`155`	`155`