MonetDB: default - Merge from Jun2010 branch: Fix reference in a...

2010-06-01 Thread Sjoerd Mullender
Changeset: 7d70539ee951 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d70539ee951
Modified Files:

Branch: default
Log Message:

Merge from Jun2010 branch: Fix reference in array module.


diffs (12 lines):

diff -r d3570bb29148 -r 7d70539ee951 MonetDB5/src/modules/kernel/array.mx
--- a/MonetDB5/src/modules/kernel/array.mx  Tue Jun 01 14:23:49 2010 +0200
+++ b/MonetDB5/src/modules/kernel/array.mx  Tue Jun 01 16:37:36 2010 +0200
@@ -46,7 +46,7 @@
 comment  "Fills an index BAT, (grpcount,grpsize,clustersize,offset)";
 
 command grid(b:bat[:oid,:@1],i:@1,j:@1,k:@1,l:@1,s:@1) :bat[:oid,:@1] 
-address arraygridb...@1
+address arraygridbatshi...@1
 comment  "Fills an index BAT, (grpcount,grpsize,clustersize,offset)
 and shift all elemenets with a factor s";
 
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list


MonetDB: Jun2010 - Merge from Feb2010 branch: Fix reference in a...

2010-06-01 Thread Sjoerd Mullender
Changeset: 528327db2c29 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=528327db2c29
Modified Files:

Branch: Jun2010
Log Message:

Merge from Feb2010 branch: Fix reference in array module.


diffs (12 lines):

diff -r 6780f36b3855 -r 528327db2c29 MonetDB5/src/modules/kernel/array.mx
--- a/MonetDB5/src/modules/kernel/array.mx  Tue Jun 01 14:23:49 2010 +0200
+++ b/MonetDB5/src/modules/kernel/array.mx  Tue Jun 01 16:37:07 2010 +0200
@@ -46,7 +46,7 @@
 comment  "Fills an index BAT, (grpcount,grpsize,clustersize,offset)";
 
 command grid(b:bat[:oid,:@1],i:@1,j:@1,k:@1,l:@1,s:@1) :bat[:oid,:@1] 
-address arraygridb...@1
+address arraygridbatshi...@1
 comment  "Fills an index BAT, (grpcount,grpsize,clustersize,offset)
 and shift all elemenets with a factor s";
 
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list


MonetDB: Feb2010 - Fix reference in array module.

2010-06-01 Thread Sjoerd Mullender
Changeset: dcf50312dbc0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dcf50312dbc0
Modified Files:
MonetDB5/src/modules/kernel/array.mx
Branch: Feb2010
Log Message:

Fix reference in array module.


diffs (12 lines):

diff -r 17aafcd73449 -r dcf50312dbc0 MonetDB5/src/modules/kernel/array.mx
--- a/MonetDB5/src/modules/kernel/array.mx  Tue Jun 01 08:19:18 2010 +0200
+++ b/MonetDB5/src/modules/kernel/array.mx  Tue Jun 01 16:36:30 2010 +0200
@@ -46,7 +46,7 @@
 comment  "Fills an index BAT, (grpcount,grpsize,clustersize,offset)";
 
 command grid(b:bat[:oid,:@1],i:@1,j:@1,k:@1,l:@1,s:@1) :bat[:oid,:@1] 
-address arraygridb...@1
+address arraygridbatshi...@1
 comment  "Fills an index BAT, (grpcount,grpsize,clustersize,offset)
 and shift all elemenets with a factor s";
 
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list


MonetDB: default - Prevent buffer underflow and close string. A...

2010-06-01 Thread Sjoerd Mullender
Changeset: d3570bb29148 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d3570bb29148
Modified Files:

Branch: default
Log Message:

Prevent buffer underflow and close string.  Also recognize alternative record 
separator on Windows.
(transplanted from ec76161adec379b6b26c79f91279396cd9db2a53)
(transplanted from 6780f36b38554f9df3c9a1585bb6c9eb87559b51)

___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list


