Merge pull request #55 from postgrespro/PGPRO-10932

Correcting confusion in variables.
postgrespro · Sep 5, 2024 · 90399a9 · 90399a9
2 parents b54b0dd + ec52e0a
commit 90399a9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 24 deletions.
diff --git a/patches/runtime_explain_11.0.patch b/patches/runtime_explain_11.0.patch
@@ -209,10 +209,9 @@ index 16a80a0ea1..b12906b005 100644
 
  			/* count the number of source rows */
 -			total = mtstate->mt_plans[0]->instrument->ntuples;
--			other_path = mtstate->ps.instrument->ntuples2;
+ 			other_path = mtstate->ps.instrument->ntuples2;
 -			insert_path = total - other_path;
-+			other_path = mtstate->ps.instrument->nfiltered2;
-+
+
 +			/*
 +			 * Insert occurs after extracting row from subplan and in runtime mode
 +			 * we can appear between these two operations - situation when
@@ -227,7 +226,7 @@ index 16a80a0ea1..b12906b005 100644
 +				insert_path = total - other_path;
 +				ExplainPropertyFloat("Tuples Inserted", NULL, insert_path, 0, es);
 +			}
- 
++
 -			ExplainPropertyFloat("Tuples Inserted", NULL,
 -								 insert_path, 0, es);
  			ExplainPropertyFloat("Conflicting Tuples", NULL,

diff --git a/patches/runtime_explain_12.0.patch b/patches/runtime_explain_12.0.patch
@@ -222,10 +222,9 @@ index 92969636b75..fab4267a2c1 100644
 
  			/* count the number of source rows */
 -			total = mtstate->mt_plans[0]->instrument->ntuples;
--			other_path = mtstate->ps.instrument->ntuples2;
+ 			other_path = mtstate->ps.instrument->ntuples2;
 -			insert_path = total - other_path;
-+			other_path = mtstate->ps.instrument->nfiltered2;
-+
+
 +			/*
 +			 * Insert occurs after extracting row from subplan and in runtime mode
 +			 * we can appear between these two operations - situation when
@@ -240,7 +239,7 @@ index 92969636b75..fab4267a2c1 100644
 +				insert_path = total - other_path;
 +				ExplainPropertyFloat("Tuples Inserted", NULL, insert_path, 0, es);
 +			}
- 
++
 -			ExplainPropertyFloat("Tuples Inserted", NULL,
 -								 insert_path, 0, es);
  			ExplainPropertyFloat("Conflicting Tuples", NULL,

diff --git a/patches/runtime_explain_13.0.patch b/patches/runtime_explain_13.0.patch
@@ -219,10 +219,9 @@ index 20708db9f12..866948bd0c1 100644
 
 			/* count the number of source rows */
 -			total = mtstate->mt_plans[0]->instrument->ntuples;
--			other_path = mtstate->ps.instrument->ntuples2;
+ 			other_path = mtstate->ps.instrument->ntuples2;
 -			insert_path = total - other_path;
-+			other_path = mtstate->ps.instrument->nfiltered2;
-+
+
 +			/*
 +			 * Insert occurs after extracting row from subplan and in runtime mode
 +			 * we can appear between these two operations - situation when
@@ -237,7 +236,7 @@ index 20708db9f12..866948bd0c1 100644
 +				insert_path = total - other_path;
 +				ExplainPropertyFloat("Tuples Inserted", NULL, insert_path, 0, es);
 +			}
-
++
 -			ExplainPropertyFloat("Tuples Inserted", NULL,
 -								 insert_path, 0, es);
 			ExplainPropertyFloat("Conflicting Tuples", NULL,

diff --git a/patches/runtime_explain_14.0.patch b/patches/runtime_explain_14.0.patch
@@ -219,10 +219,9 @@ index 10644dfac4..7106ed4257 100644
 
  			/* count the number of source rows */
 -			total = outerPlanState(mtstate)->instrument->ntuples;
--			other_path = mtstate->ps.instrument->ntuples2;
+ 			other_path = mtstate->ps.instrument->ntuples2;
 -			insert_path = total - other_path;
-+			other_path = mtstate->ps.instrument->nfiltered2;
-+
+
 +			/*
 +			 * Insert occurs after extracting row from subplan and in runtime mode
 +			 * we can appear between these two operations - situation when
@@ -237,7 +236,7 @@ index 10644dfac4..7106ed4257 100644
 +				insert_path = total - other_path;
 +				ExplainPropertyFloat("Tuples Inserted", NULL, insert_path, 0, es);
 +			}
- 
++
 -			ExplainPropertyFloat("Tuples Inserted", NULL,
 -								 insert_path, 0, es);
  			ExplainPropertyFloat("Conflicting Tuples", NULL,

diff --git a/patches/runtime_explain_15.0.patch b/patches/runtime_explain_15.0.patch
@@ -219,10 +219,9 @@ index 10644dfac4..7106ed4257 100644
 
  			/* count the number of source rows */
 -			total = outerPlanState(mtstate)->instrument->ntuples;
--			other_path = mtstate->ps.instrument->ntuples2;
+ 			other_path = mtstate->ps.instrument->ntuples2;
 -			insert_path = total - other_path;
-+			other_path = mtstate->ps.instrument->nfiltered2;
-+
+
 +			/*
 +			 * Insert occurs after extracting row from subplan and in runtime mode
 +			 * we can appear between these two operations - situation when
@@ -237,7 +236,7 @@ index 10644dfac4..7106ed4257 100644
 +				insert_path = total - other_path;
 +				ExplainPropertyFloat("Tuples Inserted", NULL, insert_path, 0, es);
 +			}
- 
++
 -			ExplainPropertyFloat("Tuples Inserted", NULL,
 -								 insert_path, 0, es);
  			ExplainPropertyFloat("Conflicting Tuples", NULL,

diff --git a/patches/runtime_explain_16.0.patch b/patches/runtime_explain_16.0.patch
@@ -219,10 +219,9 @@ index 6c2e5c8a4f..74be3944d1 100644
 
  			/* count the number of source rows */
 -			total = outerPlanState(mtstate)->instrument->ntuples;
--			other_path = mtstate->ps.instrument->ntuples2;
+ 			other_path = mtstate->ps.instrument->ntuples2;
 -			insert_path = total - other_path;
-+			other_path = mtstate->ps.instrument->nfiltered2;
-+
+
 +			/*
 +			 * Insert occurs after extracting row from subplan and in runtime mode
 +			 * we can appear between these two operations - situation when
@@ -237,7 +236,7 @@ index 6c2e5c8a4f..74be3944d1 100644
 +				insert_path = total - other_path;
 +				ExplainPropertyFloat("Tuples Inserted", NULL, insert_path, 0, es);
 +			}
- 
++
 -			ExplainPropertyFloat("Tuples Inserted", NULL,
 -								 insert_path, 0, es);
  			ExplainPropertyFloat("Conflicting Tuples", NULL,