Changeset: 4a72c7af211e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a72c7af211e
Modified Files:
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/tablet.mx
Branch: Apr2011
Log Message:
Partial undo of changeset 33758bbc2356.
Don't remove histogram reference from Apr2011 branch.
diffs (48 lines):
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -41,6 +41,7 @@
constraints.mx \
factories.mx \
groupby.mx \
+ histogram.mx \
inspect.mx \
language.mx \
mal_io.mx \
@@ -74,7 +75,7 @@
profiler.mx const.mx attach.mx batExtensions.mx
algebraExtensions.mx \
inspect.mx manual.mx mal_io.mx pqueue.mx mkey.mx \
chopper.mx clients.mx \
- factories.mx groupby.mx mdb.mx pcre.mx tablet.mx mat.mx \
+ factories.mx groupby.mx mdb.mx pcre.mx tablet.mx mat.mx
histogram.mx \
urlbox.mx statistics.mx transaction.mx \
mal_mapi.mx sabaoth.mx remote.mx \
bpm.mx txtsim.mx recycle.mx \
diff --git a/monetdb5/modules/mal/tablet.mx b/monetdb5/modules/mal/tablet.mx
--- a/monetdb5/modules/mal/tablet.mx
+++ b/monetdb5/modules/mal/tablet.mx
@@ -379,6 +379,7 @@
#include <mal_client.h>
#include <mal_interpreter.h>
#include <mapi.h> /* for PROMPT1, PROMPT2 */
+#include "histogram.h"
#ifdef WIN32
#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5)
@@ -408,6 +409,7 @@
int adt; /* type index */
BAT *c[SLICES]; /* set to NULL when scalar is meant */
BATiter ci[SLICES];
+ Histogram histogram[SLICES];
BAT *bin[BINS];
BUN p;
unsigned int tabs; /* field size in tab positions */
@@ -2351,6 +2353,8 @@
c->tabs = 0;
for(i=0;i<SLICES;i++)
c->c[i] = NULL;
+ for(i=0;i<SLICES;i++)
+ c->histogram[i] = NULL;
for(i=0;i<BINS;i++)
c->bin[i] = NULL;
c->p = 0;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