MonetDB: Jun2010 - Prevent buffer underflow and close string. A...

2010-06-01 Thread Sjoerd Mullender
Changeset: 6780f36b3855 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6780f36b3855
Modified Files:
buildtools/Mx/disclaimer.c
Branch: Jun2010
Log Message:

Prevent buffer underflow and close string.  Also recognize alternative record 
separator on Windows.
(transplanted from ec76161adec379b6b26c79f91279396cd9db2a53)


diffs (19 lines):

diff -r c567974cc99b -r 6780f36b3855 buildtools/Mx/disclaimer.c
--- a/buildtools/Mx/disclaimer.cTue Jun 01 11:37:25 2010 +0200
+++ b/buildtools/Mx/disclaimer.cTue Jun 01 14:23:49 2010 +0200
@@ -47,8 +47,14 @@
buf[0] = '\0';
strncat(buf, inputdir, 8096 - 1);
len = strlen(buf);
-   if (len < 8095 && buf[len - 1] != DIR_SEP)
+   if (len > 0 && len < 8095 && buf[len - 1] != DIR_SEP
+#ifdef WIN32
+   && buf[len - 1] != '/'
+#endif
+   ) {
buf[len++] = DIR_SEP;
+   buf[len] = 0;
+   }
/* search backwards, such that we can find the license.txt
 * file in the root of each module */
strncat(buf, filename, 8095 - len);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list


MonetDB: default - Prevent buffer underflow and close string. A...

2010-06-01 Thread Sjoerd Mullender
Changeset: ec76161adec3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec76161adec3
Modified Files:
buildtools/Mx/disclaimer.c
Branch: default
Log Message:

Prevent buffer underflow and close string.  Also recognize alternative record 
separator on Windows.


diffs (19 lines):

diff -r 135c86c30203 -r ec76161adec3 buildtools/Mx/disclaimer.c
--- a/buildtools/Mx/disclaimer.cTue Jun 01 13:24:26 2010 +0200
+++ b/buildtools/Mx/disclaimer.cTue Jun 01 14:23:49 2010 +0200
@@ -47,8 +47,14 @@
buf[0] = '\0';
strncat(buf, inputdir, 8096 - 1);
len = strlen(buf);
-   if (len < 8095 && buf[len - 1] != DIR_SEP)
+   if (len > 0 && len < 8095 && buf[len - 1] != DIR_SEP
+#ifdef WIN32
+   && buf[len - 1] != '/'
+#endif
+   ) {
buf[len++] = DIR_SEP;
+   buf[len] = 0;
+   }
/* search backwards, such that we can find the license.txt
 * file in the root of each module */
strncat(buf, filename, 8095 - len);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list


MonetDB: Jun2010 - Add test to prevent warning

2010-06-01 Thread Arjen de Rijke
Changeset: c567974cc99b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c567974cc99b
Modified Files:

Branch: Jun2010
Log Message:

Add test to prevent warning
(transplanted from 74ee41649425ef140bd53441c19bfe96014b21e7)


diffs (15 lines):

diff -r 22ab36b7873b -r c567974cc99b clients/src/php/native/lib/php_mapi.inc
--- a/clients/src/php/native/lib/php_mapi.inc   Tue Jun 01 11:51:17 2010 +0200
+++ b/clients/src/php/native/lib/php_mapi.inc   Tue Jun 01 11:37:25 2010 +0200
@@ -768,8 +768,10 @@
global $connection_pool;
 
