Update copyright for the year 2010.

[postgresql] / src / test / regress / regress.c

diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index 97f2ea713f45b4cd97f4eb284ca1c145e1aa602f..ffbe4e37b8338e5f4f11eaf108e79fc0ddd3e21a 100644 (file)
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -1,14 +1,22 @@
 /*
- * $PostgreSQL: pgsql/src/test/regress/regress.c,v 1.62 2004/10/21 19:28:36 tgl Exp $
+ * $PostgreSQL: pgsql/src/test/regress/regress.c,v 1.72 2009/01/07 13:44:37 tgl Exp $
  */
 
 #include "postgres.h"
 
-#include <float.h>                             /* faked on sunos */
+#include <float.h>
+#include <math.h>
+
+#include "access/transam.h"
+#include "access/xact.h"
+#include "catalog/pg_type.h"
+#include "commands/sequence.h"
+#include "commands/trigger.h"
+#include "executor/executor.h"
+#include "executor/spi.h"
+#include "utils/builtins.h"
+#include "utils/geo_decls.h"
 
-#include "utils/geo_decls.h"   /* includes <math.h> */
-#include "executor/executor.h" /* For GetAttributeByName */
-#include "commands/sequence.h" /* for nextval() */
 
 #define P_MAXDIG 12
 #define LDELIM                 '('
@@ -27,6 +35,11 @@ extern int   oldstyle_length(int n, text *t);
 extern Datum int44in(PG_FUNCTION_ARGS);
 extern Datum int44out(PG_FUNCTION_ARGS);
 
+#ifdef PG_MODULE_MAGIC
+PG_MODULE_MAGIC;
+#endif
+
+
 /*
  * Distance from a point to a path
  */
@@ -52,16 +65,16 @@ regress_dist_ptpath(PG_FUNCTION_ARGS)
                default:
 
                        /*
-                        * the distance from a point to a path is the smallest
-                        * distance from the point to any of its constituent segments.
+                        * the distance from a point to a path is the smallest distance
+                        * from the point to any of its constituent segments.
                         */
                        Assert(path->npts > 1);
                        for (i = 0; i < path->npts - 1; ++i)
                        {
                                regress_lseg_construct(&lseg, &path->p[i], &path->p[i + 1]);
                                tmp = DatumGetFloat8(DirectFunctionCall2(dist_ps,
-                                                                                                         PointPGetDatum(pt),
-                                                                                                 LsegPGetDatum(&lseg)));
+                                                                                                                PointPGetDatum(pt),
+                                                                                                         LsegPGetDatum(&lseg)));
                                if (i == 0 || tmp < result)
                                        result = tmp;
                        }
@@ -98,7 +111,7 @@ regress_path_dist(PG_FUNCTION_ARGS)
 
                        tmp = DatumGetFloat8(DirectFunctionCall2(lseg_distance,
                                                                                                         LsegPGetDatum(&seg1),
-                                                                                                 LsegPGetDatum(&seg2)));
+                                                                                                        LsegPGetDatum(&seg2)));
                        if (!have_min || tmp < min)
                        {
                                min = tmp;
@@ -319,8 +332,6 @@ oldstyle_length(int n, text *t)
        return n + len;
 }
 
-#include "executor/spi.h"              /* this is what you need to work with SPI */
-#include "commands/trigger.h"  /* -"- and triggers */
 
 static TransactionId fd17b_xid = InvalidTransactionId;
 static TransactionId fd17a_xid = InvalidTransactionId;
@@ -420,11 +431,11 @@ funny_dup17(PG_FUNCTION_ARGS)
        if (SPI_processed > 0)
        {
                selected = DatumGetInt32(DirectFunctionCall1(int4in,
-                                                                                       CStringGetDatum(SPI_getvalue(
-                                                                                                  SPI_tuptable->vals[0],
-                                                                                                  SPI_tuptable->tupdesc,
-                                                                                                                                                1
-                                                                                                                                       ))));
+                                                                                               CStringGetDatum(SPI_getvalue(
+                                                                                                          SPI_tuptable->vals[0],
+                                                                                                          SPI_tuptable->tupdesc,
+                                                                                                                                                        1
+                                                                                                                                               ))));
        }
 
        elog(DEBUG4, "funny_dup17 (fired %s) on level %3d: %d/%d tuples inserted/selected",
@@ -445,7 +456,7 @@ extern Datum set_ttdummy(PG_FUNCTION_ARGS);
 
 #define TTDUMMY_INFINITY       999999
 
-static void *splan = NULL;
+static SPIPlanPtr splan = NULL;
 static bool ttoff = false;
 
 PG_FUNCTION_INFO_V1(ttdummy);
@@ -477,11 +488,11 @@ ttdummy(PG_FUNCTION_ARGS)
        if (!CALLED_AS_TRIGGER(fcinfo))
                elog(ERROR, "ttdummy: not fired by trigger manager");
        if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
-               elog(ERROR, "ttdummy: can't process STATEMENT events");
+               elog(ERROR, "ttdummy: cannot process STATEMENT events");
        if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
                elog(ERROR, "ttdummy: must be fired before event");
        if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
-               elog(ERROR, "ttdummy: can't process INSERT event");
+               elog(ERROR, "ttdummy: cannot process INSERT event");
        if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
                newtuple = trigdata->tg_newtuple;
 
@@ -535,7 +546,7 @@ ttdummy(PG_FUNCTION_ARGS)
                        elog(ERROR, "ttdummy (%s): %s must be NOT NULL", relname, args[1]);
 
                if (oldon != newon || oldoff != newoff)
-                       elog(ERROR, "ttdummy (%s): you can't change %s and/or %s columns (use set_ttdummy)",
+                       elog(ERROR, "ttdummy (%s): you cannot change %s and/or %s columns (use set_ttdummy)",
                                 relname, args[0], args[1]);
 
                if (newoff != TTDUMMY_INFINITY)
@@ -550,16 +561,9 @@ ttdummy(PG_FUNCTION_ARGS)
                return PointerGetDatum(NULL);
        }
 
-       {
-               text       *seqname = DatumGetTextP(DirectFunctionCall1(textin,
-                                                                               CStringGetDatum("ttdummy_seq")));
-
-               newoff = DirectFunctionCall1(nextval,
-                                                                        PointerGetDatum(seqname));
-               /* nextval now returns int64; coerce down to int32 */
-               newoff = Int32GetDatum((int32) DatumGetInt64(newoff));
-               pfree(seqname);
-       }
+       newoff = DirectFunctionCall1(nextval, CStringGetTextDatum("ttdummy_seq"));
+       /* nextval now returns int64; coerce down to int32 */
+       newoff = Int32GetDatum((int32) DatumGetInt64(newoff));
 
        /* Connect to SPI manager */
        if ((ret = SPI_connect()) < 0)
@@ -593,7 +597,7 @@ ttdummy(PG_FUNCTION_ARGS)
        /* if there is no plan ... */
        if (splan == NULL)
        {
-               void       *pplan;
+               SPIPlanPtr      pplan;
                Oid                *ctypes;
                char       *query;