Changeset: 8e332bf1b4de for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8e332bf1b4de
Added Files:
sql/benchmarks/arno_flt/Tests/SingleServer
sql/benchmarks/nobench/Tests/SingleServer
sql/test/Users/Tests/metadataConsistency.sql
sql/test/Users/Tests/metadataConsistency.stable.err
sql/test/Users/Tests/metadataConsistency.stable.out
Removed Files:
sql/test/Tests/testlz4.lz4
Modified Files:
clients/odbc/driver/ODBCEnv.c
geom/monetdb5/geom.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_parser.c
monetdb5/modules/atoms/json.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_result.c
sql/benchmarks/nobench/Tests/nobench.sql
sql/benchmarks/nobench/Tests/nobench.stable.out
sql/server/rel_optimizer.c
sql/server/rel_propagate.c
sql/server/rel_schema.c
sql/storage/bat/bat_logger.c
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
sql/test/Users/Tests/All
sql/test/wlcr/Tests/All
Branch: default
Log Message:
Merged with linear-hashing
diffs (truncated from 1172 to 300 lines):
diff --git a/clients/odbc/driver/ODBCEnv.c b/clients/odbc/driver/ODBCEnv.c
--- a/clients/odbc/driver/ODBCEnv.c
+++ b/clients/odbc/driver/ODBCEnv.c
@@ -113,7 +113,7 @@ ODBCError *
getEnvError(ODBCEnv *env)
{
assert(isValidEnv(env));
- return env->Error;;
+ return env->Error;
}
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -4652,8 +4652,7 @@ mbrrelation_wkb(bit *out, wkb **geom1WKB
return ret;
}
-/*returns true if the two
- * mbrs overlap */
+/*returns true if the two mbrs overlap */
str
mbrOverlaps(bit *out, mbr **b1, mbr **b2)
{
@@ -5579,7 +5578,7 @@ wkbaHASH(const wkba *wArray)
int
wkbaCOMP(const wkba *l, const wkba *r)
{
- int i, res = 0;;
+ int i, res = 0;
//compare the number of items
if (l->itemsNum != r->itemsNum)
diff --git a/monetdb5/mal/mal_import.c b/monetdb5/mal/mal_import.c
--- a/monetdb5/mal/mal_import.c
+++ b/monetdb5/mal/mal_import.c
@@ -136,7 +136,7 @@ malLoadScript(str name, bstream **fdin)
assert(c->glb == 0 || c->glb == oldglb); /* detect leak */ \
c->glb = oldglb; \
c->usermodule = oldusermodule; \
- c->curmodule = oldcurmodule;; \
+ c->curmodule = oldcurmodule; \
c->curprg = oldprg;
#define restoreClient \
restoreClient1 \
@@ -167,7 +167,7 @@ malInclude(Client c, str name, int listi
MalStkPtr oldglb = c->glb;
Module oldusermodule = c->usermodule;
- Module oldcurmodule = c->curmodule;
+ Module oldcurmodule = c->curmodule;
Symbol oldprg = c->curprg;
c->prompt = GDKstrdup(""); /* do not produce visible prompts */
@@ -253,14 +253,14 @@ malInclude(Client c, str name, int listi
*/
str
evalFile(str fname, int listing)
-{
+{
Client c;
stream *fd;
str filename;
str msg = MAL_SUCCEED;
filename = malResolveFile(fname);
- if (filename == NULL)
+ if (filename == NULL)
throw(MAL, "mal.eval","could not open file: %s\n", fname);
fd = malOpenSource(filename);
GDKfree(filename);
@@ -475,7 +475,7 @@ callString(Client cntxt, str s, int list
if(msg == MAL_SUCCEED && cntxt->phase[0] != c->phase[0]){
cntxt->phase[0] = c->phase[0];
cntxt->state[0] = c->state[0];
- msg = (str) (*cntxt->phase[0])(cntxt); // force
re-initialize client context
+ msg = (str) (*cntxt->phase[0])(cntxt); // force
re-initialize client context
}
//}
c->usermodule = 0; // keep it around
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -116,7 +116,7 @@ parseError(Client cntxt, str msg)
if (old){
strcpy(new, old);
GDKfree(old);
- }
+ }
strcat(new,line);
strcat(new,marker);
@@ -129,7 +129,7 @@ parseError(Client cntxt, str msg)
* This command should be executed at the beginning of a parse
* request and each time we encounter EOL.
*/
-static void
+static void
echoInput(Client cntxt)
{
char *c = CURRENT(cntxt);
@@ -229,7 +229,7 @@ idLength(Client cntxt)
// skip remainder
while (idCharacter2[(unsigned char) (*s)])
s++;
- return (int) (s-t);;
+ return (int) (s-t);
}
/* Simple type identifiers can not be marked with a type variable. */
@@ -722,7 +722,7 @@ parseTypeId(Client cntxt, int defaultTyp
if (currChar(cntxt) != ']')
parseError(cntxt, "']' expected\n");
- nextChar(cntxt); // skip ']'
+ nextChar(cntxt); // skip ']'
skipSpace(cntxt);
return i;
}
@@ -999,7 +999,7 @@ parseModule(Client cntxt)
advance(cntxt, l);
if( strcmp(modnme, cntxt->usermodule->name) ==0){
// ignore this module definition
- } else
+ } else
if( getModule(modnme) == NULL){
if( globalModule(modnme) == NULL)
parseError(cntxt,"<module> could not be created");
@@ -1115,7 +1115,7 @@ fcnHeader(Client cntxt, int kind)
}
fnme = putNameLen(((char *) CURRENT(cntxt)), l);
advance(cntxt, l);
- } else
+ } else
modnme= cntxt->curmodule->name;
/* temporary suspend capturing statements in main block */
@@ -1359,7 +1359,7 @@ parseFunction(Client cntxt, int kind)
MalBlkPtr curBlk = 0;
curBlk = fcnHeader(cntxt, kind);
- if (curBlk == NULL)
+ if (curBlk == NULL)
return curBlk;
if (MALkeyword(cntxt, "address", 7)) {
str nme;
@@ -1406,7 +1406,7 @@ parseEnd(Client cntxt)
l = idLength(cntxt);
if (l == 0)
l = operatorLength(cntxt);
- sig = getInstrPtr(cntxt->curprg->def,0);
+ sig = getInstrPtr(cntxt->curprg->def,0);
if (strncmp(CURRENT(cntxt), getModuleId(sig), l) == 0) {
advance(cntxt, l);
skipSpace(cntxt);
@@ -1421,7 +1421,7 @@ parseEnd(Client cntxt)
if ((l == strlen(curPrg->name) &&
strncmp(CURRENT(cntxt), curPrg->name, l) == 0) || l ==
0)
advance(cntxt, l);
- else
+ else
parseError(cntxt, "non matching end label\n");
pushEndInstruction(cntxt->curprg->def);
cntxt->blkmode = 0;
@@ -1510,7 +1510,7 @@ parseArguments(Client cntxt, MalBlkPtr c
break;
case 2: return 2;
case 3: return 3;
- case 4:
+ case 4:
parseError(cntxt, "Argument type overwrites previous
definition\n");
return 0;
default:
@@ -1643,7 +1643,7 @@ parseAssign(Client cntxt, int cntrl)
int e;
InstrPtr sig = getInstrPtr(curBlk,0);
curInstr->retc = 0;
- for (e = 0; e < sig->retc; e++)
+ for (e = 0; e < sig->retc; e++)
curInstr = pushReturn(curBlk, curInstr,
getArg(sig, e));
}
@@ -1899,7 +1899,7 @@ parseMAL(Client cntxt, Symbol curPrg, in
break;
}
goto allLeft;
- case 'I': case 'i':
+ case 'I': case 'i':
if (MALkeyword(cntxt, "inline", 6)) {
inlineProp= 1;
skipSpace(cntxt);
@@ -1907,7 +1907,7 @@ parseMAL(Client cntxt, Symbol curPrg, in
} else
if (MALkeyword(cntxt, "include", 7)){
parseInclude(cntxt);
- break;;
+ break;
}
goto allLeft;
case 'L': case 'l':
@@ -1957,7 +1957,7 @@ parseMAL(Client cntxt, Symbol curPrg, in
continue;
}
goto allLeft;
- case 'U': case 'u':
+ case 'U': case 'u':
if (MALkeyword(cntxt, "unsafe", 6)) {
unsafeProp= 1;
skipSpace(cntxt);
diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -44,8 +44,7 @@
jt->error = NULL;
\
JSONfree(jt);
\
} else {
\
- msg = createException(MAL, "json.new",
\
-
SQLSTATE(HY013) MAL_MALLOC_FAIL); \
+ msg = createException(MAL, "json.new", SQLSTATE(HY013)
MAL_MALLOC_FAIL); \
}
\
return msg;
\
}
@@ -132,7 +131,7 @@ JSONfromString(const char *src, size_t *
}
if (external) {
if (GDKstrFromStr((unsigned char *) *j,
- (const unsigned char *) src,
(ssize_t) slen) < 0)
+ (const unsigned char *) src, (ssize_t) slen) <
0)
return -1;
src = *j;
} else {
@@ -1842,7 +1841,7 @@ JSONfoldKeyValue(str *ret, const bat *id
BUN i, cnt;
size_t len, lim, l;
void *p;
- oid o = 0;;
+ oid o = 0;
if (key) {
bk = BATdescriptor(*key);
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
@@ -82,7 +82,7 @@ refs_find_rel(list *refs, sql_rel *rel)
for(n=refs->h; n; n = n->next->next) {
sql_rel *ref = n->data;
stmt *s = n->next->data;
-
+
if (rel == ref)
return s;
}
@@ -706,7 +706,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
if (need_distinct(e)){
stmt *g = stmt_group(be, as, grp, ext,
cnt, 1);
stmt *next = stmt_result(be, g, 1);
-
+
as = stmt_project(be, next, as);
if (grp)
grp = stmt_project(be, next,
grp);
@@ -827,7 +827,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
s = stmt_binop(be, sel1, s, f);
} else if (sel1 && (sel1->nrcols == 0 ||
s->nrcols == 0)) {
stmt *predicate = bin_first_column(be,
left);
-
+
predicate = stmt_const(be, predicate,
stmt_bool(be, 1));
if (s->nrcols == 0)
s = stmt_uselect(be, predicate,
s, cmp_equal, sel1, anti, is_semantics(c));
@@ -854,7 +854,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
s = stmt_binop(be, sel2, s, f);
} else if (sel2 && (sel2->nrcols == 0 ||
s->nrcols == 0)) {
stmt *predicate = bin_first_column(be,
left);
-
+
predicate = stmt_const(be, predicate,
stmt_bool(be, 1));
if (s->nrcols == 0)
s = stmt_uselect(be, predicate,
s, cmp_equal, sel2, anti, 0);
@@ -870,13 +870,13 @@ exp_bin(backend *be, sql_exp *e, stmt *l
}
if (sel1->nrcols == 0) {
stmt *predicate = bin_first_column(be, left);
-
+
predicate = stmt_const(be, predicate,
stmt_bool(be, 1));
sel1 = stmt_uselect(be, predicate, sel1,
cmp_equal, NULL, 0/*anti*/, 0);
}
if (sel2->nrcols == 0) {
stmt *predicate = bin_first_column(be, left);
-
+
predicate = stmt_const(be, predicate,
stmt_bool(be, 1));
sel2 = stmt_uselect(be, predicate, sel2,
cmp_equal, NULL, 0/*anti*/, 0);
}
@@ -1055,7 +1055,7 @@ check_table_types(backend *be, list *typ
stmt *dels = stmt_tid(be, tbl, 0);
node *n, *m;
list *l = sa_list(sql->sa);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
