mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-04 00:02:52 -05:00 
			
		
		
		
	Remove un-needed psort close.
This commit is contained in:
		
							parent
							
								
									a292ed243a
								
							
						
					
					
						commit
						4e6eb4aca1
					
				@ -7,7 +7,7 @@
 | 
				
			|||||||
 *
 | 
					 *
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * IDENTIFICATION
 | 
					 * IDENTIFICATION
 | 
				
			||||||
 *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.17 1998/07/19 05:49:13 momjian Exp $
 | 
					 *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.18 1998/07/19 10:05:19 momjian Exp $
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *-------------------------------------------------------------------------
 | 
					 *-------------------------------------------------------------------------
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
@ -354,23 +354,6 @@ ExecMergeTupleDump(ExprContext *econtext, MergeJoinState *mergestate)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void
 | 
					 | 
				
			||||||
CleanUpSort(Plan *plan)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	if (plan == NULL)
 | 
					 | 
				
			||||||
		return;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	if (plan->type == T_Sort)
 | 
					 | 
				
			||||||
	{
 | 
					 | 
				
			||||||
		Sort	   *sort = (Sort *) plan;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
		/* This may need to be fixed or moved somewhere else, bjm */
 | 
					 | 
				
			||||||
		/* psort_end(sort); */
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* ----------------------------------------------------------------
 | 
					/* ----------------------------------------------------------------
 | 
				
			||||||
 *		ExecMergeJoin
 | 
					 *		ExecMergeJoin
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
@ -665,8 +648,6 @@ ExecMergeJoin(MergeJoin *node)
 | 
				
			|||||||
				if (TupIsNull(outerTupleSlot))
 | 
									if (TupIsNull(outerTupleSlot))
 | 
				
			||||||
				{
 | 
									{
 | 
				
			||||||
					MJ_printf("ExecMergeJoin: **** outer tuple is nil ****\n");
 | 
										MJ_printf("ExecMergeJoin: **** outer tuple is nil ****\n");
 | 
				
			||||||
					CleanUpSort(node->join.lefttree->lefttree);
 | 
					 | 
				
			||||||
					CleanUpSort(node->join.righttree->lefttree);
 | 
					 | 
				
			||||||
					return NULL;
 | 
										return NULL;
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user