MonetDB: sfcgal - Bulk version for Dump and DumpP

[Romulo Goncalves]

Changeset: 6f62f73f6d44 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6f62f73f6d44
Modified Files:
        geom/monetdb5/geom.h
        geom/monetdb5/geom.mal
        geom/monetdb5/geomBulk.c
Branch: sfcgal
Log Message:

Bulk version for Dump and DumpP


diffs (55 lines):

diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h
--- a/geom/monetdb5/geom.h
+++ b/geom/monetdb5/geom.h
@@ -264,7 +264,9 @@ geom_export str wkbSegmentize(wkb**, wkb
 geom_export str wkbSegmentize_bat(bat *outBAT_id, bat *inBAT_id, double *flag);
 
 geom_export str wkbDump(bat* idBAT_id, bat* geomBAT_id, wkb**);
+geom_export str wkbDump_bat(bat* idBAT_id, bat* geomBAT_id, bat* wkbBAT_id);
 geom_export str wkbDumpP(bat* partentBAT_id, bat* idBAT_id, bat* geomBAT_id, 
wkb**, int* parent);
+geom_export str wkbDumpP_bat(bat* partentBAT_id, bat* idBAT_id, bat* 
geomBAT_id, bat* wkbBAT_id, bat *parent);
 geom_export str wkbDumpPoints(bat* idBAT_id, bat* geomBAT_id, wkb**);
 geom_export str wkbDumpPointsP(bat* partentBAT_id, bat* idBAT_id, bat* 
geomBAT_id, wkb**, int* parent);
 geom_export str wkbDumpRings(bat* geomBAT_id, wkb**);
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -834,6 +834,10 @@ function NRings(w:bat[:wkb]) :bat[:int];
        return x;
 end NRings;
 
+command Dump(a:bat[:wkb]) (id:bat[:str], geom:bat[:wkb]) address wkbDump_bat
+comment "Gets a MultiPolygon and returns the Polygons in it";
+command DumpP(a:bat[:wkb], p:bat[:int]) (parent:bat[:int], id:bat[:str], 
geom:bat[:wkb]) address wkbDumpP_bat
+comment "Gets a MultiPolygon and returns the Polygons in it";
 
 command Boundary(w:bat[:wkb]) :bat[:wkb] address wkbBoundary_bat;
 
diff --git a/geom/monetdb5/geomBulk.c b/geom/monetdb5/geomBulk.c
--- a/geom/monetdb5/geomBulk.c
+++ b/geom/monetdb5/geomBulk.c
@@ -2384,7 +2384,7 @@ wkbDistance_bat_geom(bat *outBAT_id, bat
 }
 
 static str
-wkbDump_bat(bat *parentBAT_id, bat *idBAT_id, bat *geomBAT_id, bat 
*inGeomBAT_id, bat *inParentBAT_id)
+wkbDump_bat_(bat *parentBAT_id, bat *idBAT_id, bat *geomBAT_id, bat 
*inGeomBAT_id, bat *inParentBAT_id)
 {
        BAT *idBAT = NULL, *geomBAT = NULL, *parentBAT = NULL, *inParentBAT = 
NULL, *inGeomBAT = NULL;
     BATiter inGeomBAT_iter, inParentBAT_iter;
@@ -2511,6 +2511,15 @@ wkbDump_bat(bat *parentBAT_id, bat *idBA
        return MAL_SUCCEED;
 }
 
+str
+wkbDump_bat(bat* idBAT_id, bat* geomBAT_id, bat* wkbBAT_id) {
+    return wkbDump_bat_(NULL, idBAT_id, geomBAT_id, wkbBAT_id, NULL);
+}
+
+str
+wkbDumpP_bat(bat* partentBAT_id, bat* idBAT_id, bat* geomBAT_id, bat* 
wkbBAT_id, bat *parent) {
+    return wkbDump_bat_(partentBAT_id, idBAT_id, geomBAT_id, wkbBAT_id, 
parent);
+}
 
 
 /**
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list