Changeset: 2017962c189e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2017962c189e
Modified Files:
configure.ag
monetdb5/modules/atoms/mtime.c
monetdb5/optimizer/opt_projectionpath.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/vaults/shp/shp.c
sql/server/rel_exp.c
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (155 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -623,6 +623,14 @@ AS_VAR_IF([enable_strict], [yes], [
MCHECK_ADD_FLAG([-Wjump-misses-init])
MCHECK_ADD_FLAG([-Wmissing-include-dirs])
MCHECK_ADD_FLAG([-Wlogical-op])
+ MCHECK_ADD_FLAG([-Wduplicated-cond])
+ MCHECK_ADD_FLAG([-Wduplicated-branches])
+ MCHECK_ADD_FLAG([-Wlogical-op])
+ MCHECK_ADD_FLAG([-Wrestrict])
+ MCHECK_ADD_FLAG([-Wnull-dereference])
+ MCHECK_ADD_FLAG([-Wjump-misses-init])
+dnl MCHECK_ADD_FLAG([-Wshadow])
+ MCHECK_ADD_FLAG([-Wformat=2])
# With clang 2.8, 3.3, 5.0 (no other tested) and gcc < 4.5
# (tested 3.4.6, 4.2.1, 4.3.2, 4.4.4, 4.4.5, 4.5.1, 4.5.2),
diff --git a/monetdb5/modules/atoms/mtime.c b/monetdb5/modules/atoms/mtime.c
--- a/monetdb5/modules/atoms/mtime.c
+++ b/monetdb5/modules/atoms/mtime.c
@@ -2424,11 +2424,7 @@ MTIMEdate_sub_sec_interval_wrap(date *re
*ret = date_nil;
return MAL_SUCCEED;
}
- if (*sec >= 0)
- delta = -(int) (*sec / 86400);
- else
- delta = (int) (-*sec / 86400);
-
+ delta = -(int) (*sec / 86400); /* / truncates toward zero */
return MTIMEdate_adddays(ret, t, &delta);
}
@@ -2441,11 +2437,7 @@ MTIMEdate_sub_msec_interval_lng_wrap(dat
*ret = date_nil;
return MAL_SUCCEED;
}
- if (*msec > 0)
- delta = -(int) (*msec / 86400000);
- else
- delta = (int) (-*msec / 86400000);
-
+ delta = -(int) (*msec / 86400000); /* / truncates toward zero */
return MTIMEdate_adddays(ret, t, &delta);
}
@@ -2458,11 +2450,7 @@ MTIMEdate_add_sec_interval_wrap(date *re
*ret = date_nil;
return MAL_SUCCEED;
}
- if (*sec >= 0)
- delta = (int) (*sec / 86400);
- else
- delta = -(int) (-*sec / 86400);
-
+ delta = (int) (*sec / 86400); /* / truncates toward zero */
return MTIMEdate_adddays(ret, t, &delta);
}
@@ -2475,11 +2463,7 @@ MTIMEdate_add_msec_interval_lng_wrap(dat
*ret = date_nil;
return MAL_SUCCEED;
}
- if (*msec > 0)
- delta = (int) (*msec / 86400000);
- else
- delta = -(int) (-*msec / 86400000);
-
+ delta = (int) (*msec / 86400000); /* / truncates toward zero */
return MTIMEdate_adddays(ret, t, &delta);
}
diff --git a/monetdb5/optimizer/opt_projectionpath.c
b/monetdb5/optimizer/opt_projectionpath.c
--- a/monetdb5/optimizer/opt_projectionpath.c
+++ b/monetdb5/optimizer/opt_projectionpath.c
@@ -185,7 +185,7 @@ OPTprojectionpathImplementation(Client c
old= mb->stmt;
limit= mb->stop;
slimit= mb->ssize;
- if ( newMalBlkStmt(mb,mb->ssize + mb->stop) < 0)
+ if ( newMalBlkStmt(mb, 2 * mb->stop) < 0)
throw(MAL,"optimizer.projectionpath", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
/* beware, new variables and instructions are introduced */
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -1661,10 +1661,7 @@ releqjoin( backend *be, list *l1, list *
sql_subfunc *f = NULL;
stmt * cmp;
- if (cmp_op == cmp_equal)
- f = sql_bind_func(sql->sa, sql->session->schema, "=",
tail_type(le), tail_type(le), F_FUNC);
- else
- f = sql_bind_func(sql->sa, sql->session->schema, "=",
tail_type(le), tail_type(le), F_FUNC);
+ f = sql_bind_func(sql->sa, sql->session->schema, "=",
tail_type(le), tail_type(le), F_FUNC);
assert(f);
cmp = stmt_binop(be, le, re, f);
diff --git a/sql/backends/monet5/vaults/shp/shp.c
b/sql/backends/monet5/vaults/shp/shp.c
--- a/sql/backends/monet5/vaults/shp/shp.c
+++ b/sql/backends/monet5/vaults/shp/shp.c
@@ -272,8 +272,10 @@ SHPattach(Client cntxt, MalBlkPtr mb, Ma
sprintf(temp_buf + strlen(temp_buf), "\"%s\" INT, ",
nameToLowerCase);
} else if (strcmp(field_definitions[i].fieldType, "Real") == 0)
{
sprintf(temp_buf + strlen(temp_buf), "\"%s\" FLOAT, ",
nameToLowerCase);
+#if 0
} else if (strcmp(field_definitions[i].fieldType, "Date") == 0)
{
sprintf(temp_buf + strlen(temp_buf), "\"%s\" STRING, ",
nameToLowerCase);
+#endif
} else
sprintf(temp_buf + strlen(temp_buf), "\"%s\" STRING, ",
nameToLowerCase);
GDKfree(nameToLowerCase);
@@ -451,11 +453,13 @@ SHPimportFile(Client cntxt, MalBlkPtr mb
msg = createException(MAL, "shp.import",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto unfree4;
}
+#if 0
} else if (strcmp(field_definitions[i].fieldType, "Date") == 0)
{
- if(!(colsBAT[i] = COLnew(0, TYPE_str, rowsNum, PERSISTENT))) {
+ if(!(colsBAT[i] = COLnew(0, TYPE_str, rowsNum,
PERSISTENT))) {
msg = createException(MAL, "shp.import",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto unfree4;
}
+#endif
} else {
if(!(colsBAT[i] = COLnew(0, TYPE_str, rowsNum,
PERSISTENT))) {
msg = createException(MAL, "shp.import",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
@@ -675,11 +679,13 @@ SHPpartialimport(Client cntxt, MalBlkPtr
msg = createException(MAL, "shp.import",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto bailout;
}
+#if 0
} else if (strcmp(field_definitions[i].fieldType, "Date") == 0)
{
if(!(colsBAT[i] = COLnew(0, TYPE_str, rowsNum,
PERSISTENT))) {
msg = createException(MAL, "shp.import",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto bailout;
}
+#endif
} else {
if(!(colsBAT[i] = COLnew(0, TYPE_str, rowsNum,
PERSISTENT))) {
msg = createException(MAL, "shp.import",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -244,7 +244,7 @@ exp_atom_max(sql_allocator *sa, sql_subt
} else if (tpe->type->localtype == TYPE_lng) {
return exp_atom_lng(sa, GDK_lng_max);
#ifdef HAVE_HGE
- } else if (tpe->type->localtype == TYPE_lng) {
+ } else if (tpe->type->localtype == TYPE_hge) {
return exp_atom_hge(sa, GDK_hge_max);
#endif
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