$connections = array();
-   foreach($connection_pool as $conn) {
+   if ($connection_pool !== null) {
+   foreach($connection_pool as $conn) {
$connections[] = $conn["id"];
+   }
}
 
$id = hash("sha1", time());
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list


MonetDB: default - Fix previous fix: we need to look inside the ...

2010-06-01 Thread Sjoerd Mullender
Changeset: 135c86c30203 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=135c86c30203
Modified Files:
MonetDB/src/gdk/gdk_bbp.mx
Branch: default
Log Message:

Fix previous fix: we need to look inside the BAT and not use hp/tp since 
they're not set for logical decref.


diffs (15 lines):

diff -r fffaf17cfe20 -r 135c86c30203 MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mxTue Jun 01 12:34:02 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mxTue Jun 01 13:24:26 2010 +0200
@@ -2053,9 +2053,9 @@
 
if (b && destroy) {
int flag = 0;
-   if (hp == 0)
+   if (b->H->heap.parentid == 0)
flag |= USE_HEAD;
-   if (tp == 0)
+   if (b->T->heap.parentid == 0)
flag |= USE_TAIL;
if (flag)
BATaccessBegin(b, flag, MMAP_DONTNEED);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list


MonetDB: default - Merged from Jun2010

2010-06-01 Thread Fabian Groffen
Changeset: fffaf17cfe20 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fffaf17cfe20
Modified Files:

Branch: default
Log Message:

Merged from Jun2010


diffs (273 lines):

diff -r 74ee41649425 -r fffaf17cfe20 
sql/src/backends/monet5/merovingian/ChangeLog.Jun2010
--- a/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Tue Jun 01 
11:37:25 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Tue Jun 01 
12:34:02 2010 +0200
@@ -3,6 +3,21 @@
 
 #*June2010
 
+  01 Jun 2010; Fabian Groffen  merovingian.c, utils.c:
+  Fixed an issue where Merovingian's strict umask was applied too early
+  causing files to be inaccessible.  Now the .merovingian_control socket
+  file is accessible to both user and group of the merovingian process,
+  and the .mapi_socket file is accessible to everyone like a TCP socket
+  is.  Fixes bug #2550.
+
+  01 Jun 2010; Fabian Groffen  merovingian.c:
+  Properly clean up .merovingian_control file in dbfarm.
+
+  01 Jun 2010; Fabian Groffen  merovingian.1.in,
+  merovingian.c:
+  Removed database pre-starting (mis-)feature, any argument to
+  merovingian now yields in a version message followed by a server exit.
+
   07 Apr 2010; Fabian Groffen  monetdb.c:
   Sort output returned by discover, status and get commands based on url
   or dbname.
diff -r 74ee41649425 -r fffaf17cfe20 
sql/src/backends/monet5/merovingian/merovingian.1.in
--- a/sql/src/backends/monet5/merovingian/merovingian.1.in  Tue Jun 01 
11:37:25 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian.1.in  Tue Jun 01 
12:34:02 2010 +0200
@@ -1,12 +1,11 @@
 .\" Process this file with
 .\" groff -man -Tascii foo.1
 .\"
-.TH MEROVINGIAN 1 "APRIL 2010" Application "MonetDB Applications"
+.TH MEROVINGIAN 1 "JUNE 2010" Application "MonetDB Applications"
 .SH NAME
 merovingian \- the MonetDB Database Server daemon
 .SH SYNOPSIS
 .B merovingian
-[database ...]
 .SH DESCRIPTION
 .B merovingian
 is the MonetDB Database Server daemon.  It is not meant to be used in
@@ -37,14 +36,11 @@
 .B merovingian
 runs in the background, sending log messages to
 .IR @MERO_LOG@ ,
-until being sent a stop, terminate or interrupt signal.  All arguments
+until being sent a stop, terminate or interrupt signal.  Any arguments
 given when starting
 .B merovingian
-are considered to be databases to be pre-started.  Pre-started databases
-are started as part of the startup of
-.BR merovingian ,
-which means their startup is not delayed until the first client
-requests for them.
+cause the version to be printed followed by a shutdown of
+.BR merovingian .
 .P
 .B merovingian
 uses a neighbour discovery scheme to detect other
diff -r 74ee41649425 -r fffaf17cfe20 
sql/src/backends/monet5/merovingian/merovingian.c
--- a/sql/src/backends/monet5/merovingian/merovingian.c Tue Jun 01 11:37:25 
2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian.c Tue Jun 01 12:34:02 
2010 +0200
@@ -427,7 +427,6 @@
FILE *cnf = NULL, *pidfile = NULL;
char buf[1024];
char bufu[1024];
-   sabdb* stats = NULL;
dpair d;
int pfd[2];
int retfd = -1;
@@ -501,10 +500,6 @@
}
 #endif
 
-   /* Paranoia umask, but good, because why would people have to sniff
-* our private parts? */
-   umask(S_IRWXG | S_IRWXO);
-
/* hunt for the config file, and read it, allow the caller to
 * specify where to look using the MONETDB5CONF environment variable */
p = getenv("MONETDB5CONF");
@@ -518,13 +513,14 @@
/* store this conffile for later use in forkMserver */
_mero_conffile = p;
 
-#define MERO_EXIT(status) \
-   buf[0] = status; \
-   if (write(retfd, &buf, 1) != 1 || close(retfd) != 0) { \
+#define MERO_EXIT(status) { \
+   char s = status; \
+   if (write(retfd, &s, 1) != 1 || close(retfd) != 0) { \
Mfprintf(stderr, "could not write to parent\n"); \
} \
if (status != 0) \
-   return(status);
+   return(status); \
+}
 
readConfFile(ckv, cnf);
fclose(cnf);
@@ -667,6 +663,22 @@
MERO_EXIT(1);
}
 
