Changeset: b9abd001c0af for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b9abd001c0af
Modified Files:
Branch: default
Log Message:
Merge with Apr2011 branch.
diffs (262 lines):
diff --git a/gdk/gdk_atoms.mx b/gdk/gdk_atoms.mx
--- a/gdk/gdk_atoms.mx
+++ b/gdk/gdk_atoms.mx
@@ -31,7 +31,6 @@
@h
#ifndef _GDK_ATOMS_H_
#define _GDK_ATOMS_H_
-#include "gdk.h"
#define MAXATOMS 128
diff --git a/gdk/gdk_bat.mx b/gdk/gdk_bat.mx
--- a/gdk/gdk_bat.mx
+++ b/gdk/gdk_bat.mx
@@ -54,8 +54,6 @@
#ifndef _GDK_BAT_H_
#define _GDK_BAT_H_
-#include "gdk.h"
-
gdk_export void BATinit_idents(BAT *bn);
gdk_export BUN void_replace_bat(BAT *b, BAT *u, bit force);
gdk_export int void_inplace(BAT *b, oid id, ptr val, bit force);
diff --git a/gdk/gdk_delta.mx b/gdk/gdk_delta.mx
--- a/gdk/gdk_delta.mx
+++ b/gdk/gdk_delta.mx
@@ -33,7 +33,6 @@
@h
#ifndef _GDK_DELTA_H_
#define _GDK_DELTA_H_
-#include "gdk.h"
@-
We make sure here that the BUNs section of a BAT at least starts
diff --git a/gdk/gdk_heap.mx b/gdk/gdk_heap.mx
--- a/gdk/gdk_heap.mx
+++ b/gdk/gdk_heap.mx
@@ -352,9 +352,9 @@
int exceeds_swap = size > (tot + tot - MIN(tot + tot, cur));
int can_mmap = h->filename && (size >= GDK_mem_bigsize ||
h->newstorage != STORE_MEM);
int small_cpy = (h->size * 4 < size) && (size >=
GDK_mmap_minsize);
- /* the commented condition is to use explicit MMAP
- instead of anonymous MMAP in GDKmalloc */
- int must_mmap = can_mmap && (small_cpy || exceeds_swap ||
h->newstorage != STORE_MEM /* || size >= GDK_mem_bigsize */ );
+ /* the last condition is to use explicit MMAP instead
+ of anonymous MMAP in GDKmalloc */
+ int must_mmap = can_mmap && (small_cpy || exceeds_swap ||
h->newstorage != STORE_MEM || size >= GDK_mem_bigsize);
h->size = size;
diff --git a/gdk/gdk_logger.mx b/gdk/gdk_logger.mx
--- a/gdk/gdk_logger.mx
+++ b/gdk/gdk_logger.mx
@@ -73,8 +73,6 @@
#define LOG_OK 0
#define LOG_ERR (-1)
-#include <gdk.h>
-
typedef struct logaction {
int type; /* type of change */
int nr;
@@ -173,6 +171,7 @@
#endif /*_LOGGER_H_*/
@c
#include "monetdb_config.h"
+#include "gdk.h"
#include "gdk_logger.h"
#include <string.h>
diff --git a/gdk/gdk_rangejoin.mx b/gdk/gdk_rangejoin.mx
--- a/gdk/gdk_rangejoin.mx
+++ b/gdk/gdk_rangejoin.mx
@@ -29,8 +29,6 @@
#ifndef GDK_RANGEJOIN_H
#define GDK_RANGEJOIN_H
-#include "gdk.h"
-
@- BAT range and band join operators
The @%BATbandjoin@ produces the associations [A, D] such that S.C-c1 <=
R.b <= S.C + c2. The special case c1 = 0 and c2 = infinite leads to a
@@ -57,6 +55,7 @@
@c
#include "monetdb_config.h"
+#include "gdk.h"
#include "gdk_rangejoin.h"
@{
diff --git a/gdk/gdk_scanselect.mx b/gdk/gdk_scanselect.mx
--- a/gdk/gdk_scanselect.mx
+++ b/gdk/gdk_scanselect.mx
@@ -102,7 +102,6 @@
@h
#ifndef _GDK_SCANSELECT_H
#define _GDK_SCANSELECT_H
-#include "gdk.h"
@- "Tools"
First, we need some tools. These are the type-expanded replacements
diff --git a/gdk/gdk_search.mx b/gdk/gdk_search.mx
--- a/gdk/gdk_search.mx
+++ b/gdk/gdk_search.mx
@@ -67,7 +67,6 @@
@h
#ifndef _GDK_SEARCH_H_
#define _GDK_SEARCH_H_
-#include "gdk.h"
@}
@+ Hash indexing
This is a highly efficient implementation of simple bucket-chained hashing.
diff --git a/gdk/gdk_setop.mx b/gdk/gdk_setop.mx
--- a/gdk/gdk_setop.mx
+++ b/gdk/gdk_setop.mx
@@ -61,7 +61,6 @@
@h
#ifndef _GDK_SETOP_H
#define _GDK_SETOP_H
-#include "gdk.h"
#define HITk(t1,t2) TRUE
#define HITs(t1,t2) ((*cmp)(t1,t2) == 0)
diff --git a/gdk/gdk_storage.mx b/gdk/gdk_storage.mx
--- a/gdk/gdk_storage.mx
+++ b/gdk/gdk_storage.mx
@@ -38,7 +38,6 @@
@h
#ifndef _GDK_STORAGE_H_
#define _GDK_STORAGE_H_
-#include "gdk.h"
extern void DESCclean(BAT *);
extern int DESCsetmodes(BAT *b);
diff --git a/gdk/gdk_tm.mx b/gdk/gdk_tm.mx
--- a/gdk/gdk_tm.mx
+++ b/gdk/gdk_tm.mx
@@ -29,7 +29,6 @@
@h
#ifndef _GDK_TM_H_
#define _GDK_TM_H_
-#include "gdk.h"
#define SYSTRANSACTION "tmp"
#define MAXTM 10
diff --git a/monetdb5/mal/mal.mx b/monetdb5/mal/mal.mx
--- a/monetdb5/mal/mal.mx
+++ b/monetdb5/mal/mal.mx
@@ -180,7 +180,6 @@
#define _MAL_H
#include <gdk.h>
-#include <gdk_utils.h>
#ifdef WIN32
#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5)
diff --git a/monetdb5/modules/kernel/logger.mx
b/monetdb5/modules/kernel/logger.mx
--- a/monetdb5/modules/kernel/logger.mx
+++ b/monetdb5/modules/kernel/logger.mx
@@ -80,6 +80,7 @@
@+ Implementation Code
@c
#include "monetdb_config.h"
+#include "gdk.h"
#include "gdk_logger.h"
#include "mal.h"
#include "mal_exception.h"
diff --git a/monetdb5/modules/mal/pma.mx b/monetdb5/modules/mal/pma.mx
--- a/monetdb5/modules/mal/pma.mx
+++ b/monetdb5/modules/mal/pma.mx
@@ -94,7 +94,6 @@
#endif
#include <gdk.h>
-#include <gdk_atoms.h>
pma_export str PMAnew_wrd(bat *res, int *tpe, wrd *sz);
@= pma_decl
pma_export str PMAins_@1(oid *pos_res, bat *b, oid *pos, @1 *val);
@@ -119,7 +118,6 @@
@c
#include "monetdb_config.h"
#include "mal_exception.h"
-#include <gdk_utils.h>
#include "pma.h"
#include <math.h>
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
@@ -504,7 +504,6 @@
#include <string.h>
#include <ctype.h>
-#include <gdk_posix.h>
#define CLEAR(X) if(X) {GDKfree(X);X = NULL;}
#define isScalar(C) C->adt != TYPE_bat
diff --git a/monetdb5/modules/mal/tablet_sql.mx
b/monetdb5/modules/mal/tablet_sql.mx
--- a/monetdb5/modules/mal/tablet_sql.mx
+++ b/monetdb5/modules/mal/tablet_sql.mx
@@ -51,7 +51,6 @@
#include <string.h>
#include <ctype.h>
-#include <gdk_posix.h>
/* #define _DEBUG_TABLET_*/
/* #define MLOCK_TST did not make a difference on sf10 */
diff --git a/sql/jdbc/tests/Tests/Test_PSlargeamount.stable.out
b/sql/jdbc/tests/Tests/Test_PSlargeamount.stable.out
--- a/sql/jdbc/tests/Tests/Test_PSlargeamount.stable.out
+++ b/sql/jdbc/tests/Tests/Test_PSlargeamount.stable.out
@@ -90,6 +90,50 @@
53000, true
54000, true
55000, true
+56000, true
+57000, true
+58000, true
+59000, true
+60000, true
+61000, true
+62000, true
+63000, true
+64000, true
+65000, true
+66000, true
+67000, true
+68000, true
+69000, true
+70000, true
+71000, true
+72000, true
+73000, true
+74000, true
+75000, true
+76000, true
+77000, true
+78000, true
+79000, true
+80000, true
+81000, true
+82000, true
+83000, true
+84000, true
+85000, true
+86000, true
+87000, true
+88000, true
+89000, true
+90000, true
+91000, true
+92000, true
+93000, true
+94000, true
+95000, true
+96000, true
+97000, true
+98000, true
+99000, true
# 10:52:24 >
# 10:52:24 > Done.
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
