Changeset: b2c581fbf189 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2c581fbf189
Added Files:
geom/monetdb5/grid.h.sh
geom/monetdb5/grid.mal.sh
geom/monetdb5/grid_create_impl.h
geom/monetdb5/grid_hge.mal.sh
geom/monetdb5/grid_impl.h.sh
geom/sql/41_grid.sql.sh
geom/sql/41_grid_hge.sql.sh
Modified Files:
geom/monetdb5/31_grid.mal
geom/monetdb5/31_grid_hge.mal
geom/monetdb5/Makefile.ag
geom/monetdb5/grid.c
geom/monetdb5/grid.h
geom/monetdb5/grid.mal
geom/monetdb5/grid_hge.mal
geom/monetdb5/grid_impl.h
geom/sql/41_grid.sql
geom/sql/41_grid_hge.sql
Branch: grid
Log Message:
modifying the grid functions (temporary commit)
diffs (truncated from 2121 to 300 lines):
diff --git a/geom/monetdb5/31_grid.mal b/geom/monetdb5/31_grid.mal
--- a/geom/monetdb5/31_grid.mal
+++ b/geom/monetdb5/31_grid.mal
@@ -4,6 +4,5 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-# This loads the MonetDB/GIS module
library geom;
include grid;
diff --git a/geom/monetdb5/31_grid_hge.mal b/geom/monetdb5/31_grid_hge.mal
--- a/geom/monetdb5/31_grid_hge.mal
+++ b/geom/monetdb5/31_grid_hge.mal
@@ -4,6 +4,5 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-# This loads the MonetDB/GIS module
library geom;
-include grid_hge;
+include geom_hge;
diff --git a/geom/monetdb5/Makefile.ag b/geom/monetdb5/Makefile.ag
--- a/geom/monetdb5/Makefile.ag
+++ b/geom/monetdb5/Makefile.ag
@@ -15,7 +15,7 @@ INCLUDES = ../lib \
lib__geom = {
MODULE
DIR = libdir/monetdb5
- SOURCES = geom.h geom.c geomBulk.c geom_upgrade.c grid.h grid_impl.h
grid.c
+ SOURCES = geom.h geom.c geomBulk.c geom_upgrade.c grid.h grid_impl.h
grid_create_impl.h grid.c
LIBS = ../lib/libgeom \
../../gdk/libbat \
../../common/stream/libstream \
diff --git a/geom/monetdb5/grid.c b/geom/monetdb5/grid.c
--- a/geom/monetdb5/grid.c
+++ b/geom/monetdb5/grid.c
@@ -29,28 +29,299 @@ countSetBits(uint64_t *resBitvector, siz
}
#define TP bte
-#include "grid_impl.h"
+#include "grid_create_impl.h"
#undef TP
#define TP sht
-#include "grid_impl.h"
+#include "grid_create_impl.h"
#undef TP
#define TP int
-#include "grid_impl.h"
+#include "grid_create_impl.h"
#undef TP
#define TP lng
-#include "grid_impl.h"
+#include "grid_create_impl.h"
#undef TP
#ifdef HAVE_HGE
#define TP hge
-#include "grid_impl.h"
+#include "grid_create_impl.h"
#undef TP
#endif
#define TP flt
-#include "grid_impl.h"
+#include "grid_create_impl.h"
#undef TP
#define TP dbl
+#include "grid_create_impl.h"
+#undef TP
+#define TP1 bte
+#define TP2 bte
#include "grid_impl.h"
-#undef TP
+#undef TP1
+#undef TP2
+#define TP1 bte
+#define TP2 sht
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 bte
+#define TP2 int
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 bte
+#define TP2 lng
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#ifdef HAVE_HGE
+#define TP1 bte
+#define TP2 hge
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#endif
+#define TP1 bte
+#define TP2 flt
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 bte
+#define TP2 dbl
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 sht
+#define TP2 bte
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 sht
+#define TP2 sht
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 sht
+#define TP2 int
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 sht
+#define TP2 lng
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#ifdef HAVE_HGE
+#define TP1 sht
+#define TP2 hge
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#endif
+#define TP1 sht
+#define TP2 flt
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 sht
+#define TP2 dbl
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 int
+#define TP2 bte
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 int
+#define TP2 sht
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 int
+#define TP2 int
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 int
+#define TP2 lng
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#ifdef HAVE_HGE
+#define TP1 int
+#define TP2 hge
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#endif
+#define TP1 int
+#define TP2 flt
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 int
+#define TP2 dbl
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 lng
+#define TP2 bte
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 lng
+#define TP2 sht
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 lng
+#define TP2 int
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 lng
+#define TP2 lng
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#ifdef HAVE_HGE
+#define TP1 lng
+#define TP2 hge
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#endif
+#define TP1 lng
+#define TP2 flt
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 lng
+#define TP2 dbl
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#ifdef HAVE_HGE
+#define TP1 hge
+#define TP2 bte
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#endif
+#ifdef HAVE_HGE
+#define TP1 hge
+#define TP2 sht
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#endif
+#ifdef HAVE_HGE
+#define TP1 hge
+#define TP2 int
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#endif
+#ifdef HAVE_HGE
+#define TP1 hge
+#define TP2 lng
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#endif
+#ifdef HAVE_HGE
+#define TP1 hge
+#define TP2 hge
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#endif
+#ifdef HAVE_HGE
+#define TP1 hge
+#define TP2 flt
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#endif
+#ifdef HAVE_HGE
+#define TP1 hge
+#define TP2 dbl
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#endif
+#define TP1 flt
+#define TP2 bte
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 flt
+#define TP2 sht
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 flt
+#define TP2 int
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 flt
+#define TP2 lng
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#ifdef HAVE_HGE
+#define TP1 flt
+#define TP2 hge
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#endif
+#define TP1 flt
+#define TP2 flt
+#include "grid_impl.h"
+#undef TP1
+#undef TP2
+#define TP1 flt
+#define TP2 dbl
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
