Changeset: c84ba985eb6a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c84ba985eb6a
Modified Files:
gdk/gdk_atoms.c
gdk/gdk_cbp.c
gdk/gdk_private.h
monetdb5/mal/mal_runtime.c
monetdb5/optimizer/opt_mergetable.c
Branch: headless
Log Message:
Post merge fixes.
diffs (93 lines):
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -37,7 +37,7 @@
#include "gdk_private.h"
#include <math.h> /* for INFINITY and NAN */
-int
+static int
bteCmp(bte *l, bte *r)
{
return simple_CMP(l, r, bte);
@@ -77,7 +77,7 @@ dblCmp(dbl *l, dbl *r)
* @- inline hash routines
* Return some positive integer derived from one atom value.
*/
-oid
+static oid
bteHash(bte *v)
{
return (oid) *(unsigned char *) v;
diff --git a/gdk/gdk_cbp.c b/gdk/gdk_cbp.c
--- a/gdk/gdk_cbp.c
+++ b/gdk/gdk_cbp.c
@@ -114,7 +114,7 @@ bat CBP_mask = 0; /* number of buckets
static void CBPspin(bat bid, str debug, int event);
static int CBPfree(COL *b, str calledFrom);
static int CBPdestroy(COL *b);
-static void CBPuncacheit_(bat bid, int unloaddesc);
+static void CBPuncacheit(bat bid, int unloaddesc);
static void CBPinitcache(void);
static int CBPprepare(bit subcommit);
static COL *getCBPdescriptor(bat i, int lock);
@@ -1192,7 +1192,7 @@ CBPinit(void)
* interference in a parallel session.
*/
-static wrd BBPrecycle_minsize(wrd val);
+static wrd CBPrecycle_minsize(wrd val);
void
CBPexit(void)
@@ -4130,3 +4130,4 @@ CBPatom_load(int atom)
}
CBPunlock("CBPatom_load");
}
+#endif
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -88,7 +88,7 @@ int CBPrecover(void);
void CBPunshare(bat b);
void CBPdump(void); /* never called: for debugging only */
void CBPdumpcache(void); /* never called: for debugging only */
-void MT_init_posix(int alloc_map);
+void MT_init_posix(void);
int MT_madvise(void *p, size_t len, int advice);
int MT_mmap_trim(size_t lim, void *err);
void MT_mmap_inform(void *p, size_t len, int preload, int pattern, int
writable);
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -57,7 +57,7 @@ runtimeProfileBegin(Client cntxt, MalBlk
mb->profiler[stkpc].clock= stk->clock;
/* emit the instruction upon start as well */
if ( evict )
- profilerEvent(cntxt->idx,mb,stk,stkpc);
+ profilerEvent(cntxt->idx,mb,stk,stkpc,"start");
#ifdef HAVE_TIMES
times(&stk->timer);
mb->profiler[stkpc].timer= stk->timer;
@@ -85,7 +85,7 @@ runtimeProfileExit(Client cntxt, MalBlkP
mb->profiler[stkpc].wbytes=
getVolume(stk,getInstrPtr(mb,stkpc),1);
}
if ( evict)
- profilerEvent(cntxt->idx,mb,stk,stkpc);
+ profilerEvent(cntxt->idx,mb,stk,stkpc,"done");
}
}
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
@@ -1404,8 +1404,7 @@ static void
mat_aggr(MalBlkPtr mb, InstrPtr p, mat_t *mat, int m)
{
MALtype tpe = getArgType(mb,p,0);
- MALtype coltpe = (getModuleId(p)==aggrRef)?newColType(tpe):tpe;
- int k, v = newTmpVariable(mb, coltpe);
+ int k, v = newTmpVariable(mb, tpe);
InstrPtr r = NULL, s = NULL, q = NULL;
OPTDEBUGmergetable {
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
