Changeset: 049bc39cd446 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=049bc39cd446
Modified Files:
clients/Tests/exports.stable.out
geom/lib/libgeom.c
geom/lib/libgeom.h
geom/monetdb5/geom.c
geom/monetdb5/geom.h
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/blob.h
monetdb5/modules/atoms/color.c
monetdb5/modules/atoms/color.h
monetdb5/modules/atoms/identifier.c
monetdb5/modules/atoms/inet.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/json.h
monetdb5/modules/atoms/url.c
monetdb5/modules/atoms/url.h
monetdb5/modules/atoms/uuid.c
monetdb5/modules/atoms/xml.c
monetdb5/modules/atoms/xml.h
monetdb5/modules/kernel/batcolor.c
monetdb5/modules/mal/wlc.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_pipes.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
sql/backends/monet5/vaults/bam/mykstring.h
sql/backends/monet5/wlr.c
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/sql_env.c
sql/server/sql_env.h
sql/storage/bat/bat_table.c
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.sql
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
testing/malcheck.py
Branch: trails
Log Message:
Fixed merge conflict and approved more tests
diffs (truncated from 2667 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -821,25 +821,25 @@ str BKCsetTransient(void *r, const bat *
str BKCsetkey(bat *res, const bat *bid, const bit *param);
str BKCshrinkBAT(bat *ret, const bat *bid, const bat *did);
str BLOBblob_blob(blob **d, blob **s);
-str BLOBblob_fromstr(blob **b, str *d);
-int BLOBcmp(blob *l, blob *r);
+str BLOBblob_fromstr(blob **b, const char **d);
+int BLOBcmp(const blob *l, const blob *r);
void BLOBdel(Heap *h, var_t *index);
str BLOBfromblob(str *retval, blob **b);
str BLOBfromidx(str *retval, blob **binp, int *index);
-int BLOBfromstr(char *instr, int *l, blob **val);
+int BLOBfromstr(const char *instr, int *l, blob **val);
int BLOBget(Heap *h, int *bun, int *l, blob **val);
-BUN BLOBhash(blob *b);
+BUN BLOBhash(const blob *b);
void BLOBheap(Heap *heap, size_t capacity);
-int BLOBlength(blob *p);
+int BLOBlength(const blob *p);
str BLOBnitems(int *ret, blob *b);
-blob *BLOBnull(void);
+const blob *BLOBnull(void);
str BLOBprelude(void *ret);
-var_t BLOBput(Heap *h, var_t *bun, blob *val);
+var_t BLOBput(Heap *h, var_t *bun, const blob *val);
blob *BLOBread(blob *a, stream *s, size_t cnt);
-str BLOBsqlblob_fromstr(sqlblob **b, str *d);
+str BLOBsqlblob_fromstr(sqlblob **b, const char **d);
str BLOBtoblob(blob **retval, str *s);
-int BLOBtostr(str *tostr, int *l, blob *pin);
-gdk_return BLOBwrite(blob *a, stream *s, size_t cnt);
+int BLOBtostr(str *tostr, int *l, const blob *pin);
+gdk_return BLOBwrite(const blob *a, stream *s, size_t cnt);
str CALCmax(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str CALCmax_no_nil(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str CALCmin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -862,23 +862,23 @@ str CLRbatStr(bat *ret, const bat *l);
str CLRbatValue(bat *ret, const bat *l);
str CLRbatValueInt(bat *ret, const bat *l);
str CLRbatycc(bat *ret, const bat *l, const bat *bid2, const bat *bid3);
-str CLRblue(int *b, color *c);
-str CLRcb(int *g, color *c);
-str CLRcolor(color *c, str *val);
-str CLRcr(int *r, color *c);
-str CLRgreen(int *g, color *c);
-str CLRhsv(color *c, flt *h, flt *s, flt *v);
-str CLRhue(flt *r, color *c);
-str CLRhueInt(int *r, color *c);
-str CLRluminance(int *r, color *c);
-str CLRred(int *r, color *c);
-str CLRrgb(color *rgb, int *r, int *g, int *b);
-str CLRsaturation(flt *g, color *c);
-str CLRsaturationInt(int *g, color *c);
-str CLRstr(str *val, color *c);
-str CLRvalue(flt *b, color *c);
-str CLRvalueInt(int *b, color *c);
-str CLRycc(color *c, int *y, int *cr, int *cb);
+str CLRblue(int *b, const color *c);
+str CLRcb(int *g, const color *c);
+str CLRcolor(color *c, const char **val);
+str CLRcr(int *r, const color *c);
+str CLRgreen(int *g, const color *c);
+str CLRhsv(color *c, const flt *h, const flt *s, const flt *v);
+str CLRhue(flt *r, const color *c);
+str CLRhueInt(int *r, const color *c);
+str CLRluminance(int *r, const color *c);
+str CLRred(int *r, const color *c);
+str CLRrgb(color *rgb, const int *r, const int *g, const int *b);
+str CLRsaturation(flt *g, const color *c);
+str CLRsaturationInt(int *g, const color *c);
+str CLRstr(str *val, const color *c);
+str CLRvalue(flt *b, const color *c);
+str CLRvalueInt(int *b, const color *c);
+str CLRycc(color *c, const int *y, const int *cr, const int *cb);
str CLTActions(bat *ret);
str CLTInfo(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTLastCommand(bat *ret);
@@ -1144,9 +1144,9 @@ str GRPsubgroup7(bat *ngid, bat *next, c
str GRPsubgroup8(bat *ngid, bat *next, const bat *bid, const bat *gid, const
bat *eid, const bat *hid);
str GRPsubgroup9(bat *ngid, bat *next, const bat *bid, const bat *sid, const
bat *gid, const bat *eid, const bat *hid);
str IDentifier(identifier *retval, str *in);
-int IDfromString(str src, int *len, identifier *retval);
+int IDfromString(const char *src, int *len, identifier *retval);
str IDprelude(void *ret);
-int IDtoString(str *retval, int *len, identifier handle);
+int IDtoString(str *retval, int *len, const char *handle);
str ILIKEjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const str
*esc, const bat *slid, const bat *srid, const bit *nil_matches, const lng
*estimate);
str ILIKEjoin1(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat
*slid, const bat *srid, const bit *nil_matches, const lng *estimate);
str INET_comp_CS(bit *retval, const inet *val1, const inet *val2);
@@ -1172,7 +1172,7 @@ str INETmasklen(int *retval, const inet
str INETnetmask(inet *retval, const inet *val);
str INETnetwork(inet *retval, const inet *val);
str INETnew(inet *retval, str *in);
-inet *INETnull(void);
+const inet *INETnull(void);
str INETsetmasklen(inet *retval, const inet *val, const int *msk);
str INETtext(str *retval, const inet *val);
int INETtoString(str *retval, int *len, const inet *handle);
@@ -1228,7 +1228,7 @@ str JSONfilterArray_int(json *ret, json
str JSONfilterArray_lng(json *ret, json *j, lng *index);
str JSONfilterArray_sht(json *ret, json *j, sht *index);
str JSONfold(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-int JSONfromString(str src, int *len, json *x);
+int JSONfromString(const char *src, int *len, json *x);
str JSONgroupStr(str *ret, const bat *bid);
str JSONisarray(bit *ret, json *j);
str JSONisobject(bit *ret, json *j);
@@ -1250,7 +1250,7 @@ str JSONsubjson(bat *retval, bat *bid, b
str JSONsubjsoncand(bat *retval, bat *bid, bat *gid, bat *eid, bat *id, bit
*skip_nils);
str JSONtextGrouped(bat *ret, bat *bid, bat *gid, bat *ext, bit *flg);
str JSONtextString(str *ret, bat *bid);
-int JSONtoString(str *s, int *len, json src);
+int JSONtoString(str *s, int *len, const char *src);
str JSONunfold(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str JSONvalueArray(json *ret, json *arg);
str JSONvalueTable(bat *ret, json *j);
@@ -1349,7 +1349,7 @@ str MBMskewed(bat *ret, oid *base, lng *
str MBMuniform(bat *ret, oid *base, lng *size, int *domain);
int MCactiveClients(void);
str MCawakeClient(int id);
-void MCcloseClient(Client c, int is_cq_client);
+void MCcloseClient(Client c, int which_client);
int MCdefault;
Client MCforkClient(Client father);
Client MCgetClient(int id);
@@ -1716,7 +1716,7 @@ str SERVERsetAlias(void *ret, int *mid,
str SERVERstop(void *ret);
str SERVERsuspend(void *ret);
str SERVERtrace(void *ret, int *mid, int *flag);
-int SQLBLOBfromstr(char *instr, int *l, blob **val);
+int SQLBLOBfromstr(const char *instr, int *l, blob **val);
int SQLBLOBtostr(str *tostr, int *l, const blob *pin);
BUN SQLload_file(Client cntxt, Tablet *as, bstream *b, stream *out, const char
*csep, const char *rsep, char quote, lng skip, lng maxrow, int best);
str STRBytes(int *res, const str *arg1);
@@ -1848,7 +1848,7 @@ int TYPE_sqlblob;
int TYPE_timestamp;
int TYPE_tzone;
int TYPE_xml;
-int URLfromString(str src, int *len, str *u);
+int URLfromString(const char *src, int *len, str *u);
str URLgetAnchor(str *retval, url *val);
str URLgetBasename(str *retval, url *t);
str URLgetContent(str *retval, url *Str1);
@@ -1867,14 +1867,14 @@ str URLnew(url *u, str *val);
str URLnew3(url *u, str *protocol, str *server, str *file);
str URLnew4(url *u, str *protocol, str *server, int *port, str *file);
str URLnoop(url *u, url *val);
-int URLtoString(str *s, int *len, str src);
+int URLtoString(str *s, int *len, const char *src);
int UUIDcompare(const uuid *l, const uuid *r);
str UUIDequal(bit *retval, uuid **l, uuid **r);
int UUIDfromString(const char *svalue, int *len, uuid **retval);
str UUIDgenerateUuid(uuid **retval);
BUN UUIDhash(const void *u);
str UUIDisaUUID(bit *retval, str *u);
-uuid *UUIDnull(void);
+const uuid *UUIDnull(void);
str UUIDprelude(void *ret);
uuid *UUIDread(uuid *u, stream *s, size_t cnt);
str UUIDstr2uuid(uuid **retval, str *s);
@@ -1915,15 +1915,15 @@ str XMLdocument(xml *x, str *s);
str XMLelement(xml *ret, str *name, xml *nspace, xml *attr, xml *val);
str XMLelementSmall(xml *ret, str *name, xml *val);
str XMLforest(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-int XMLfromString(str src, int *len, xml *x);
+int XMLfromString(const char *src, int *len, xml *x);
str XMLisdocument(bit *x, str *s);
str XMLparse(xml *x, str *doccont, str *s, str *option);
str XMLpi(xml *x, str *target, str *s);
str XMLprelude(void *ret);
size_t XMLquotestring(const char *s, char *buf, size_t len);
str XMLroot(xml *x, xml *v, str *version, str *standalone);
-str XMLstr2xml(xml *x, str *s);
-int XMLtoString(str *s, int *len, xml src);
+str XMLstr2xml(xml *x, const char **s);
+int XMLtoString(str *s, int *len, const char *src);
size_t XMLunquotestring(const char **p, char q, char *buf);
str XMLxml2str(str *s, xml *x);
str XMLxml2xml(xml *x, xml *s);
@@ -1931,8 +1931,8 @@ str XMLxmltext(str *s, xml *x);
str abortRef;
str actionRef;
void addMalException(MalBlkPtr mb, str msg);
-str addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name);
-str addPipeDefinition(Client cntxt, str name, str pipe);
+str addOptimizerPipe(Client cntxt, MalBlkPtr mb, const char *name);
+str addPipeDefinition(Client cntxt, const char *name, const char *pipe);
void addtoMalBlkHistory(MalBlkPtr mb);
str affectedRowsRef;
str aggrRef;
@@ -2015,13 +2015,13 @@ str closeRef;
void clrDeclarations(MalBlkPtr mb);
void clrFunction(InstrPtr p);
void clrInstruction(InstrPtr p);
-int color_fromstr(char *colorStr, int *len, color **c);
-int color_tostr(char **colorStr, int *len, color *c);
+int color_fromstr(const char *colorStr, int *len, color **c);
+int color_tostr(char **colorStr, int *len, const color *c);
str columnBindRef;
str columnRef;
str commitRef;
str compileAllOptimizers(Client cntxt);
-str compileOptimizer(Client cntxt, str name);
+str compileOptimizer(Client cntxt, const char *name);
str compileString(Symbol *fcn, Client c, str s);
str connectRef;
str convertConstant(malType type, ValPtr vr);
@@ -2231,7 +2231,7 @@ int isMatLeftJoinOp(InstrPtr q);
int isMultiplex(InstrPtr q);
int isNotUsedIn(InstrPtr p, int start, int a);
int isOptimizerEnabled(MalBlkPtr mb, str opt);
-int isOptimizerPipe(str name);
+int isOptimizerPipe(const char *name);
int isOrderby(InstrPtr q);
int isSample(InstrPtr q);
int isSealedFunction(InstrPtr q);
@@ -2470,6 +2470,7 @@ str rename_userRef;
str replaceRef;
str replicatorRef;
void resetMalBlk(MalBlkPtr mb, int stop);
+void resetMalBlkAndFreeInstructions(MalBlkPtr mb, int stop);
void resetScenario(Client c);
int resizeMalBlk(MalBlkPtr mb, int elements);
int resolveType(int dsttype, int srctype);
diff --git a/geom/lib/libgeom.c b/geom/lib/libgeom.c
--- a/geom/lib/libgeom.c
+++ b/geom/lib/libgeom.c
@@ -34,7 +34,7 @@ libgeom_exit(void)
}
int
-wkb_isnil(wkb *w)
+wkb_isnil(const wkb *w)
{
if (!w || w->len == ~0)
return 1;
@@ -106,7 +106,7 @@ getMbrGeos(mbr *res, const GEOSGeom geos
*/
GEOSGeom
-wkb2geos(wkb *geomWKB)
+wkb2geos(const wkb *geomWKB)
{
GEOSGeom geosGeometry;
diff --git a/geom/lib/libgeom.h b/geom/lib/libgeom.h
--- a/geom/lib/libgeom.h
+++ b/geom/lib/libgeom.h
@@ -136,10 +136,10 @@ libgeom_export void libgeom_exit(void);
//#define wkb2geos( geom ) wkb_isnil((geom))? NULL:
GEOSGeomFromWKB_buf((unsigned char *)((geom)->data), (geom)->len)
#define mbr_nil mbrFromGeos(NULL);
-libgeom_export int wkb_isnil(wkb *wkbp);
+libgeom_export int wkb_isnil(const wkb *wkbp);
libgeom_export int getMbrGeos(mbr *mbr, const GEOSGeom geosGeometry);
libgeom_export int getMbrGeom(mbr *res, wkb *geom);
-libgeom_export GEOSGeom wkb2geos(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
@@ -2081,7 +2081,7 @@ geom_epilogue(void *ret)
/* Check if fixed-sized atom mbr is null */
static int
-mbr_isnil(mbr *m)
+mbr_isnil(const mbr *m)
{
if (m == NULL || m->xmin == flt_nil || m->ymin == flt_nil || m->xmax ==
flt_nil || m->ymax == flt_nil)
return 1;
@@ -2136,13 +2136,13 @@ strncasecmp(const char *s1, const char *
/* Creates WKB representation (including srid) from WKT representation */
/* return number of parsed characters. */
static str
-wkbFROMSTR_withSRID(char *geomWKT, int *len, wkb **geomWKB, int srid, size_t
*nread)
+wkbFROMSTR_withSRID(const char *geomWKT, int *len, wkb **geomWKB, int srid,
size_t *nread)
{
GEOSGeom geosGeometry = NULL; /* The geometry object that is parsed
from the src string. */
GEOSWKTReader *WKT_reader;
const char *polyhedralSurface = "POLYHEDRALSURFACE";
const char *multiPolygon = "MULTIPOLYGON";
- char *geomWKT_original = NULL;
+ char *geomWKT_new = NULL;
size_t parsedCharacters = 0;
*nread = 0;
@@ -2176,34 +2176,32 @@ wkbFROMSTR_withSRID(char *geomWKT, int *
//not work correctly.
if (strncasecmp(geomWKT, polyhedralSurface, strlen(polyhedralSurface))
== 0) {
size_t sizeOfInfo = strlen(geomWKT) - strlen(polyhedralSurface);
- geomWKT_original = geomWKT;
- geomWKT = GDKmalloc(sizeOfInfo + strlen(multiPolygon) + 1);
- if (geomWKT == NULL)
+ geomWKT_new = GDKmalloc(sizeOfInfo + strlen(multiPolygon) + 1);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
