Extract logic to cover a tuple in visimapDelete

This will be reused in a later commit.

Reviewed-by: Ashwin Agrawal <aashwin@vmware.com>
Reviewed-by: Haolin Wang <whaolin@vmware.com>

Author: soumyadeep2007

src/backend/access/appendonly/appendonly_visimap.c

@@ -79,6 +79,13 @@ static void AppendOnlyVisimap_Find(
 					   AppendOnlyVisimap *visiMap,
 					   AOTupleId *tupleId);
 
+static void AppendOnlyVisimapDelete_Stash(
+						AppendOnlyVisimapDelete *visiMapDelete);
+
+static void AppendOnlyVisimapDelete_Find(
+						AppendOnlyVisimapDelete *visiMapDelete,
+						AOTupleId *aoTupleId);
+
 /*
  * Finishes the visimap operations.
  * No other function should be called with the given
@@ -238,6 +245,30 @@ AppendOnlyVisimap_Store(
 
 }
 
+/*
+ * If the tuple is not in the current visimap range, the current visimap entry
+ * is stashed away and the correct one is loaded or read from the spill file.
+ */
+void
+AppendOnlyVisimapDelete_LoadTuple(AppendOnlyVisimapDelete *visiMapDelete,
+								  AOTupleId *aoTupleId)
+{
+	Assert(visiMapDelete);
+	Assert(visiMapDelete->visiMap);
+	Assert(aoTupleId);
+
+	/* if the tuple is already covered, we are done */
+	if (AppendOnlyVisimapEntry_CoversTuple(&visiMapDelete->visiMap->visimapEntry,
+											aoTupleId))
+		return;
+
+	/* if necessary persist the current entry before moving. */
+	if (AppendOnlyVisimapEntry_HasChanged(&visiMapDelete->visiMap->visimapEntry))
+		AppendOnlyVisimapDelete_Stash(visiMapDelete);
+
+	AppendOnlyVisimapDelete_Find(visiMapDelete, aoTupleId);
+}
+
 /*
  * Deletes all visibility information for the given segment file.
  */
@@ -670,11 +701,8 @@ AppendOnlyVisimapDelete_Stash(
 
 /*
  * Hides a given tuple id.
- * If the tuple is not in the current visimap range, the current
- * visimap entry is stashed away and the correct one is loaded or
- * read from the spill file.
  *
- * Then, the bit of the tuple is set.
+ * Loads the entry for aoTupleId and sets the visibility bit for it.
  *
  * Should only be called when in-order delete of tuples can
  * be guranteed. This means that the tuples are deleted in increasing order.
@@ -685,32 +713,18 @@ AppendOnlyVisimapDelete_Stash(
 TM_Result
 AppendOnlyVisimapDelete_Hide(AppendOnlyVisimapDelete *visiMapDelete, AOTupleId *aoTupleId)
 {
-	AppendOnlyVisimap *visiMap;
-
 	Assert(visiMapDelete);
+	Assert(visiMapDelete->visiMap);
 	Assert(aoTupleId);
 
 	elogif(Debug_appendonly_print_visimap, LOG,
 		   "Append-only visi map delete: Hide tuple "
 		   "(tupleId) = %s",
 		   AOTupleIdToString(aoTupleId));
 
-	visiMap = visiMapDelete->visiMap;
-	Assert(visiMap);
-
-	if (!AppendOnlyVisimapEntry_CoversTuple(&visiMap->visimapEntry,
-											aoTupleId))
-	{
-		/* if necessary persist the current entry before moving. */
-		if (AppendOnlyVisimapEntry_HasChanged(&visiMap->visimapEntry))
-		{
-			AppendOnlyVisimapDelete_Stash(visiMapDelete);
-		}
-
-		AppendOnlyVisimapDelete_Find(visiMapDelete, aoTupleId);
-	}
+	AppendOnlyVisimapDelete_LoadTuple(visiMapDelete, aoTupleId);
 
-	return AppendOnlyVisimapEntry_HideTuple(&visiMap->visimapEntry, aoTupleId);
+	return AppendOnlyVisimapEntry_HideTuple(&visiMapDelete->visiMap->visimapEntry, aoTupleId);
 }
 
 static void

src/include/access/appendonly_visimap.h

@@ -158,6 +158,10 @@ TM_Result AppendOnlyVisimapDelete_Hide(
 void AppendOnlyVisimapDelete_Finish(
 							   AppendOnlyVisimapDelete *visiMapDelete);
 
+void
+AppendOnlyVisimapDelete_LoadTuple(AppendOnlyVisimapDelete *visiMapDelete,
+								  AOTupleId *aoTupleId);
+
 /*
  * AppendOnlyVisimap_UniqueCheck
  *