+   /* figure out our hostname */
+   gethostname(_mero_hostname, 128);
+
+   if (argc > 1) {
+   Mfprintf(stderr, "Merovingian %s on host %s\n", MERO_VERSION,
+   _mero_hostname /*FIXME not yet set*/);
+   Mfprintf(stderr, "Using config file: %s\n", _mero_conffile);
+   Mfprintf(stderr, "  monitoring dbfarm: %s\n", dbfarm);
+   Mfprintf(stderr, "  forking mserver5: %s\n", _mero_mserver);
+   Mfprintf(stderr, "  allows remote control: %s\n",
+   (_mero_controlport != 0 ? "yes" : "no"));
+   Mfprintf(stderr, "  performs neighbour discovery: %s\n",
+   (discoveryport != 0 ? "yes" : "no"));
+   MERO_EXIT(1);
+   }
+
 

Re: MonetDB: default - Add test to prevent warning

2010-06-01 Thread Stefan Manegold
Arjen,

is this a fix that should also be include in the upcoming Jun2010 release?

If so, it would need to be back-ported to the Jun2010 branch ...

Stefan

On Tue, Jun 01, 2010 at 11:40:20AM +0200, Arjen de Rijke wrote:
> Changeset: 74ee41649425 for MonetDB
> URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=74ee41649425
> Modified Files:
>   clients/src/php/native/lib/php_mapi.inc
> Branch: default
> Log Message:
> 
> Add test to prevent warning
> 
> 
> diffs (15 lines):
> 
> diff -r 80afe14ca780 -r 74ee41649425 clients/src/php/native/lib/php_mapi.inc
> --- a/clients/src/php/native/lib/php_mapi.inc Tue Jun 01 10:02:37 2010 +0200
> +++ b/clients/src/php/native/lib/php_mapi.inc Tue Jun 01 11:37:25 2010 +0200
> @@ -768,8 +768,10 @@
>   global $connection_pool;
>  
>   $connections = array();
> - foreach($connection_pool as $conn) {
> + if ($connection_pool !== null) {
> + foreach($connection_pool as $conn) {
>   $connections[] = $conn["id"];
> + }
>   }
>  
>   $id = hash("sha1", time());
> ___
> Checkin-list mailing list
> Checkin-list@monetdb.org
> http://mail.monetdb.org/mailman/listinfo/checkin-list
> 

-- 
| Dr. Stefan Manegold | mailto:stefan.maneg...@cwi.nl |
| CWI,  P.O.Box 94079 | http://www.cwi.nl/~manegold/  |
| 1090 GB Amsterdam   | Tel.: +31 (20) 592-4212   |
| The Netherlands | Fax : +31 (20) 592-4199   |
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list


MonetDB: Jun2010 - Fix bug #2550 (file access permissions), clea...

2010-06-01 Thread Fabian Groffen
Changeset: 22ab36b7873b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22ab36b7873b
Modified Files:
sql/src/backends/monet5/merovingian/ChangeLog.Jun2010
sql/src/backends/monet5/merovingian/merovingian.1.in
sql/src/backends/monet5/merovingian/merovingian.c
sql/src/backends/monet5/merovingian/merovingian_connections.c
sql/src/backends/monet5/merovingian/utils.c
Branch: Jun2010
Log Message:

Fix bug #2550 (file access permissions), cleanup more, remove prestarting 
database feature


diffs (273 lines):

diff -r e09cdc4142b3 -r 22ab36b7873b 
sql/src/backends/monet5/merovingian/ChangeLog.Jun2010
--- a/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Tue Jun 01 
08:20:52 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Tue Jun 01 
11:51:17 2010 +0200
@@ -3,6 +3,21 @@
 
 #*June2010
 
+  01 Jun 2010; Fabian Groffen  merovingian.c, utils.c:
+  Fixed an issue where Merovingian's strict umask was applied too early
+  causing files to be inaccessible.  Now the .merovingian_control socket
+  file is accessible to both user and group of the merovingian process,
+  and the .mapi_socket file is accessible to everyone like a TCP socket
+  is.  Fixes bug #2550.
+
+  01 Jun 2010; Fabian Groffen  merovingian.c:
+  Properly clean up .merovingian_control file in dbfarm.
+
+  01 Jun 2010; Fabian Groffen  merovingian.1.in,
+  merovingian.c:
+  Removed database pre-starting (mis-)feature, any argument to
+  merovingian now yields in a version message followed by a server exit.
+
   07 Apr 2010; Fabian Groffen  monetdb.c:
   Sort output returned by discover, status and get commands based on url
   or dbname.
diff -r e09cdc4142b3 -r 22ab36b7873b 
sql/src/backends/monet5/merovingian/merovingian.1.in
--- a/sql/src/backends/monet5/merovingian/merovingian.1.in  Tue Jun 01 
08:20:52 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian.1.in  Tue Jun 01 
11:51:17 2010 +0200
@@ -1,12 +1,11 @@
 .\" Process this file with
 .\" groff -man -Tascii foo.1
 .\"
-.TH MEROVINGIAN 1 "APRIL 2010" Application "MonetDB Applications"
+.TH MEROVINGIAN 1 "JUNE 2010" Application "MonetDB Applications"
 .SH NAME
 merovingian \- the MonetDB Database Server daemon
 .SH SYNOPSIS
 .B merovingian
-[database ...]
 .SH DESCRIPTION
 .B merovingian
 is the MonetDB Database Server daemon.  It is not meant to be used in
@@ -37,14 +36,11 @@
 .B merovingian
 runs in the background, sending log messages to
 .IR @MERO_LOG@ ,
-until being sent a stop, terminate or interrupt signal.  All arguments
+until being sent a stop, terminate or interrupt signal.  Any arguments
 given when starting
 .B merovingian
-are considered to be databases to be pre-started.  Pre-started databases
-are started as part of the startup of
-.BR merovingian ,
-which means their startup is not delayed until the first client
-requests for them.
+cause the version to be printed followed by a shutdown of
+.BR merovingian .
 .P
 .B merovingian
 uses a neighbour discovery scheme to detect other
diff -r e09cdc4142b3 -r 22ab36b7873b 
sql/src/backends/monet5/merovingian/merovingian.c
--- a/sql/src/backends/monet5/merovingian/merovingian.c Tue Jun 01 08:20:52 
2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian.c Tue Jun 01 11:51:17 
2010 +0200
@@ -427,7 +427,6 @@
FILE *cnf = NULL, *pidfile = NULL;
char buf[1024];
char bufu[1024];
-   sabdb* stats = NULL;
dpair d;
int pfd[2];
int retfd = -1;
@@ -501,10 +500,6 @@
}
 #endif
 
