Changeset: 9588d7657ccd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9588d7657ccd
Modified Files:
sql/backends/monet5/sql_scenario.c
sql/server/rel_dump.c
sql/server/sql_atom.c
Branch: default
Log Message:
Merge with Dec2025 branch.
diffs (truncated from 4508 to 300 lines):
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -410,10 +410,8 @@ ATOMformat(allocator *ma, int t, const v
size_t sz = 0;
char *buf = NULL;
ssize_t res = (*tostr) (ma, &buf, &sz, p, true);
- if (res < 0 && buf) {
- // GDKfree(buf);
- buf = NULL;
- }
+ if (res < 0)
+ return NULL;
return buf;
}
return "nil";
@@ -1282,7 +1280,6 @@ UUIDfromString(allocator *ma, const char
const char *s = svalue;
if (*len < UUID_SIZE || *retval == NULL) {
- //GDKfree(*retval);
if ((*retval = ma_alloc(ma, UUID_SIZE)) == NULL)
return -1;
*len = UUID_SIZE;
@@ -1379,8 +1376,6 @@ UUIDtoString(allocator *ma, str *retval,
{
const uuid *value = VALUE;
if (*len <= UUID_STRLEN || *retval == NULL) {
- //if (*retval)
- // GDKfree(*retval);
if ((*retval = ma_alloc(ma, UUID_STRLEN + 1)) == NULL)
return -1;
*len = UUID_STRLEN + 1;
@@ -1428,7 +1423,6 @@ INET4fromString(allocator *ma, const cha
const char *s = svalue;
if (*len < 4 || *retval == NULL) {
- //GDKfree(*retval);
if ((*retval = ma_alloc(ma, 4)) == NULL)
return -1;
*len = 4;
@@ -1534,8 +1528,6 @@ INET4toString(allocator *ma, str *retval
const inet4 *value = VALUE;
(void) external;
if (*len < 16 || *retval == NULL) {
- //if (*retval)
- // GDKfree(*retval);
if ((*retval = ma_alloc(ma, 16)) == NULL)
return -1;
*len = 16;
@@ -2022,7 +2014,6 @@ BLOBread(allocator *ma, void *A, size_t
*dstlen = (size_t) len;
}
if (mnstr_read(s, (char *) a, (size_t) len, 1) != 1) {
- //GDKfree(a);
return NULL;
}
return a;
@@ -2086,7 +2077,6 @@ BLOBtostr(allocator *ma, str *tostr, siz
else
expectedlen = p->nitems * 2 + 1;
if (*l < expectedlen || *tostr == NULL) {
- //GDKfree(*tostr);
*tostr = ma_alloc(ma, expectedlen);
if (*tostr == NULL)
return -1;
@@ -2125,7 +2115,6 @@ BLOBfromStr(allocator *ma, const char *i
if (strNil(instr) || (external && strncmp(instr, "nil", 3) == 0)) {
nbytes = blobsize(0);
if (*l < nbytes || *val == NULL) {
- // GDKfree(*val);
if ((*val = ma_alloc(ma, nbytes)) == NULL)
return -1;
}
@@ -2150,7 +2139,6 @@ BLOBfromStr(allocator *ma, const char *i
nbytes = blobsize(nitems);
if (*l < nbytes || *val == NULL) {
- // GDKfree(*val);
*val = ma_alloc(ma, nbytes);
if( *val == NULL)
return -1;
diff --git a/gdk/gdk_calc_convert.c b/gdk/gdk_calc_convert.c
--- a/gdk/gdk_calc_convert.c
+++ b/gdk/gdk_calc_convert.c
@@ -1754,7 +1754,6 @@ VARconvert(allocator *ma, ValPtr ret, co
&ret->len,
VALptr(v),
false) < 0) {
- //GDKfree(ret->val.sval);
ret->val.sval = NULL;
ret->len = 0;
return GDK_FAIL;
@@ -1793,8 +1792,6 @@ VARconvert(allocator *ma, ValPtr ret, co
if ((l = (*BATatoms[ret->vtype].atomFromStr)(ma,
v->val.sval, &len, &p, false)) < 0 ||
l < (ssize_t) strlen(v->val.sval)) {
- //if (ATOMextern(ret->vtype))
- // GDKfree(p);
GDKclrerr();
allocator *ta = MT_thread_getallocator();
allocator_state ta_state = ma_open(ta);
@@ -1838,6 +1835,5 @@ VARconvert(allocator *ma, ValPtr ret, co
ATOMname(v->vtype), ATOMname(ret->vtype));
return GDK_FAIL;
}
- //ret->allocated = !ma;
return nils == BUN_NONE ? GDK_FAIL : GDK_SUCCEED;
}
diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
@@ -624,7 +624,6 @@ strFromStr(allocator *ma, const char *re
/* allocate new memory */
if (*dst == NULL || *len < l) {
- //GDKfree(*dst);
*dst = ma_alloc(ma, *len = l);
if (*dst == NULL) {
*len = 0;
@@ -776,7 +775,6 @@ strRead(allocator *ma, str a, size_t *ds
*dstlen = len + 1;
}
if (len && mnstr_read(s, a, len, 1) != 1) {
- //GDKfree(a);
return NULL;
}
a[len] = 0;
@@ -1119,14 +1117,6 @@ concat_strings(allocator *ma, BAT **bnp,
if (has_nils)
*has_nils = nils;
ma_close(&ta_state);
- // GDKfree(lengths);
- //if (astrings) {
- // for (i = 0; i < ngrp; i++) {
- // if (astrings[i] != str_nil)
- // GDKfree(astrings[i]);
- // }
- // GDKfree(astrings);
- //}
if (rres != GDK_SUCCEED)
BBPreclaim(bn);
@@ -1146,7 +1136,6 @@ BATstr_group_concat(allocator *ma, ValPt
{
struct canditer ci;
gdk_return r = GDK_SUCCEED;
- //bool free_nseparator = false;
char *nseparator = (char *)separator;
assert((nseparator && !sep) || (!nseparator && sep)); /* only one of
them must be set */
@@ -1165,7 +1154,6 @@ BATstr_group_concat(allocator *ma, ValPt
ma_close(&ta_state);
return GDK_FAIL;
}
- //free_nseparator = true;
sep = NULL;
}
@@ -1192,7 +1180,6 @@ BATgroupstr_group_concat(BAT *b, BAT *g,
struct canditer ci;
const char *err;
gdk_return res;
- //bool free_nseparator = false;
char *nseparator = (char *)separator;
assert((nseparator && !sep) || (!nseparator && sep)); /* only one of
them must be set */
@@ -1219,7 +1206,6 @@ BATgroupstr_group_concat(BAT *b, BAT *g,
ma_close(&ma_state);
return NULL;
}
- //free_nseparator = true;
sep = NULL;
}
diff --git a/gdk/gdk_time.c b/gdk/gdk_time.c
--- a/gdk/gdk_time.c
+++ b/gdk/gdk_time.c
@@ -647,7 +647,6 @@ ssize_t
date_fromstr(allocator *ma, const char *buf, size_t *len, date **d, bool
external)
{
if (*len < sizeof(date) || *d == NULL) {
- //GDKfree(*d);
*d = (date *) ma_alloc(ma, *len = sizeof(date));
if( *d == NULL)
return -1;
@@ -687,7 +686,6 @@ date_tostr(allocator *ma, str *buf, size
{
/* 15 bytes is more than enough */
if (*len < 15 || *buf == NULL) {
- //GDKfree(*buf);
*buf = ma_alloc(ma, 15);
if( *buf == NULL)
return -1;
@@ -779,7 +777,6 @@ ssize_t
daytime_fromstr(allocator *ma, const char *buf, size_t *len, daytime **ret,
bool external)
{
if (*len < sizeof(daytime) || *ret == NULL) {
- //GDKfree(*ret);
*ret = (daytime *) ma_alloc(ma, *len = sizeof(daytime));
if (*ret == NULL)
return -1;
@@ -911,7 +908,6 @@ daytime_precision_tostr(allocator *ma, s
if (precision < 0)
precision = 0;
if (*len < 10 + (size_t) precision || *buf == NULL) {
- //GDKfree(*buf);
*buf = (str) ma_alloc(ma, *len = 10 + (size_t) precision);
if( *buf == NULL)
return -1;
@@ -934,7 +930,6 @@ timestamp_fromstr_internal(allocator *ma
daytime tm;
if (*len < sizeof(timestamp) || *ret == NULL) {
- //GDKfree(*ret);
*ret = (timestamp *) ma_alloc(ma, *len = sizeof(timestamp));
if (*ret == NULL)
return -1;
@@ -1063,7 +1058,6 @@ timestamp_precision_tostr(allocator *ma,
if (is_timestamp_nil(val)) {
if (*len < 4 || *buf == NULL) {
- //GDKfree(*buf);
*buf = ma_alloc(ma, *len = 4);
if( *buf == NULL)
return -1;
@@ -1085,7 +1079,6 @@ timestamp_precision_tostr(allocator *ma,
return -1;
if (*len < 2 + (size_t) len1 + (size_t) len2 || *buf == NULL) {
- //GDKfree(*buf);
*buf = ma_alloc(ma, *len = (size_t) len1 + (size_t) len2 + 2);
if( *buf == NULL)
return -1;
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -2043,19 +2043,6 @@ ma_get_blk_idx(allocator *sa, void *blk,
static void
ma_free_obj(allocator *sa, void *obj, size_t sz)
{
- //size_t i;
-
- //char *obj_start = (char *) obj;
- //char *obj_end = obj_start + sz;
-
- //// find the block this object belongs to
- //for(i = 0; i < sa->nr; i++) {
- // char * blk_start = (char *) sa->blks[i];
- // char * blk_end = blk_start + MA_BLOCK_SIZE;
- // if ((obj_start >= blk_start) && (obj_end <= blk_end))
- // break;
- //}
- //assert (i < sa->nr);
freed_t *f = obj;
f->sz = sz;
f->n = sa->freelist;
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -133,8 +133,6 @@ wkbCollectAggrSubGroupedCand(Client ctx,
if ((unionGroup = ma_zalloc(ma, sizeof(GEOSGeom) * ci.ncand))
== NULL) {
msg = createException(MAL, "geom.Collect",
SQLSTATE(HY013) MAL_MALLOC_FAIL);
BBPreclaim(out);
- //if (unions)
- // GDKfree(unions);
goto free;
}
@@ -159,17 +157,11 @@ wkbCollectAggrSubGroupedCand(Client ctx,
unions[lastGrp] = geos2wkb(ma,
&(wkb*){NULL}, &(size_t){0}, collection);
GEOSGeom_destroy_r(geoshandle,
collection);
- //GDKfree(unionGroup);
if ((unionGroup = ma_zalloc(ma,
sizeof(GEOSGeom) * ci.ncand)) == NULL) {
msg = createException(MAL,
"geom.Collect", SQLSTATE(HY013) MAL_MALLOC_FAIL);
//Frees
bat_iterator_end(&bi);
- //if (unions) {
- // for (BUN i = 0; i <
ngrp; i++)
- //
GDKfree(unions[i]);
- // GDKfree(unions);
- //}
goto free;
}
}
@@ -189,23 +181,14 @@ wkbCollectAggrSubGroupedCand(Client ctx,
unions[lastGrp] = geos2wkb(ma, &(wkb*){NULL}, &(size_t){0},
collection);
GEOSGeom_destroy_r(geoshandle, collection);
- //GDKfree(unionGroup);
if (BUNappendmulti(out, unions, ngrp, false) != GDK_SUCCEED) {
msg = createException(MAL, "geom.Union",
SQLSTATE(38000) "BUNappend operation failed");
bat_iterator_end(&bi);
- if (unions) {
- //for (BUN i = 0; i < ngrp; i++)
- // GDKfree(unions[i]);
- //GDKfree(unions);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
