Changeset 5558

Timestamp:

04/15/10 11:06:29 (2 years ago)

Author:

jorgearevalo

Message:

Small bug fixed in testcore: CHECK_EQUALS_DOUBLE instead of CHECK_EQUALS.
Added extra debug info in rtreader.py and rt_pg.c (to help fixing

RASTER_dumpAsWKTPolygons function)

Location:

spike/wktraster

Files:

• configure.ac (modified) (2 diffs)
• rt_pg/rt_pg.c (modified) (8 diffs)
• rt_pg/rtpostgis.sql.in.c (modified) (2 diffs)
• scripts/rtreader.py (modified) (2 diffs)
• test/core/testapi.c (modified) (4 diffs)

spike/wktraster/configure.ac

@@ -396 +396 @@
 AC_SUBST([POSTGIS_RASTER_PGSQL_VERSION])
 
-dnl =========================================================================
+dnl ========================================================================
 dnl DEVELOPMENT OPTION: Determine GDAL Support
 dnl
@@ -409 +409 @@
 dnl LIBGDAL_CFLAGS="-I$with_gdal/port -I$with_gdal/ogr -I$with_gdal/alg -I$with_gdal/gcore -I$with_gdal/frmts "
 dnl LIBGDAL_LDFLAGS="-L${with_gdal}/.libs -lgdal -L${with_gdal}/ -lgdal"
-dnl =========================================================================
+dnl ========================================================================
 ENABLE_DEVELOPMENT_CFLAGS=""
 enable_development_msg=""

spike/wktraster/rt_pg/rt_pg.c

@@ -457 +457 @@
     rt_pgraster *pgraster;
     rt_raster raster;
-    rt_context ctx = get_rt_context(fcinfo);
+    rt_context ctx;
     FuncCallContext *funcctx;
     int call_cntr;
@@ -471 +471 @@
      * Check input parameters
      */
+    /*
     if ( PG_NARGS() < 1 || PG_NARGS() > 2 )
     {
-        ereport(errcode(ERRCODE_TOO_MANY_ARGUMENTS), 
-                (errmsg("RASTER_dumpAsWKTPolygons requires 1 or 2 args")));
-        PG_RETURN_NULL();
-    }
-
+        elog(ERROR, "RASTER_dumpAsWKTPolygons requires 1 or 2 args");
+        PG_RETURN_NULL();
+    }
+    */
+    
     /**
      * Stuff donde only in the first call of the function
      */
