#ifdef BTREE_BUILD_STATS enables to get executor stats for btree

vadim4o · vadim4o · commit 538f58c04c21 · 1997-04-18T03:37:57.000Z
building.
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.17 1997/03/24 08:48:11 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.18 1997/04/18 03:37:53 vadim Exp $
  *
  * NOTES
  *    This file contains only the public interface routines.
@@ -33,6 +33,12 @@
 # include <string.h>
 #endif
 
+#ifdef BTREE_BUILD_STATS
+#include <tcop/tcopprot.h>
+extern int ShowExecutorStats; 
+#endif
+
+
 bool	BuildingBtree = false;	/* see comment in btbuild() */
 bool	FastBuild = true;	/* use sort/build instead of insertion build */
 
@@ -77,10 +83,6 @@ btbuild(Relation heap,
     bool isunique;
     bool usefast;
 
-#if 0
-    ResetBufferUsage();
-#endif
-
     /* note that this is a new btree */
     BuildingBtree = true;
     
@@ -95,6 +97,11 @@ btbuild(Relation heap,
      */
     usefast = (FastBuild && IsNormalProcessingMode());
 
+#ifdef BTREE_BUILD_STATS
+    if ( ShowExecutorStats )
+    	ResetUsage ();
+#endif
+
     /* see if index is unique */
     isunique = IndexIsUniqueNoCache(RelationGetRelationId(index));
 
@@ -278,18 +285,15 @@ btbuild(Relation heap,
 	_bt_spooldestroy(spool);
     }
 
-#if 0
+#ifdef BTREE_BUILD_STATS
+    if ( ShowExecutorStats )
     {
-	extern int ReadBufferCount, BufferHitCount, BufferFlushCount;
-	extern long NDirectFileRead, NDirectFileWrite;
-
-	printf("buffer(%d): r=%d w=%d\n", heap->rd_rel->relblocksz,
-	       ReadBufferCount - BufferHitCount, BufferFlushCount);
-	printf("direct(%d): r=%d w=%d\n", LocalBlockSize,
-	       NDirectFileRead, NDirectFileWrite);
+    	fprintf(stderr, "! BtreeBuild Stats:\n");
+    	ShowUsage ();
+    	ResetUsage ();
     }
 #endif
-
+    	
     /*
      *  Since we just counted the tuples in the heap, we update its
      *  stats in pg_class to guarantee that the planner takes advantage
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
  *
  *
  * IDENTIFICATION
- *    $Id: nbtsort.c,v 1.14 1997/04/16 01:48:27 vadim Exp $
+ *    $Id: nbtsort.c,v 1.15 1997/04/18 03:37:57 vadim Exp $
  *
  * NOTES
  *
@@ -63,6 +63,11 @@
 # include <string.h>
 #endif
 
+#ifdef BTREE_BUILD_STATS
+#include <tcop/tcopprot.h>
+extern int ShowExecutorStats;
+#endif
+
 /*
  * turn on debugging output.
  *
@@ -427,7 +432,7 @@ _bt_tapewrite(BTTapeBlock *tape, int eor)
 {
     tape->bttb_eor = eor;
     FileWrite(tape->bttb_fd, (char *) tape, TAPEBLCKSZ);
-    NDirectFileWrite += TAPEBLCKSZ;
+    NDirectFileWrite += TAPEBLCKSZ/MAXBLCKSZ;
     _bt_tapereset(tape);
 }
 
@@ -463,7 +468,7 @@ _bt_taperead(BTTapeBlock *tape)
 	return(0);
     }
     Assert(tape->bttb_magic == BTTAPEMAGIC);
-    NDirectFileRead += TAPEBLCKSZ;
+    NDirectFileRead += TAPEBLCKSZ/MAXBLCKSZ;
     return(1);
 }
 
@@ -1366,5 +1371,16 @@ void
 _bt_leafbuild(Relation index, void *spool)
 {
     _bt_isortcmpinit (index, (BTSpool *) spool);
+
+#ifdef BTREE_BUILD_STATS
+    if ( ShowExecutorStats )
+    {
+    	fprintf(stderr, "! BtreeBuild (Spool) Stats:\n");
+    	ShowUsage ();
+    	ResetUsage ();
+    }
+#endif
+
     _bt_merge(index, (BTSpool *) spool);
+
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`*`
`7`	`7`	`* IDENTIFICATION`
`8`		`- * $Id: nbtsort.c,v 1.14 1997/04/16 01:48:27 vadim Exp $`
	`8`	`+ * $Id: nbtsort.c,v 1.15 1997/04/18 03:37:57 vadim Exp $`
`9`	`9`	`*`
`10`	`10`	`* NOTES`
`11`	`11`	`*`
`@@ -63,6 +63,11 @@`
`63`	`63`	`# include <string.h>`
`64`	`64`	`#endif`
`65`	`65`
	`66`	`+#ifdef BTREE_BUILD_STATS`
	`67`	`+#include <tcop/tcopprot.h>`
	`68`	`+extern int ShowExecutorStats;`
	`69`	`+#endif`
	`70`	`+`
`66`	`71`	`/*`
`67`	`72`	`* turn on debugging output.`
`68`	`73`	`*`
`@@ -427,7 +432,7 @@ _bt_tapewrite(BTTapeBlock *tape, int eor)`
`427`	`432`	`{`
`428`	`433`	`tape->bttb_eor = eor;`
`429`	`434`	`FileWrite(tape->bttb_fd, (char *) tape, TAPEBLCKSZ);`
`430`		`- NDirectFileWrite += TAPEBLCKSZ;`
	`435`	`+ NDirectFileWrite += TAPEBLCKSZ/MAXBLCKSZ;`
`431`	`436`	`_bt_tapereset(tape);`
`432`	`437`	`}`
`433`	`438`
`@@ -463,7 +468,7 @@ _bt_taperead(BTTapeBlock *tape)`
`463`	`468`	`return(0);`
`464`	`469`	`}`
`465`	`470`	`Assert(tape->bttb_magic == BTTAPEMAGIC);`
`466`		`- NDirectFileRead += TAPEBLCKSZ;`
	`471`	`+ NDirectFileRead += TAPEBLCKSZ/MAXBLCKSZ;`
`467`	`472`	`return(1);`
`468`	`473`	`}`
`469`	`474`
`@@ -1366,5 +1371,16 @@ void`
`1366`	`1371`	`_bt_leafbuild(Relation index, void *spool)`
`1367`	`1372`	`{`
`1368`	`1373`	`_bt_isortcmpinit (index, (BTSpool *) spool);`
	`1374`	`+`
	`1375`	`+#ifdef BTREE_BUILD_STATS`
	`1376`	`+ if ( ShowExecutorStats )`
	`1377`	`+ {`
	`1378`	`+ fprintf(stderr, "! BtreeBuild (Spool) Stats:\n");`
	`1379`	`+ ShowUsage ();`
	`1380`	`+ ResetUsage ();`
	`1381`	`+ }`
	`1382`	`+#endif`
	`1383`	`+`
`1369`	`1384`	`_bt_merge(index, (BTSpool *) spool);`
	`1385`	`+`
`1370`	`1386`	`}`