-   /* Paranoia umask, but good, because why would people have to sniff
-* our private parts? */
-   umask(S_IRWXG | S_IRWXO);
-
/* hunt for the config file, and read it, allow the caller to
 * specify where to look using the MONETDB5CONF environment variable */
p = getenv("MONETDB5CONF");
@@ -518,13 +513,14 @@
/* store this conffile for later use in forkMserver */
_mero_conffile = p;
 
-#define MERO_EXIT(status) \
-   buf[0] = status; \
-   if (write(retfd, &buf, 1) != 1 || close(retfd) != 0) { \
+#define MERO_EXIT(status) { \
+   char s = status; \
+   if (write(retfd, &s, 1) != 1 || close(retfd) != 0) { \
Mfprintf(stderr, "could not write to parent\n"); \
} \
if (status != 0) \
-   return(status);
+   return(status); \
+}
 
readConfFile(ckv, cnf);
fclose(cnf);
@@ -667,6 +663,22 @@
MERO_EXIT(1);
}
 
+   /* figure out our hostname */
+   gethostname(_mero_hostname, 128);
+
+   if (argc > 1) {
+   Mfprintf(stderr, "Merovingian %s on host %s\n", MERO_VERSION,
+   _mero_hostname /*FIXME not yet set*/);
+   Mfprintf(stderr, "Using config file: %s\n", _mero_conffile);
+   Mfprintf(stderr, "  monitoring dbfarm: %s\n", dbfarm);
+   Mfprintf(stderr, "  forki

MonetDB: default - Add test to prevent warning

2010-06-01 Thread Arjen de Rijke
Changeset: 74ee41649425 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=74ee41649425
Modified Files:
clients/src/php/native/lib/php_mapi.inc
Branch: default
Log Message:

Add test to prevent warning


diffs (15 lines):

diff -r 80afe14ca780 -r 74ee41649425 clients/src/php/native/lib/php_mapi.inc
--- a/clients/src/php/native/lib/php_mapi.inc   Tue Jun 01 10:02:37 2010 +0200
+++ b/clients/src/php/native/lib/php_mapi.inc   Tue Jun 01 11:37:25 2010 +0200
@@ -768,8 +768,10 @@
global $connection_pool;
 
$connections = array();
-   foreach($connection_pool as $conn) {
+   if ($connection_pool !== null) {
+   foreach($connection_pool as $conn) {
$connections[] = $conn["id"];
+   }
}
 
$id = hash("sha1", time());
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list


MonetDB: default - Don't flush parent's heap. Remove unnecessar...

2010-06-01 Thread Sjoerd Mullender
Changeset: 80afe14ca780 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=80afe14ca780
Modified Files:
MonetDB/src/gdk/gdk_bbp.mx
Branch: default
Log Message:

Don't flush parent's heap.  Remove unnecessary call to BBPquickdesc.


diffs (20 lines):

diff -r ffac5d51ac0f -r 80afe14ca780 MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mxTue Jun 01 08:21:49 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mxTue Jun 01 10:02:37 2010 +0200
@@ -2051,9 +2051,14 @@
if (swap) {
int destroy = BBP_lrefs(i) == 0 && (BBP_status(i) & BBPDELETED) 
== 0;
 
-   b = BBPquickdesc(i, TRUE);
if (b && destroy) {
-   BATaccessBegin(b, USE_HEAD | USE_TAIL, MMAP_DONTNEED);
+   int flag = 0;
+   if (hp == 0)
+   flag |= USE_HEAD;
+   if (tp == 0)
+   flag |= USE_TAIL;
+   if (flag)
+   BATaccessBegin(b, flag, MMAP_DONTNEED);
BBPdestroy(b);  /* free memory (if loaded) and delete 
from disk (if transient but saved) */
} else if (b) {
BATDEBUG {
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list