+
+    elog(NOTICE, "LAST MESSAGE BEFORE CRASH");
     if (SRF_IS_FIRSTCALL())
     {
         MemoryContext oldcontext;
+
+                      
+#ifdef POSTGIS_RASTER_PG_DEBUG
+        elog(NOTICE, "*********** RASTER_dumpAsWKTPolygons FIRST CALL **************");
+#endif
 
         /* Create a function context for cross-call persistence */
@@ -506 +514 @@
         if ( ! raster ) 
         {
-            ereport(errcode(ERRCODE_OUT_OF_MEMORY), 
-                    (errmsg("Could not deserialize raster")));
+            ereport(ERROR,
+                    (errcode(ERRCODE_OUT_OF_MEMORY), 
+                    errmsg("Could not deserialize raster")));
             PG_RETURN_NULL();
         }
@@ -517 +526 @@
 
         /* Polygonize raster */
+#ifdef POSTGIS_RASTER_PG_DEBUG
+        elog(NOTICE, "*********** POLYGONIZE BAND %d **************", nband); 
+#endif        
+
         geomval = rt_raster_dump_as_wktpolygons(ctx, raster, nband);
         /**
@@ -529 +542 @@
         funcctx->max_calls = 
             sizeof(geomval) / sizeof(rt_wktgeomval);
+        
+#ifdef POSTGIS_RASTER_PG_DEBUG
+        elog(NOTICE, "*********** MAX CALLS: %d **************",
+                        funcctx->max_calls);
+#endif
 
         /** 
@@ -536 +554 @@
         if ( ! geomval_ind)
         {
-            ereport(errcode(ERRCODE_OUT_OF_MEMORY), 
-                    (errmsg("Out of memory")));
+            ereport(ERROR,
+                    (errcode(ERRCODE_OUT_OF_MEMORY), 
+                    errmsg("Out of memory")));
             PG_RETURN_NULL();
         }
@@ -563 +582 @@
     }
 
+
     /* Stuff done on every call of the function */
     funcctx = SRF_PERCALL_SETUP();
@@ -568 +588 @@
     max_calls = funcctx->max_calls;
     attinmeta = funcctx->attinmeta;
-    geomval_ind = funcctx->user_fctx;
+    geomval_ind = funcctx->user_fctx;        
+    
+    
+#ifdef POSTGIS_RASTER_PG_DEBUG
+    elog(NOTICE, "*********** PASS NUMBER %d **************", call_cntr);
+#endif
+ 
 
     /* If there is more left to send... */

spike/wktraster/rt_pg/rtpostgis.sql.in.c

@@ -90 +90 @@
     LANGUAGE 'C' IMMUTABLE;
 
-CREATEFUNCTION DumpAsWKTPolygons(raster, int DEFAULT 1)
+CREATEFUNCTION DumpAsWKTPolygons(raster, integer)
     RETURNS SETOF wktgeomval
     AS 'MODULE_PATHNAME','RASTER_dumpAsWKTPolygons'
@@ -346 +346 @@
 
     
-CREATEFUNCTION st_dumpaspolygons(raster) 
-    RETURNS SETOF geomval
-    AS 'select st_geomfromtext(wktgeomval.wktgeom, wktgeomval.srid), wktgeomval.val
-        from dumpaswktpolygons($1, 1) as wktgeomval'
-    LANGUAGE 'SQL' _IMMUTABLE_STRICT;
-
-CREATEFUNCTION st_dumpaspolygons(raster, int) 
-    RETURNS SETOF geomval
-    AS 'select st_geomfromtext(wktgeomval.wktgeom, wktgeomval.srid), wktgeomval.val
-        from dumpaswktpolygons($1, $2) as wktgeomval'
-    LANGUAGE 'SQL' _IMMUTABLE_STRICT;
-
+CREATEFUNCTION st_DumpAsPolygons(raster) RETURNS SETOF geomval AS $$
+        SELECT ST_GeomFromText(wktgeomval.wktGeom), wktgeomval.val,
+        wktgeomval.srid FROM DumpAsWKTPolygons($1, 1) AS wktgeomval;
+    $$ LANGUAGE 'SQL' _IMMUTABLE_STRICT;
+
+CREATEFUNCTION st_DumpAsPolygons(raster, integer) RETURNS SETOF geomval AS $$
+        SELECT ST_GeomFromText(wktgeomval.wktGeom), wktgeomval.val,
+        wktgeomval.srid FROM DumpAsWKTPolygons($1, $2) AS wktgeomval;
+    $$ LANGUAGE 'SQL' _IMMUTABLE_STRICT;
+
+CREATEFUNCTION ST_Dummy() RETURNS integer AS $$
+    BEGIN
+        RAISE NOTICE 'This is a dummy function that does nothing';
+        RETURN 0;
+    END
+$$ LANGUAGE 'plpgsql';
 
 ------------------------------------------------------------------------------

spike/wktraster/scripts/rtreader.py

@@ -104 +104 @@
             if self._conn is None:
                 self._conn = psycopg2.connect(self._connstr)
-        except:
-            raise RasterError("Falied to connect to %s" % self._connstr)
+        except Exception, e:
+            raise RasterError("Falied to connect to %s: %s" % (self._connstr, e))
 
     def _query_single_row(self, sql):
@@ -114 +114 @@
             cur = self._conn.cursor()
             cur.execute(sql)
-        except:
-            raise RasterError("Falied to execute query: %s" % sql)
+        except Exception, e:
+            raise RasterError("Failed to execute query %s: %s" % (sql,
+                        e))
 
         row = cur.fetchone()

spike/wktraster/test/core/testapi.c

@@ -55 +55 @@
 {
     /* Create raster */
+
+    /* First test raster */
+    /*
+    uint16_t width = 2;
+    uint16_t height = 2;
+    */
+    
+    /* Second test raster */
     uint16_t width = 9;
     uint16_t height = 9;
     
-    //uint16_t width = 2;
-    //uint16_t height = 2;
+    /* Third test raster */
+    /*
+    uint16_t width = 5;
+    uint16_t height = 5;
+    */
+
     rt_raster raster = rt_raster_new(ctx, width, height);
+    
     rt_band band = addBand(ctx, raster, PT_32BSI);
 
-    /* Fill raster */
+    /* Fill raster. Option 1: simple raster */
     /*
     rt_band_set_pixel(ctx, band, 0, 0, 1);
@@ -72 +85 @@
     
 
-    
+    /* Fill raster. Option 2: 9x9, 1 band */    
     rt_band_set_pixel(ctx, band, 3, 1, 1.0);
     rt_band_set_pixel(ctx, band, 4, 1, 1.0);
@@ -101 +114 @@
     rt_band_set_pixel(ctx, band, 4, 7, 1.0);
     rt_band_set_pixel(ctx, band, 5, 7, 2.0);
-    
-    
+
+
+    /* Fill raster. Option 3: 5x5, 1 band */
+    /*
+    rt_band_set_pixel(ctx, band, 0, 0, 253);
+    rt_band_set_pixel(ctx, band, 1, 0, 254);
+    rt_band_set_pixel(ctx, band, 2, 0, 253);
+    rt_band_set_pixel(ctx, band, 3, 0, 254);
+    rt_band_set_pixel(ctx, band, 4, 0, 254);
+    rt_band_set_pixel(ctx, band, 0, 1, 253);
+    rt_band_set_pixel(ctx, band, 1, 1, 254);
+    rt_band_set_pixel(ctx, band, 2, 1, 254);
+    rt_band_set_pixel(ctx, band, 3, 1, 253);
+    rt_band_set_pixel(ctx, band, 4, 1, 249);
+    rt_band_set_pixel(ctx, band, 0, 2, 250);
+    rt_band_set_pixel(ctx, band, 1, 2, 254);
+    rt_band_set_pixel(ctx, band, 2, 2, 254);
+    rt_band_set_pixel(ctx, band, 3, 2, 252);
+    rt_band_set_pixel(ctx, band, 4, 2, 249);
+    rt_band_set_pixel(ctx, band, 0, 3, 251);
+    rt_band_set_pixel(ctx, band, 1, 3, 253);
+    rt_band_set_pixel(ctx, band, 2, 3, 254);
+    rt_band_set_pixel(ctx, band, 3, 3, 254);
+    rt_band_set_pixel(ctx, band, 4, 3, 253);
+    rt_band_set_pixel(ctx, band, 0, 4, 252);
+    rt_band_set_pixel(ctx, band, 1, 4, 250);
+    rt_band_set_pixel(ctx, band, 2, 4, 254);
+    rt_band_set_pixel(ctx, band, 3, 4, 254);
+    rt_band_set_pixel(ctx, band, 4, 4, 254);
+    */
+     
     rt_raster_add_band(ctx, raster, band); 
     
@@ -1028 +1070 @@
         rt_wktgeomval gv = rt_raster_dump_as_wktpolygons(ctx, rt, 1);
 
-        CHECK_EQUALS(gv[0].val, 1);
+
+        CHECK_EQUALS_DOUBLE(gv[0].val, 1.0);
         CHECK(!strcmp(gv[0].wktGeom,"POLYGON ((3 1,3 2,2 2,2 3,1 3,1 6,2 6,2 7,3 7,3 8,5 8,5 6,3 6,3 3,4 3,5 3,5 1,3 1))"));
 
-        CHECK_EQUALS(gv[1].val, 2);
+        CHECK_EQUALS_DOUBLE(gv[1].val, 2.0);
         CHECK(!strcmp(gv[1].wktGeom,"POLYGON ((5 1,5 3,6 3,6 6,5 6,5 8,6 8,6 7,7 7,7 6,8 6,8 3,7 3,7 2,6 2,6 1,5 1))"));