date:20200126

MonetDB: default - Backed out changeset 5001021cc090

2020-01-26 Thread Pedro Ferreira

Changeset: 32a374cd765e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=32a374cd765e
Modified Files:
geom/lib/libgeom.c
geom/lib/libgeom.h
geom/monetdb5/geom.c
Branch: default
Log Message:

Backed out changeset 5001021cc090


diffs (truncated from 868 to 300 lines):

diff --git a/geom/lib/libgeom.c b/geom/lib/libgeom.c
--- a/geom/lib/libgeom.c
+++ b/geom/lib/libgeom.c
@@ -106,24 +106,17 @@ getMbrGeos(mbr *res, const GEOSGeom geos
 */
 
 GEOSGeom
-wkb2geos(GEOSContextHandle_t handle, const wkb *geomWKB)
+wkb2geos(const wkb *geomWKB)
 {
GEOSGeom geosGeometry;
 
if (is_wkb_nil(geomWKB))
return NULL;
 
-   if (handle)
-   geosGeometry = GEOSGeomFromWKB_buf_r(handle, (unsigned char *) 
geomWKB->data, geomWKB->len);
-   else
-   geosGeometry = GEOSGeomFromWKB_buf((unsigned char *) 
geomWKB->data, geomWKB->len);
+   geosGeometry = GEOSGeomFromWKB_buf((unsigned char *) geomWKB->data, 
geomWKB->len);
 
-   if (geosGeometry != NULL) {
-   if (handle)
-   GEOSSetSRID_r(handle, geosGeometry, geomWKB->srid);
-   else
-   GEOSSetSRID(geosGeometry, geomWKB->srid);
-   }
+   if (geosGeometry != NULL)
+   GEOSSetSRID(geosGeometry, geomWKB->srid);
 
return geosGeometry;
 }
diff --git a/geom/lib/libgeom.h b/geom/lib/libgeom.h
--- a/geom/lib/libgeom.h
+++ b/geom/lib/libgeom.h
@@ -139,7 +139,7 @@ libgeom_export void libgeom_exit(void);
 libgeom_export bool is_wkb_nil(const wkb *wkbp);
 libgeom_export int getMbrGeos(mbr *mbr, const GEOSGeom geosGeometry);
 libgeom_export int getMbrGeom(mbr *res, wkb *geom);
-libgeom_export GEOSGeom wkb2geos(GEOSContextHandle_t handle, const wkb 
*geomWKB);
+libgeom_export GEOSGeom wkb2geos(const wkb *geomWKB);
 
 //libgeom_export str geomerty_2_geometry(wkb *res, wkb **geom, int* 
columnType, int* columnSRID, int* valueSRID);
 
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -16,7 +16,7 @@
 
 int TYPE_mbr;
 
-static wkb *geos2wkb(GEOSContextHandle_t handle, const GEOSGeometry 
*geosGeometry);
+static wkb *geos2wkb(const GEOSGeometry *geosGeometry);
 
 static inline int
 geometryHasZ(int info)
@@ -438,7 +438,7 @@ wkbTransform(wkb **transformedWKB, wkb *
}
 
/* get the geosGeometry from the wkb */
-   geosGeometry = wkb2geos(NULL, (*geomWKB));
+   geosGeometry = wkb2geos(*geomWKB);
/* get the type of the geometry */
geometryType = GEOSGeomTypeId(geosGeometry) + 1;
 
