Changeset: 347f6b26e10e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=347f6b26e10e
Modified Files:
clients/odbc/driver/ODBCConvert.c
monetdb5/mal/mal_instruction.c
monetdb5/modules/atoms/inet.c
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/vaults/bam/bam_wrapper.c
sql/server/rel_optimizer.c
sql/server/sql_atom.c
sql/server/sql_partition.c
sql/storage/store.c
Branch: client-filetrans
Log Message:
Merge with default branch.
diffs (166 lines):
diff --git a/clients/odbc/driver/ODBCConvert.c
b/clients/odbc/driver/ODBCConvert.c
--- a/clients/odbc/driver/ODBCConvert.c
+++ b/clients/odbc/driver/ODBCConvert.c
@@ -526,7 +526,9 @@ parsemonthintervalstring(char **svalp,
long val1 = -1, val2 = -1;
SQLLEN leadingprecision;
- *ival = (SQL_INTERVAL_STRUCT) {0};
+ *ival = (SQL_INTERVAL_STRUCT) {
+ .interval_type = SQL_IS_YEAR, /* anything will do */
+ };
if (slen < 8 || strncasecmp(sval, "interval", 8) != 0)
return SQL_ERROR;
sval += 8;
@@ -684,7 +686,9 @@ parsesecondintervalstring(char **svalp,
unsigned v1, v2, v3, v4;
int n;
- *ival = (SQL_INTERVAL_STRUCT) {0};
+ *ival = (SQL_INTERVAL_STRUCT) {
+ .interval_type = SQL_IS_YEAR, /* anything will do */
+ };
if (slen < 8 || strncasecmp(sval, "interval", 8) != 0)
return SQL_ERROR;
sval += 8;
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -1143,7 +1143,7 @@ convertConstant(int type, ValPtr vr)
throw(SYNTAX, "convertConstant", "conversion
error");
}
GDKfree(w);
- *vr = (ValRecord) {0};
+ *vr = (ValRecord) {.vtype = type,};
VALset(vr, type, d);
if (ATOMextern(type) == 0)
GDKfree(d);
diff --git a/monetdb5/modules/atoms/inet.c b/monetdb5/modules/atoms/inet.c
--- a/monetdb5/modules/atoms/inet.c
+++ b/monetdb5/modules/atoms/inet.c
@@ -125,7 +125,7 @@ INETfromString(const char *src, size_t *
}
*len = sizeof(inet);
} else {
- **retval = (inet) {0};
+ **retval = (inet) {.q1 = 0,};
}
/* handle the nil string */
diff --git a/sql/backends/monet5/UDF/capi/capi.c
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -490,7 +490,7 @@ static str CUDFeval(Client cntxt, MalBlk
(void)sigaddset(&signal_set, SIGBUS);
(void)pthread_sigmask(SIG_UNBLOCK, &signal_set, NULL);
- sa = (struct sigaction) {0};
+ sa = (struct sigaction) {.sa_flags = 0,};
}
if (!grouped) {
@@ -1339,7 +1339,7 @@ static str CUDFeval(Client cntxt, MalBlk
errno = 0;
goto wrapup;
}
- sa = (struct sigaction) {0};
+ sa = (struct sigaction) {.sa_flags = 0,};
}
if (msg) {
@@ -1532,7 +1532,7 @@ wrapup:
(void) sigaction(SIGSEGV, &oldsa, NULL);
(void) sigaction(SIGBUS, &oldsb, NULL);
- sa = (struct sigaction) {0};
+ sa = (struct sigaction) {.sa_flags = 0,};
}
// clear any mprotected regions
while (regions) {
diff --git a/sql/backends/monet5/vaults/bam/bam_wrapper.c
b/sql/backends/monet5/vaults/bam/bam_wrapper.c
--- a/sql/backends/monet5/vaults/bam/bam_wrapper.c
+++ b/sql/backends/monet5/vaults/bam/bam_wrapper.c
@@ -79,7 +79,7 @@ init_bam_wrapper(bam_wrapper * bw, filet
char flushdir[128];
/* Enables clear function to check variables */
- *bw = (bam_wrapper) {0};
+ *bw = (bam_wrapper) {.type = SAM,};
if (mkdir(DIR_BINARIES, 0777) == -1 && errno != EEXIST) {
throw(MAL, "init_bam_wrapper",
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -9235,7 +9235,7 @@ optimize_rel(mvc *sql, sql_rel *rel, int
int changes = 0, e_changes = 0;
global_props gp;
- gp = (global_props) {0};
+ gp = (global_props) {.cnt = {0},};
rel_properties(sql, &gp, rel);
#ifdef DEBUG
diff --git a/sql/server/sql_atom.c b/sql/server/sql_atom.c
--- a/sql/server/sql_atom.c
+++ b/sql/server/sql_atom.c
@@ -32,7 +32,7 @@ atom_create( sql_allocator *sa )
if(!a)
return NULL;
- a->data = (ValRecord) {0};
+ a->data = (ValRecord) {.vtype = TYPE_void,};
a->d = dbl_nil;
a->varid = -1;
return a;
diff --git a/sql/server/sql_partition.c b/sql/server/sql_partition.c
--- a/sql/server/sql_partition.c
+++ b/sql/server/sql_partition.c
@@ -321,7 +321,7 @@ initialize_sql_parts(mvc* sql, sql_table
ptr ok;
nv->tpe = found;
- vvalue = (ValRecord) {0};
+ vvalue = (ValRecord) {.vtype =
TYPE_void,};
ok = VALinit(&vvalue, TYPE_str,
v->value);
if(ok)
ok = VALconvert(localtype,
&vvalue);
@@ -342,7 +342,7 @@ initialize_sql_parts(mvc* sql, sql_table
ValRecord vmin, vmax;
ptr ok;
- vmin = vmax = (ValRecord) {0};
+ vmin = vmax = (ValRecord) {.vtype = TYPE_void,};
ok = VALinit(&vmin, TYPE_str,
next->part.range.minvalue);
if(ok)
ok = VALconvert(localtype, &vmin);
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -596,7 +596,7 @@ load_range_partition(sql_trans *tr, sql_
ValRecord vmin, vmax;
ptr ok;
- vmin = vmax = (ValRecord) {0};
+ vmin = vmax = (ValRecord) {.vtype = TYPE_void,};
v1 = table_funcs.column_find_value(tr, find_sql_column(ranges,
"minimum"), rid);
v2 = table_funcs.column_find_value(tr, find_sql_column(ranges,
"maximum"), rid);
@@ -651,7 +651,7 @@ load_value_partition(sql_trans *tr, sql_
ValRecord vvalue;
ptr ok;
- vvalue = (ValRecord) {0};
+ vvalue = (ValRecord) {.vtype = TYPE_void,};
void *v = table_funcs.column_find_value(tr,
find_sql_column(values, "value"), rid);
ok = VALinit(&vvalue, TYPE_str, v);
_DELETE(v);
@@ -4816,7 +4816,7 @@ sql_trans_add_range_partition(sql_trans
ptr ok;
assert(isGlobal(mt));
- vmin = vmax = (ValRecord) {0};
+ vmin = vmax = (ValRecord) {.vtype = TYPE_void,};
if(min) {
ok = VALinit(&vmin, localtype, min);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
