Changeset: c30948300d29 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c30948300d29
Modified Files:
monetdb5/extras/compiler/mal_compiler.mx
monetdb5/extras/crackers/crackers_joins.mx
monetdb5/mal/mal_type.mx
monetdb5/modules/mal/algebraExtensions.mx
monetdb5/modules/mal/batExtensions.mx
monetdb5/modules/mal/bbp.mx
monetdb5/modules/mal/bpm.mx
monetdb5/modules/mal/mal_init.mx
monetdb5/modules/mal/recycle.mx
monetdb5/modules/mal/tokenizer.mx
monetdb5/modules/mal/transaction.mx
Branch: headless
Log Message:
Propagation of bat5 ->column
diffs (135 lines):
diff --git a/monetdb5/extras/compiler/mal_compiler.mx
b/monetdb5/extras/compiler/mal_compiler.mx
--- a/monetdb5/extras/compiler/mal_compiler.mx
+++ b/monetdb5/extras/compiler/mal_compiler.mx
@@ -165,7 +165,7 @@
"#include \"kernel/alarm.h\"\n",
"#include \"kernel/algebra.h\"\n",
"#include \"kernel/array.h\"\n",
- "#include \"kernel/bat5.h\"\n",
+ "#include \"kernel/column.h\"\n",
"#include \"kernel/batcalc.h\"\n",
"#include \"kernel/batcast.h\"\n",
"#include \"kernel/batifthen.h\"\n",
diff --git a/monetdb5/extras/crackers/crackers_joins.mx
b/monetdb5/extras/crackers/crackers_joins.mx
--- a/monetdb5/extras/crackers/crackers_joins.mx
+++ b/monetdb5/extras/crackers/crackers_joins.mx
@@ -82,7 +82,7 @@
@c
#include "monetdb_config.h"
#include "crackers.h"
-#include "bat5.h"
+#include "column.h"
#define SAMPLE_TRESHOLD_LOG 17
#define SAMPLE_SLICE_SIZE 1000
diff --git a/monetdb5/mal/mal_type.mx b/monetdb5/mal/mal_type.mx
--- a/monetdb5/mal/mal_type.mx
+++ b/monetdb5/mal/mal_type.mx
@@ -51,8 +51,9 @@
#define TMPMARKER '_'
#define REFMARKER 'X'
-#define newColType(T) (1<<16 | (T & 0377) )
-#define getType(X) (X & 0377 )
+#define newColType(X) (1<<16 | (X & 0377) )
+#define getColType(X) (X & 0377 )
+#define setAnyIndex(X,I) X |= ((I & 017)<<22);
#define newBatType(H,T) (1<<16 | (((H & 0377) <<8) | (T & 0377) ))
#define getHeadType(X) ((X>>8) & 0377 )
diff --git a/monetdb5/modules/mal/algebraExtensions.mx
b/monetdb5/modules/mal/algebraExtensions.mx
--- a/monetdb5/modules/mal/algebraExtensions.mx
+++ b/monetdb5/modules/mal/algebraExtensions.mx
@@ -45,7 +45,7 @@
#include "mal_box.h"
#include "mal_client.h"
#include "mal_interpreter.h"
-#include "bat5.h"
+#include "column.h"
#include "algebra.h"
#ifdef WIN32
diff --git a/monetdb5/modules/mal/batExtensions.mx
b/monetdb5/modules/mal/batExtensions.mx
--- a/monetdb5/modules/mal/batExtensions.mx
+++ b/monetdb5/modules/mal/batExtensions.mx
@@ -100,7 +100,7 @@
#include "mal_box.h"
#include "mal_client.h"
#include "mal_interpreter.h"
-#include "bat5.h"
+#include "column.h"
#include "algebra.h"
#ifdef WIN32
diff --git a/monetdb5/modules/mal/bbp.mx b/monetdb5/modules/mal/bbp.mx
--- a/monetdb5/modules/mal/bbp.mx
+++ b/monetdb5/modules/mal/bbp.mx
@@ -224,7 +224,7 @@
#include "mal_client.h"
#include "mal_interpreter.h"
#include "mal_profiler.h"
-#include "bat5.h"
+#include "column.h"
#ifdef WIN32
#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5)
diff --git a/monetdb5/modules/mal/bpm.mx b/monetdb5/modules/mal/bpm.mx
--- a/monetdb5/modules/mal/bpm.mx
+++ b/monetdb5/modules/mal/bpm.mx
@@ -602,7 +602,7 @@
@c
#include "monetdb_config.h"
#include "bpm.h"
-#include "bat5.h"
+#include "column.h"
#include "algebra.h"
#include "mal_builder.h"
#define _USE_MATH_DEFINES /* needed to get M_PI on Windows */
diff --git a/monetdb5/modules/mal/mal_init.mx b/monetdb5/modules/mal/mal_init.mx
--- a/monetdb5/modules/mal/mal_init.mx
+++ b/monetdb5/modules/mal/mal_init.mx
@@ -48,7 +48,7 @@
@-
The kernel stuff to make it work
@mal
-include bat5;
+include column;
include batExtensions;
include algebra;
include algebraExtensions;
diff --git a/monetdb5/modules/mal/recycle.mx b/monetdb5/modules/mal/recycle.mx
--- a/monetdb5/modules/mal/recycle.mx
+++ b/monetdb5/modules/mal/recycle.mx
@@ -126,7 +126,7 @@
#include "mal.h"
#include "mal_instruction.h"
-#include "bat5.h"
+#include "column.h"
#ifdef WIN32
#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5)
diff --git a/monetdb5/modules/mal/tokenizer.mx
b/monetdb5/modules/mal/tokenizer.mx
--- a/monetdb5/modules/mal/tokenizer.mx
+++ b/monetdb5/modules/mal/tokenizer.mx
@@ -130,7 +130,7 @@
@c
#include "monetdb_config.h"
-#include "bat5.h"
+#include "column.h"
#include "tokenizer.h"
#include "mal_linker.h"
diff --git a/monetdb5/modules/mal/transaction.mx
b/monetdb5/modules/mal/transaction.mx
--- a/monetdb5/modules/mal/transaction.mx
+++ b/monetdb5/modules/mal/transaction.mx
@@ -70,7 +70,7 @@
#include "gdk.h"
#include "mal.h"
#include "mal_interpreter.h"
-#include "bat5.h"
+#include "column.h"
#ifdef WIN32
#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