@@ -469,7 +469,7 @@ wkbTransform(wkb **transformedWKB, wkb *
/* set the new srid */
GEOSSetSRID(transformedGeosGeometry, *srid_dst);
/* get the wkb */
-   if ((*transformedWKB = geos2wkb(NULL, transformedGeosGeometry)) 
== NULL)
+   if ((*transformedWKB = geos2wkb(transformedGeosGeometry)) == 
NULL)
ret = createException(MAL, "geom.Transform", 
SQLSTATE(38000) "Geos operation geos2wkb failed");
/* destroy the geos geometries */
GEOSGeom_destroy(transformedGeosGeometry);
@@ -776,7 +776,7 @@ wkbForceDim(wkb **outWKB, wkb **geomWKB,
return MAL_SUCCEED;
}
 
-   geosGeometry = wkb2geos(NULL, (*geomWKB));
+   geosGeometry = wkb2geos(*geomWKB);
if (geosGeometry == NULL) {
*outWKB = NULL;
throw(MAL, "geom.ForceDim", SQLSTATE(38000) "Geos operation 
wkb2geos failed");
@@ -790,7 +790,7 @@ wkbForceDim(wkb **outWKB, wkb **geomWKB,
 
GEOSSetSRID(outGeometry, GEOSGetSRID(geosGeometry));
 
-   *outWKB = geos2wkb(NULL, outGeometry);
+   *outWKB = geos2wkb(outGeometry);
 
GEOSGeom_destroy(geosGeometry);
GEOSGeom_destroy(outGeometry);
@@ -1156,7 +1156,7 @@ wkbSegmentize(wkb **outWKB, wkb **geomWK
return MAL_SUCCEED;
}
 
-   geosGeometry = wkb2geos(NULL, (*geomWKB));
+   geosGeometry = wkb2geos(*geomWKB);
if (geosGeometry == NULL) {
*outWKB = NULL;
throw(MAL, "geom.Segmentize", SQLSTATE(38000) "Geos operation 
wkb2geos failed");
@@ -1170,7 +1170,7 @@ wkbSegmentize(wkb **outWKB, wkb **geomWK
 
GEOSSetSRID(outGeometry, GEOSGetSRID(geosGeometry));
 
-   *outWKB = geos2wkb(NULL, outGeometry);
+   *outWKB = geos2wkb(outGeometry);
 
GEOSGeom_destroy(geosGeometry);
GEOSGeom_destroy(outGeometry);
@@ -1474,7 +1474,7 @@ wkbTranslate(wkb **outWKB, wkb **geomWKB
return MAL_SUCCEED;
}
 
-   geosGeometry = wkb2geos(NULL, (*geomWKB));
+   geosGeometry = wkb2geos(*geomWKB);
if (geosGeometry == NULL) {
*outWKB = NULL;
throw(MAL, "geom.Translate", SQLSTATE(38000) "Geos operation 
wkb2geos failed");
@@ -1488,7 +1488,7 @@ wkbTranslate(wkb **outWKB, wkb

MonetDB: mosaic - Update TODO's.

2020-01-26 Thread Aris Koning

Changeset: 7f1c5a834ac0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f1c5a834ac0
Modified Files:
monetdb5/modules/mosaic/TODO_MOSAIC.txt
Branch: mosaic
Log Message:

Update TODO's.


diffs (10 lines):

diff --git a/monetdb5/modules/mosaic/TODO_MOSAIC.txt 
b/monetdb5/modules/mosaic/TODO_MOSAIC.txt
--- a/monetdb5/modules/mosaic/TODO_MOSAIC.txt
+++ b/monetdb5/modules/mosaic/TODO_MOSAIC.txt
@@ -1,5 +1,6 @@
 technical depth
 Refactor macro-ised functions to real functions in header files and apply the 
include trick
+Find SF-5 bug.
 benchmark using TPC-H
 Fix/check/test MOSlayout.
 Add negative values to tests
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: mosaic - Merge a number of template files.

2020-01-26 Thread Aris Koning

Changeset: a7eafb5cf96d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a7eafb5cf96d
Removed Files:
monetdb5/modules/mosaic/mosaic_delta_template.h
monetdb5/modules/mosaic/mosaic_dictionary_impl.h
monetdb5/modules/mosaic/mosaic_dictionary_prepare_context_impl.h
monetdb5/modules/mosaic/mosaic_frame_template.h
monetdb5/modules/mosaic/mosaic_linear_template.h
monetdb5/modules/mosaic/mosaic_prefix_template.h
monetdb5/modules/mosaic/mosaic_raw_template.h
monetdb5/modules/mosaic/mosaic_runlength_template.h
Modified Files:
monetdb5/modules/mosaic/Makefile.ag
monetdb5/modules/mosaic/mosaic_delta.c
monetdb5/modules/mosaic/mosaic_delta_templates.h
monetdb5/modules/mosaic/mosaic_dict.c
monetdb5/modules/mosaic/mosaic_dict256.c
monetdb5/modules/mosaic/mosaic_dictionary_templates.h
monetdb5/modules/mosaic/mosaic_frame.c
monetdb5/modules/mosaic/mosaic_frame_templates.h
monetdb5/modules/mosaic/mosaic_linear.c
monetdb5/modules/mosaic/mosaic_linear_templates.h
monetdb5/modules/mosaic/mosaic_prefix.c
monetdb5/modules/mosaic/mosaic_prefix_templates.h
monetdb5/modules/mosaic/mosaic_raw.c
monetdb5/modules/mosaic/mosaic_raw_templates.h
monetdb5/modules/mosaic/mosaic_runlength.c
monetdb5/modules/mosaic/mosaic_runlength_templates.h
monetdb5/modules/mosaic/mosaic_select_template.h
monetdb5/modules/mosaic/mosaic_utility.h
Branch: mosaic
Log Message:

Merge a number of template files.


diffs (truncated from 2636 to 300 lines):

diff --git a/monetdb5/modules/mosaic/Makefile.ag 
b/monetdb5/modules/mosaic/Makefile.ag
--- a/monetdb5/modules/mosaic/Makefile.ag
+++ b/monetdb5/modules/mosaic/Makefile.ag
@@ -25,15 +25,15 @@ lib_mosaic = {
mosaic_select_template.h \
mosaic_projection_template.h \
mosaic_join.h \
-   mosaic_raw.c mosaic_raw.h mosaic_raw_template.h 
mosaic_raw_templates.h \
-   mosaic_runlength.c mosaic_runlength.h 
mosaic_runlength_template.h mosaic_runlength_templates.h \
+   mosaic_raw.c mosaic_raw.h mosaic_raw_templates.h \
+   mosaic_runlength.c mosaic_runlength.h 
mosaic_runlength_templates.h \
mosaic_dict.c mosaic_dict.h mosaic_dict_templates.h \
mosaic_dict256.c mosaic_dict256.h mosaic_dict256_templates.h \
-   mosaic_dictionary.h mosaic_dictionary_impl.h 
mosaic_dictionary_prepare_context_impl.h mosaic_dictionary_templates.h \
-   mosaic_delta.c mosaic_delta.h mosaic_delta_template.h 
mosaic_delta_templates.h \
-   mosaic_linear.c mosaic_linear.h mosaic_linear_template.h 
mosaic_linear_templates.h \
-   mosaic_frame.c mosaic_frame.h mosaic_frame_template.h 
mosaic_frame_templates.h \
-   mosaic_prefix.c mosaic_prefix.h mosaic_prefix_template.h 
mosaic_prefix_templates.h \
+   mosaic_dictionary.h mosaic_dictionary_templates.h \
+   mosaic_delta.c mosaic_delta.h mosaic_delta_templates.h \
+   mosaic_linear.c mosaic_linear.h mosaic_linear_templates.h \
+   mosaic_frame.c mosaic_frame.h mosaic_frame_templates.h \
+   mosaic_prefix.c mosaic_prefix.h mosaic_prefix_templates.h \
mosaic_private.h
 }
 
diff --git a/monetdb5/modules/mosaic/mosaic_delta.c 
b/monetdb5/modules/mosaic/mosaic_delta.c
--- a/monetdb5/modules/mosaic/mosaic_delta.c
+++ b/monetdb5/modules/mosaic/mosaic_delta.c
@@ -63,23 +63,25 @@ MOSlayout_delta(MOStask* task, BAT *btec
return;
 }
 
+#define COMPRESSION_DEFINITION
 #define TPE bte
-#include "mosaic_delta_template.h"
+#include "mosaic_delta_templates.h"
 #undef TPE
 #define TPE sht
-#include "mosaic_delta_template.h"
+#include "mosaic_delta_templates.h"
 #undef TPE
 #define TPE int
-#include "mosaic_delta_template.h"
+#include "mosaic_delta_templates.h"
 #undef TPE
 #define TPE lng
-#include "mosaic_delta_template.h"
+#include "mosaic_delta_templates.h"
 #undef TPE
 #ifdef HAVE_HGE
 #define TPE hge
-#include "mosaic_delta_template.h"
+#include "mosaic_delta_templates.h"
 #undef TPE
 #endif
+#undef COMPRESSION_DEFINITION
 
 #define scan_loop_delta(TPE, CANDITER_NEXT, TEST) \
 {\
diff --git a/monetdb5/modules/mosaic/mosaic_delta_template.h 
b/monetdb5/modules/mosaic/mosaic_delta_template.h
deleted file mode 100644
--- a/monetdb5/modules/mosaic/mosaic_delta_template.h
+++ /dev/null
@@ -1,133 +0,0 @@
-MOSadvance_SIGNATURE(delta, TPE)
-{
-   MOSBlockHeaderTpe(delta, TPE)* parameters = (MOSBlockHeaderTpe(delta, 
TPE)*) (task)->blk;
-   BUN cnt = MOSgetCnt(task->blk);
-
-   assert(cnt > 0);
-   assert(MOSgetTag(task->blk) == MOSAIC_DELTA);
-
-   task->start += (oid) cnt;
-
-   char* blk = (char*)task->blk;
-   blk += sizeof(MOSBlockHeaderTpe(delta, TPE));
-   blk +=

MonetDB: default - Backed out changeset 5001021cc090

MonetDB: mosaic - Update TODO's.

MonetDB: mosaic - Merge a number of template files.

3 matches

Site Navigation

Mail list logo

Footer information