Changeset: 5ee31845cebc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5ee31845cebc
Removed Files:
geom/ChangeLog.Jan2014
java/ChangeLog.Jan2014
monetdb5/ChangeLog.Jan2014
sql/ChangeLog.Jan2014
testing/ChangeLog.Jan2014
Modified Files:
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_join.c
geom/monetdb5/geom.c
geom/monetdb5/geom.h
geom/monetdb5/geomBulk.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_session.c
monetdb5/modules/mal/tablet.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_wrapper.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cast_impl_up_to_int.h
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_scenario.h
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_scan.h
sql/server/sql_symbol.h
sql/storage/store.c
Branch: geo
Log Message:
Reduce difference with default branch.
diffs (truncated from 620 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -873,7 +873,7 @@ typedef struct PROPrec PROPrec;
typedef struct {
str id; /* label for head/tail column */
- unsigned short width; /* byte-width of the atom array, the width of
the offsets */
+ unsigned short width; /* byte-width of the atom array */
bte type; /* type id. */
bte shift; /* log2 of bunwidth */
unsigned int
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -62,8 +62,8 @@ default_ident(char *s)
void
BATinit_idents(BAT *bn)
{
- bn->hident = (char *) BATstring_h; //="h"
- bn->tident = (char *) BATstring_t; //="t"
+ bn->hident = (char *) BATstring_h;
+ bn->tident = (char *) BATstring_t;
}
BATstore *
@@ -285,14 +285,6 @@ BATnewstorage(int ht, int tt, BUN cap, i
return bs;
}
-/**
- * Create new BAT
- * int ht: header type
- * int tt: tail type
- * BUN cap: BAT capacity
- * int role: TRANSIENT or PERSISTENT
- * Returns a new BAT
- */
BAT *
BATnew(int ht, int tt, BUN cap, int role)
{
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -2522,7 +2522,6 @@ project_##TYPE(BAT *bn, BAT *l, BAT *r,
} else if (*o < r->hseqbase || \
*o >= r->hseqbase + BATcount(r)) { \
GDKerror("BATproject: does not match always\n"); \
-fprintf(stderr, "Looking for %u , minimum oid=%u and in total %u\n", (unsigned
int)*o, (unsigned int)r->hseqbase, (unsigned int)BATcount(r));\
return GDK_FAIL; \
} else { \
v = rt[*o - r->hseqbase]; \
diff --git a/geom/ChangeLog.Jan2014 b/geom/ChangeLog.Jan2014
deleted file mode 100644
--- a/geom/ChangeLog.Jan2014
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for geom
-# This file is updated with Maddlog
-
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -1,20 +1,9 @@
/*
- * The contents of this file are subject to the MonetDB Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.monetdb.org/Legal/MonetDBLicense
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is the MonetDB Database System.
- *
- * The Initial Developer of the Original Code is CWI.
- * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2015 MonetDB B.V.
- * All Rights Reserved.
+ * Copyright 2008-2015 MonetDB B.V.
*/
/*
diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h
--- a/geom/monetdb5/geom.h
+++ b/geom/monetdb5/geom.h
@@ -1,20 +1,9 @@
/*
- * The contents of this file are subject to the MonetDB Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.monetdb.org/Legal/MonetDBLicense
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is the MonetDB Database System.
- *
- * The Initial Developer of the Original Code is CWI.
- * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2014 MonetDB B.V.
- * All Rights Reserved.
+ * Copyright 2008-2015 MonetDB B.V.
*/
/*
diff --git a/geom/monetdb5/geomBulk.c b/geom/monetdb5/geomBulk.c
--- a/geom/monetdb5/geomBulk.c
+++ b/geom/monetdb5/geomBulk.c
@@ -1,20 +1,9 @@
/*
- * The contents of this file are subject to the MonetDB Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.monetdb.org/Legal/MonetDBLicense
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is the MonetDB Database System.
- *
- * The Initial Developer of the Original Code is CWI.
- * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2014 MonetDB B.V.
- * All Rights Reserved.
+ * Copyright 2008-2015 MonetDB B.V.
*/
/*
diff --git a/java/ChangeLog.Jan2014 b/java/ChangeLog.Jan2014
deleted file mode 100644
--- a/java/ChangeLog.Jan2014
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for java
-# This file is updated with Maddlog
-
diff --git a/monetdb5/ChangeLog.Jan2014 b/monetdb5/ChangeLog.Jan2014
deleted file mode 100644
--- a/monetdb5/ChangeLog.Jan2014
+++ /dev/null
@@ -1,10 +0,0 @@
-# ChangeLog file for MonetDB5
-# This file is updated with Maddlog
-
-* Thu Jan 29 2015 Sjoerd Mullender <[email protected]>
-- Implemented batcalc.min and batcalc.max. Made calc.min and calc.max
- generic so that no other implementations are needed.
-
-* Fri Dec 19 2014 Sjoerd Mullender <[email protected]>
-- Removed function batcalc.ifthen.
-
diff --git a/monetdb5/mal/mal_instruction.h b/monetdb5/mal/mal_instruction.h
--- a/monetdb5/mal/mal_instruction.h
+++ b/monetdb5/mal/mal_instruction.h
@@ -170,7 +170,7 @@ mal_export InstrPtr pushArgument(MalBlkP
mal_export InstrPtr setArgument(MalBlkPtr mb, InstrPtr p, int idx, int varid);
mal_export InstrPtr pushReturn(MalBlkPtr mb, InstrPtr p, int varid);
mal_export InstrPtr pushArgumentId(MalBlkPtr mb, InstrPtr p, str name);
-mal_export void delArgument(InstrPtr p, int idx);
+mal_export void delArgument(InstrPtr p, int varid);
mal_export void setVarType(MalBlkPtr mb, int i, int tpe);
mal_export void clrAllTypes(MalBlkPtr mb);
mal_export void setArgType(MalBlkPtr mb, InstrPtr p, int i, int tpe);
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -444,7 +444,6 @@ callMAL(Client cntxt, MalBlkPtr mb, MalS
BBPincref(lhs->val.bval, TRUE);
}
stk->cmd = debug;
-
ret = runMALsequence(cntxt, mb, 1, 0, stk, 0, 0);
break;
case FACTORYsymbol:
diff --git a/monetdb5/mal/mal_scenario.c b/monetdb5/mal/mal_scenario.c
--- a/monetdb5/mal/mal_scenario.c
+++ b/monetdb5/mal/mal_scenario.c
@@ -527,7 +527,6 @@ runScenarioBody(Client c)
str msg= MAL_SUCCEED;
lng start;
-
c->exception_buf_initialized = 1;
if (setjmp( c->exception_buf) < 0)
c->mode = FINISHCLIENT;
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -416,8 +416,6 @@ MSserveClient(void *dummy)
MalBlkPtr mb;
Client c = (Client) dummy;
str msg = 0;
-//int i=0;
-//backend *be = (backend *) c->sqlcontext;
if (!isAdministrator(c) && MCinitClientThread(c) < 0) {
MCcloseClient(c);
@@ -445,7 +443,6 @@ MSserveClient(void *dummy)
c->mode = FINISHCLIENT + 1; /* == RUNCLIENT */
GDKfree(msg);
} else {
-
do {
do {
runScenario(c);
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -404,7 +404,6 @@ output_line_dense(char **buf, int *len,
int l;
if (f->c) {
- /* p contains the data read from BAT */
p = BUNtail(f->ci, f->p);
if (!p || ATOMcmp(f->adt, ATOMnilptr(f->adt), p) == 0) {
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -356,6 +356,7 @@ mat_apply2(MalBlkPtr mb, InstrPtr p, mat
for(k=1; k < mat[m].mi->argc; k++) {
InstrPtr q = copyInstruction(p);
+
getArg(q, 0) = newTmpVariable(mb, tpe);
getArg(q, mvar) = getArg(mat[m].mi, k);
getArg(q, nvar) = getArg(mat[n].mi, k);
@@ -1458,7 +1459,6 @@ OPTmergetableImplementation(Client cntxt
InstrPtr r;
p = old[i];
-
if (getModuleId(p) == matRef &&
(getFunctionId(p) == newRef || getFunctionId(p) == packRef)){
mat_set_prop(mb, p);
@@ -1651,7 +1651,6 @@ OPTmergetableImplementation(Client cntxt
/* subselect on insert, should use last tid only */
if (match == 1 && fm == 2 && isSubSelect(p) && p->retc == 1 &&
(m=is_a_mat(getArg(p,fm), mat, mtop)) >= 0) {
-
r = copyInstruction(p);
getArg(r, fm) = getArg(mat[m].mi, mat[m].mi->argc-1);
pushInstruction(mb, r);
@@ -1674,7 +1673,6 @@ OPTmergetableImplementation(Client cntxt
(m=is_a_mat(getArg(p,fm), mat, mtop)) >= 0 &&
(n=is_a_mat(getArg(p,fn), mat, mtop)) >= 0 &&
(o=is_a_mat(getArg(p,fo), mat, mtop)) >= 0){
-
assert(mat[m].mi->argc == mat[n].mi->argc);
if ((r = mat_apply3(mb, p, mat, m, n, o, fm, fn, fo))
!= NULL)
mtop = mat_add(mat, mtop, r, mat_type(mat, m),
getFunctionId(p));
@@ -1685,7 +1683,7 @@ OPTmergetableImplementation(Client cntxt
(m=is_a_mat(getArg(p,fm), mat, mtop)) >= 0 &&
(n=is_a_mat(getArg(p,fn), mat, mtop)) >= 0){
assert(mat[m].mi->argc == mat[n].mi->argc);
- if ((r = mat_apply2(mb, p, mat, m, n, fm, fn)) != NULL)
+ if ((r = mat_apply2(mb, p, mat, m, n, fm, fn)) != NULL)
mtop = mat_add(mat, mtop, r, mat_type(mat, m),
getFunctionId(p));
actions++;
continue;
@@ -1694,7 +1692,6 @@ OPTmergetableImplementation(Client cntxt
if (match == 1 && bats == 1 && (isFragmentGroup(p) ||
isMapOp(p) ||
(!getModuleId(p) && !getFunctionId(p) && p->barrier == 0 /*
simple assignment */)) && p->retc != 2 &&
(m=is_a_mat(getArg(p,fm), mat, mtop)) >= 0){
-
if ((r = mat_apply1(mb, p, mat, mtop, m, fm)) != NULL)
mtop = mat_add(mat, mtop, r, mat_type(mat, m),
getFunctionId(p));
actions++;
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -175,7 +175,6 @@ static struct PIPELINES {
"optimizer.generator();"
"optimizer.garbageCollector();",
"stable", NULL, NULL, 1},
-
/* sentinel */
{NULL, NULL, NULL, NULL, NULL, 0}
};
diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -55,7 +55,6 @@
#include "opt_reorder.h"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
