date:20100617

MonetDB: default - merge with Jun2010

2010-06-17 Thread Stefan Manegold

Changeset: 2ec4097dee10 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ec4097dee10
Modified Files:
MonetDB/src/gdk/gdk_posix.mx
Branch: default
Log Message:

merge with Jun2010

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

MonetDB: Jun2010 - use MAP_ANONYMOUS instead of deprecated MAP_ANON

2010-06-17 Thread Stefan Manegold

Changeset: 50b5de4c9d96 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50b5de4c9d96
Modified Files:
MonetDB/src/gdk/gdk_posix.mx
Branch: Jun2010
Log Message:

use MAP_ANONYMOUS instead of deprecated MAP_ANON


diffs (14 lines):

diff -r 4969ca46ac20 -r 50b5de4c9d96 MonetDB/src/gdk/gdk_posix.mx
--- a/MonetDB/src/gdk/gdk_posix.mx  Thu Jun 17 14:23:48 2010 +0200
+++ b/MonetDB/src/gdk/gdk_posix.mx  Thu Jun 17 22:37:37 2010 +0200
@@ -2101,8 +2101,8 @@
 
 #define MT_PAGESIZE(s) s)-1)/MT_pagesize()+1)*MT_pagesize())
 
-#if defined(MAP_ANON)
-#define MMAP_FLAGS(f)  f|MAP_ANON
+#if defined(MAP_ANONYMOUS)
+#define MMAP_FLAGS(f)  f|MAP_ANONYMOUS
 #define MMAP_FD-1
 #define MMAP_OPEN_DEV_ZERO int fd = 1
 #define MMAP_CLOSE_DEV_ZERO(void)fd
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Re: MonetDB: default - MAP_ANONYMOUS instead of MAP_ANON

2010-06-17 Thread Stefan Manegold

Niels,

is this just precaution --- `man mmap` says
"
   MAP_ANON
  Synonym for MAP_ANONYMOUS.  Deprecated.
"
--- or bug fix that should be back-ported to the Jun2010 branch
(I could do that)?

Thanks.
Stefan

On Thu, Jun 17, 2010 at 09:47:40PM +0200, Niels Nes wrote:
> Changeset: 57878a477b7c for MonetDB
> URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57878a477b7c
> Modified Files:
>   MonetDB/src/gdk/gdk_posix.mx
> Branch: default
> Log Message:
> 
> MAP_ANONYMOUS instead of MAP_ANON
> 
> 
> diffs (14 lines):
> 
> diff -r 99d16aff6ce6 -r 57878a477b7c MonetDB/src/gdk/gdk_posix.mx
> --- a/MonetDB/src/gdk/gdk_posix.mxThu Jun 17 14:39:08 2010 +0200
> +++ b/MonetDB/src/gdk/gdk_posix.mxThu Jun 17 21:47:00 2010 +0200
> @@ -2105,8 +2105,8 @@
>  
>  #define MT_PAGESIZE(s)   
> s)-1)/MT_pagesize()+1)*MT_pagesize())
>  
> -#if defined(MAP_ANON)
> -#define MMAP_FLAGS(f)f|MAP_ANON
> +#if defined(MAP_ANONYMOUS)
> +#define MMAP_FLAGS(f)f|MAP_ANONYMOUS
>  #define MMAP_FD  -1
>  #define MMAP_OPEN_DEV_ZERO   int fd = 1
>  #define MMAP_CLOSE_DEV_ZERO  (void)fd
> ___
> 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: default - MAP_ANONYMOUS instead of MAP_ANON

2010-06-17 Thread Niels Nes

Changeset: 57878a477b7c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57878a477b7c
Modified Files:
MonetDB/src/gdk/gdk_posix.mx
Branch: default
Log Message:

MAP_ANONYMOUS instead of MAP_ANON


diffs (14 lines):

diff -r 99d16aff6ce6 -r 57878a477b7c MonetDB/src/gdk/gdk_posix.mx
--- a/MonetDB/src/gdk/gdk_posix.mx  Thu Jun 17 14:39:08 2010 +0200
+++ b/MonetDB/src/gdk/gdk_posix.mx  Thu Jun 17 21:47:00 2010 +0200
@@ -2105,8 +2105,8 @@
 
 #define MT_PAGESIZE(s) s)-1)/MT_pagesize()+1)*MT_pagesize())
 
-#if defined(MAP_ANON)
-#define MMAP_FLAGS(f)  f|MAP_ANON
+#if defined(MAP_ANONYMOUS)
+#define MMAP_FLAGS(f)  f|MAP_ANONYMOUS
 #define MMAP_FD-1
 #define MMAP_OPEN_DEV_ZERO int fd = 1
 #define MMAP_CLOSE_DEV_ZERO(void)fd
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010 branch.

2010-06-17 Thread Sjoerd Mullender

Changeset: 99d16aff6ce6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99d16aff6ce6
Modified Files:

Branch: default
Log Message:

Merge from Jun2010 branch.


diffs (166 lines):

diff -r 4d32d055c1ea -r 99d16aff6ce6 clients/NT/Makefile
--- a/clients/NT/Makefile   Thu Jun 17 13:47:19 2010 +0200
+++ b/clients/NT/Makefile   Thu Jun 17 14:39:08 2010 +0200
@@ -19,7 +19,7 @@
 IBITS = 64
 !ENDIF
 
-all: "$(SRCDIR)\Makefile.msc" all-msc $(UNISTD_H) inttypes.h Runmclient.bat 
RunMtest.bat RunMapprove.bat
+all: "$(SRCDIR)\Makefile.msc" all-msc $(UNISTD_H) inttypes.h Runmclient.bat 
RunMtest.bat RunMapprove.bat .monetdb
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" 
"bits=$(bits)" all
 
 check: "$(SRCDIR)\Makefile.msc"
@@ -30,6 +30,7 @@
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" 
"bits=$(bits)" install
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) ..\NT\mclient.bat 
"$(prefix)"
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) ..\NT\msqldump.bat 
"$(prefix)"
+   $(INSTALL) .monetdb "$(sysconfdir)"
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln "$(prefix)"
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj "$(prefix)"
-if exist "C:\Program Files (x86)" if "$(bits)" == "32" 
C:\cygwin\bin\sed.exe -i "s/Program Files/Program Files (x86)/" 
"$(prefix)\$(INSTALLER)$(IBITS).vdproj"
@@ -74,6 +75,10 @@
$(ECHO) typedef int int32_t; >> inttypes.h
$(ECHO) typedef unsigned int uint32_t; >> inttypes.h
 
+.monetdb:
+   $(ECHO) user=monetdb> .monetdb
+   $(ECHO) password=monetdb>> .monetdb
+
 Runmclient.bat: "$(SRCDIR)\Runmclient.bat.in"
$(CONFIGURE) "$(SRCDIR)\Runmclient.bat.in" > Runmclient.bat
 
diff -r 4d32d055c1ea -r 99d16aff6ce6 
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun 
17 13:47:19 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun 
17 14:39:08 2010 +0200
@@ -813,6 +813,12 @@
 }
 "Entry"
 {
+"MsmKey" = "8:_E37FEE23A93548469BB7560D5524BD93"
+"OwnerKey" = "8:_UNDEFINED"
+"MsmSig" = "8:_UNDEFINED"
+}
+"Entry"
+{
 "MsmKey" = "8:_E4A29EC2213B4C99B49B7AC34E99F880"
 "OwnerKey" = "8:_UNDEFINED"
 "MsmSig" = "8:_UNDEFINED"
@@ -3654,6 +3660,26 @@
 "IsDependency" = "11:FALSE"
 "IsolateTo" = "8:"
 }
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E37FEE23A93548469BB7560D5524BD93"
+{
+"SourcePath" = "8:etc\\.monetdb"
+"TargetName" = "8:.monetdb"
+"Tag" = "8:"
+"Folder" = "8:_B5DFB5D13EE441F8B42616036AACB603"
+"Condition" = "8:"
+"Transitive" = "11:FALSE"
+"Vital" = "11:TRUE"
+"ReadOnly" = "11:FALSE"
+"Hidden" = "11:FALSE"
+"System" = "11:FALSE"
+"Permanent" = "11:FALSE"
+"SharedLegacy" = "11:FALSE"
+"PackageAs" = "3:1"
+"Register" = "3:1"
+"Exclude" = "11:FALSE"
+"IsDependency" = "11:FALSE"
+"IsolateTo" = "8:"
+}
 
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E4A29EC2213B4C99B49B7AC34E99F880"
 {
 "SourcePath" = "8:C:\\iconv-1.11.1.win32\\bin\\iconv.dll"
@@ -4371,7 +4397,7 @@
 
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3"
 {
 "Name" = "8:MonetDB XQuery Client"
-"Arguments" = "8:--language=xquery --encoding=cp437"
+"Arguments" = "8:/STARTED-FROM-MENU --language=xquery 
--encoding=cp437"
 "Description" = "8:"
 "ShowCmd" = "3:1"
 "IconIndex" = "3:0"
diff -r 4d32d055c1ea -r 99d16aff6ce6 
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj  Thu Jun 
17 13:47:19 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj  Thu Jun 
17 14:39:08 2010 +0200
@@ -51,6 +51,12 @@
 }
 "Entry"
 {
+"MsmKey" = "8:_0EF9137A18874950B2B979E4A3D14364"
+"OwnerKey" = "8:_UNDEFINED"
+"MsmSig" = "8:_UNDEFINED"
+}
+"Entry"
+{
 "MsmKey" = "8:_0F0962C21371457C8ABE0A563FC8A41A"
 "OwnerKey" = "8:_UNDEFINED"
 "MsmSig" = "8:_UNDEFINED"
@@ -1122,6 +1128,26 @@
 "IsDependency" = "11:FALSE"
 "IsolateTo" = "8:"
 }
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0EF9137A18874950B2B979E4A3D14364"
+{
+"SourcePath" = "8:etc\\.monetdb"
+"TargetName" = "8:.monetdb"
+"Tag" = "8:"
+"Folder" = "8:_B5DFB5D13EE441F8B42616036AACB603"
+"Condition"

MonetDB: Jun2010 - Fix XQuery client startup.

2010-06-17 Thread Sjoerd Mullender

Changeset: 4969ca46ac20 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4969ca46ac20
Modified Files:
clients/NT/Makefile
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
sql/NT/Makefile
Branch: Jun2010
Log Message:

Fix XQuery client startup.


diffs (166 lines):

diff -r 33e5a4b811db -r 4969ca46ac20 clients/NT/Makefile
--- a/clients/NT/Makefile   Thu Jun 17 13:06:49 2010 +0200
+++ b/clients/NT/Makefile   Thu Jun 17 14:23:48 2010 +0200
@@ -19,7 +19,7 @@
 IBITS = 64
 !ENDIF
 
-all: "$(SRCDIR)\Makefile.msc" all-msc $(UNISTD_H) inttypes.h Runmclient.bat 
RunMtest.bat RunMapprove.bat
+all: "$(SRCDIR)\Makefile.msc" all-msc $(UNISTD_H) inttypes.h Runmclient.bat 
RunMtest.bat RunMapprove.bat .monetdb
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" 
"bits=$(bits)" all
 
 check: "$(SRCDIR)\Makefile.msc"
@@ -30,6 +30,7 @@
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" 
"bits=$(bits)" install
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) ..\NT\mclient.bat 
"$(prefix)"
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) ..\NT\msqldump.bat 
"$(prefix)"
+   $(INSTALL) .monetdb "$(sysconfdir)"
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln "$(prefix)"
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj "$(prefix)"
-if exist "C:\Program Files (x86)" if "$(bits)" == "32" 
C:\cygwin\bin\sed.exe -i "s/Program Files/Program Files (x86)/" 
"$(prefix)\$(INSTALLER)$(IBITS).vdproj"
@@ -74,6 +75,10 @@
$(ECHO) typedef int int32_t; >> inttypes.h
$(ECHO) typedef unsigned int uint32_t; >> inttypes.h
 
+.monetdb:
+   $(ECHO) user=monetdb> .monetdb
+   $(ECHO) password=monetdb>> .monetdb
+
 Runmclient.bat: "$(SRCDIR)\Runmclient.bat.in"
$(CONFIGURE) "$(SRCDIR)\Runmclient.bat.in" > Runmclient.bat
 
diff -r 33e5a4b811db -r 4969ca46ac20 
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun 
17 13:06:49 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun 
17 14:23:48 2010 +0200
@@ -813,6 +813,12 @@
 }
 "Entry"
 {
+"MsmKey" = "8:_E37FEE23A93548469BB7560D5524BD93"
+"OwnerKey" = "8:_UNDEFINED"
+"MsmSig" = "8:_UNDEFINED"
+}
+"Entry"
+{
 "MsmKey" = "8:_E4A29EC2213B4C99B49B7AC34E99F880"
 "OwnerKey" = "8:_UNDEFINED"
 "MsmSig" = "8:_UNDEFINED"
@@ -3654,6 +3660,26 @@
 "IsDependency" = "11:FALSE"
 "IsolateTo" = "8:"
 }
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E37FEE23A93548469BB7560D5524BD93"
+{
+"SourcePath" = "8:etc\\.monetdb"
+"TargetName" = "8:.monetdb"
+"Tag" = "8:"
+"Folder" = "8:_B5DFB5D13EE441F8B42616036AACB603"
+"Condition" = "8:"
+"Transitive" = "11:FALSE"
+"Vital" = "11:TRUE"
+"ReadOnly" = "11:FALSE"
+"Hidden" = "11:FALSE"
+"System" = "11:FALSE"
+"Permanent" = "11:FALSE"
+"SharedLegacy" = "11:FALSE"
+"PackageAs" = "3:1"
+"Register" = "3:1"
+"Exclude" = "11:FALSE"
+"IsDependency" = "11:FALSE"
+"IsolateTo" = "8:"
+}
 
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E4A29EC2213B4C99B49B7AC34E99F880"
 {
 "SourcePath" = "8:C:\\iconv-1.11.1.win32\\bin\\iconv.dll"
@@ -4371,7 +4397,7 @@
 
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3"
 {
 "Name" = "8:MonetDB XQuery Client"
-"Arguments" = "8:--language=xquery --encoding=cp437"
+"Arguments" = "8:/STARTED-FROM-MENU --language=xquery 
--encoding=cp437"
 "Description" = "8:"
 "ShowCmd" = "3:1"
 "IconIndex" = "3:0"
diff -r 33e5a4b811db -r 4969ca46ac20 
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj  Thu Jun 
17 13:06:49 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj  Thu Jun 
17 14:23:48 2010 +0200
@@ -51,6 +51,12 @@
 }
 "Entry"
 {
+"MsmKey" = "8:_0EF9137A18874950B2B979E4A3D14364"
+"OwnerKey" = "8:_UNDEFINED"
+"MsmSig" = "8:_UNDEFINED"
+}
+"Entry"
+{
 "MsmKey" = "8:_0F0962C21371457C8ABE0A563FC8A41A"
 "OwnerKey" = "8:_UNDEFINED"
 "MsmSig" = "8:_UNDEFINED"
@@ -1122,6 +1128,26 @@
 "IsDependency" = "11:FALSE"
 "IsolateTo" = "8:"
 }
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0EF9137A18874950B2B979E4A3D14364"
+{
+

MonetDB: default - Treat the 'unreferenced' cache operator in th...

2010-06-17 Thread Jan Rittinger

Changeset: 4d32d055c1ea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d32d055c1ea
Modified Files:
pathfinder/compiler/sql/lalg2sql.brg
Branch: default
Log Message:

Treat the 'unreferenced' cache operator in the SQL code generator


diffs (37 lines):

diff -r 5861fe8ce566 -r 4d32d055c1ea pathfinder/compiler/sql/lalg2sql.brg
--- a/pathfinder/compiler/sql/lalg2sql.brg  Thu Jun 17 13:38:04 2010 +0200
+++ b/pathfinder/compiler/sql/lalg2sql.brg  Thu Jun 17 13:47:19 2010 +0200
@@ -291,8 +291,9 @@
 
 Constr: merge_adjacent (Frag, Rel)   =  89 (10);
 
-Side:   error (Side, Rel)=  98 (10);
-Side:   nil  =  99 (10);
+Side:   error (Side, Rel)=  97 (10);
+Side:   nil  =  98 (10);
+Side:   cache (Side, Rel)=  99 (10);
 Side:   trace (Side, Trc)= 100 (10);
 Trc:trace_items (Rel, Msg)   = 101 (10);
 Msg:trace_msg (Rel, Map) = 102 (10);
@@ -5456,7 +5457,7 @@
 /* ELSE 1 END   */
 /*  FROM q2 AS err) AS foo; */
 //
-case 98: {
+case 97: {
 #define ERR_SQLSTATE "70001"
 assert (kids[0] && nts[0]);
 assert (kids[1] && nts[1]);
@@ -5496,9 +5497,11 @@
 }   break;
 
 /* Side:   nil */
-case 99:
+case 98:
 break;
 
+   /* Side:   cache (Side, Rel) */
+   case 99:
 /* Side:   trace (Side, Trc) */
 case 100:
 /* Trc:trace_items (Rel, Msg) */
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge git master into default

2010-06-17 Thread Jan Rittinger

Changeset: 5861fe8ce566 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5861fe8ce566
Modified Files:

Branch: default
Log Message:

Merge git master into default


diffs (200 lines):

diff -r 2f3a218a16bb -r 5861fe8ce566 pathfinder/compiler/include/Makefile.ag
--- a/pathfinder/compiler/include/Makefile.ag   Thu Jun 17 13:18:22 2010 +0200
+++ b/pathfinder/compiler/include/Makefile.ag   Thu Jun 17 13:38:04 2010 +0200
@@ -26,90 +26,90 @@
 #
 
 EXTRA_DIST = \
-   abssyn.h \
-   abssynprint.h \
-   alg_cl_mnemonic.h \
-   alg_dag.h \
-   algebra_cse.h \
-   opt_algebra_cse.h \
-   algebra.h \
-   algebra_mnemonic.h \
-   algopt.h \
-   array.h \
-   bitset.h \
-   builtins.h \
+abssyn.h \
+abssynprint.h \
+alg_cl_mnemonic.h \
+alg_dag.h \
+algebra_cse.h \
+opt_algebra_cse.h \
+algebra.h \
+algebra_mnemonic.h \
+algopt.h \
+array.h \
+bitset.h \
+builtins.h \
 child_mnemonic.h \
-   compile.h \
-   compile_interface.h \
-   core2alg.h \
-   core.h \
-   core_mnemonic.h \
-   coreopt.h \
-   coreprint.h \
-   env.h \
-ferry_lib.h \
-   fs.h \
-   fmt.h \
-   func_chk.h \
-   functions.h \
-   heuristic.h \
-   import.h \
+compile.h \
+compile_interface.h \
+core2alg.h \
+core.h \
+core_mnemonic.h \
+coreopt.h \
+coreprint.h \
+env.h \
+fs.h \
+fmt.h \
+func_chk.h \
+functions.h \
+heuristic.h \
+import.h \
 intro_borders.h \
-   la_proxy.h \
-   la_thetajoin.h \
-   logdebug.h \
-   logical.h \
-   logical_mnemonic.h \
+la_proxy.h \
+la_thetajoin.h \
+logdebug.h \
+logical.h \
+logical_mnemonic.h \
 map_names.h \
-   mem.h \
-   mil_dce.h \
-   milgen.h \
-   mil.h \
-   mil_mnemonic.h \
-   mil_opt.h \
-   milprint.h \
-   milprint_summer.h \
+mem.h \
+mil_dce.h \
+milgen.h \
+mil.h \
+mil_mnemonic.h \
+mil_opt.h \
+milprint.h \
+milprint_summer.h \
 msa.h \
 msa_mnemonic.h \
 msaprint.h \
-   normalize.h \
-   ns.h \
-   nsres.h \
-   oops.h \
-   options.h \
-   ordering.h \
-   parser.h \
-   pathfinder.h \
-   pfstrings.h \
+normalize.h \
+ns.h \
+nsres.h \
+oops.h \
+options.h \
+ordering.h \
+parser.h \
+pathfinder.h \
+pfstrings.h \
+pf_ferry.h \
 pf_xq.h \
-   physdebug.h \
-   physical.h \
-   physical_mnemonic.h \
-   planner.h \
+physdebug.h \
+physical.h \
+physical_mnemonic.h \
+planner.h \
 plan_bundle.h \
-   prettyp.h \
-   properties.h \
-   qname.h \
-   scanner.h \
-   scope.h \
-   simplify.h \
-   string_utils.h \
-   subtyping.h \
-   timer.h \
-   typecheck.h \
-   types.h \
-   variable.h \
-   varscope.h \
-   xml2lalg.h \
-   xml2lalg_converters.h \
-   xml2lalg_xpath_utils.h \
-   xquery_fo.h \
-   sql.h \
-   sql_opt.h \
-   sql_mnemonic.h \
-   lalg2sql.h \
-   lalg2msa.h \
-   sqlprint.h \
+prettyp.h \
+properties.h \
+qname.h \
+scanner.h \
+scope.h \
+simplify.h \
+string_utils.h \
+subtyping.h \
+timer.h \
+typecheck.h \
+types.h \
+variable.h \
+varscope.h \
+xml2lalg.h \
+xml2lalg_converters.h \
+xml2lalg_xpath_utils.h \
+xquery_fo.h \
+sql.h \
+sql_opt.h \
+sql_mnemonic.h \
+lalg2sql.h \
+lalg2msa.h \
+sqlprint.h \
 load_stats.h

 headers_pf_ferry = {
diff -r 2f3a218a16bb -r 5861fe8ce566 pathfinder/compiler/pf_ferry.c
--- a/pathfinder/compiler/pf_ferry.cThu Jun 17 13:18:22 2010 +0200
+++ b/pathfinder/compiler/pf_ferry.cThu Jun 17 13:38:04 2010 +0200
@@ -115,6 +115,7 @@
 PFla_pb_t   *lapb = NULL;
 XML2LALGContext *ctx;
 PFarray_t   *output;
+char*opt_args_local;
 
 /* setup the error buffer (needed for error handling and segfault trap) */
 PFerrbuf = err;
@@ -149,13 +150,15 @@
 
 /* Use the default optimization arguments 
if no optimizations are available. */
-if (!opt_args)
-opt_args = PFopt_args;
+if (opt_args)
+opt_args_local = opt_args;
+else
+opt_args_local = PFopt_args;
 
 /* Rewrite/optimize the algebra plans. */
 for (unsigned int i = 0; i < PFla_pb_size(lapb); i++)
 PFla_pb_op_at (lapb, i) 
-= PFalgopt (PFla_pb_op_at (lapb, i), false, NULL,

MonetDB: default - Try to avoid clobbered variables.

2010-06-17 Thread Jan Rittinger

Changeset: d3e539206391 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d3e539206391
Modified Files:
pathfinder/compiler/pf_ferry.c
Branch: default
Log Message:

Try to avoid clobbered variables.


diffs (30 lines):

diff -r e45ab1674367 -r d3e539206391 pathfinder/compiler/pf_ferry.c
--- a/pathfinder/compiler/pf_ferry.cThu Jun 17 12:03:14 2010 +0200
+++ b/pathfinder/compiler/pf_ferry.cThu Jun 17 12:04:19 2010 +0200
@@ -115,6 +115,7 @@
 PFla_pb_t   *lapb = NULL;
 XML2LALGContext *ctx;
 PFarray_t   *output;
+char*opt_args_local;
 
 /* setup the error buffer (needed for error handling and segfault trap) */
 PFerrbuf = err;
@@ -149,13 +150,15 @@
 
 /* Use the default optimization arguments 
if no optimizations are available. */
-if (!opt_args)
-opt_args = PFopt_args;
+if (opt_args)
+opt_args_local = opt_args;
+else
+opt_args_local = PFopt_args;
 
 /* Rewrite/optimize the algebra plans. */
 for (unsigned int i = 0; i < PFla_pb_size(lapb); i++)
 PFla_pb_op_at (lapb, i) 
-= PFalgopt (PFla_pb_op_at (lapb, i), false, NULL, opt_args);
+= PFalgopt (PFla_pb_op_at (lapb, i), false, NULL, opt_args_local);
 
 /*
  * OUTPUT GENERATION
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Retab

2010-06-17 Thread Jan Rittinger

Changeset: e45ab1674367 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e45ab1674367
Modified Files:
pathfinder/compiler/include/Makefile.ag
Branch: default
Log Message:

Retab


diffs (169 lines):

diff -r 86ce0d6c508d -r e45ab1674367 pathfinder/compiler/include/Makefile.ag
--- a/pathfinder/compiler/include/Makefile.ag   Thu Jun 17 12:02:18 2010 +0200
+++ b/pathfinder/compiler/include/Makefile.ag   Thu Jun 17 12:03:14 2010 +0200
@@ -26,90 +26,90 @@
 #
 
 EXTRA_DIST = \
-   abssyn.h \
-   abssynprint.h \
-   alg_cl_mnemonic.h \
-   alg_dag.h \
-   algebra_cse.h \
-   opt_algebra_cse.h \
-   algebra.h \
-   algebra_mnemonic.h \
-   algopt.h \
-   array.h \
-   bitset.h \
-   builtins.h \
+abssyn.h \
+abssynprint.h \
+alg_cl_mnemonic.h \
+alg_dag.h \
+algebra_cse.h \
+opt_algebra_cse.h \
+algebra.h \
+algebra_mnemonic.h \
+algopt.h \
+array.h \
+bitset.h \
+builtins.h \
 child_mnemonic.h \
-   compile.h \
-   compile_interface.h \
-   core2alg.h \
-   core.h \
-   core_mnemonic.h \
-   coreopt.h \
-   coreprint.h \
-   env.h \
-   fs.h \
-   fmt.h \
-   func_chk.h \
-   functions.h \
-   heuristic.h \
-   import.h \
+compile.h \
+compile_interface.h \
+core2alg.h \
+core.h \
+core_mnemonic.h \
+coreopt.h \
+coreprint.h \
+env.h \
+fs.h \
+fmt.h \
+func_chk.h \
+functions.h \
+heuristic.h \
+import.h \
 intro_borders.h \
-   la_proxy.h \
-   la_thetajoin.h \
-   logdebug.h \
-   logical.h \
-   logical_mnemonic.h \
+la_proxy.h \
+la_thetajoin.h \
+logdebug.h \
+logical.h \
+logical_mnemonic.h \
 map_names.h \
-   mem.h \
-   mil_dce.h \
-   milgen.h \
-   mil.h \
-   mil_mnemonic.h \
-   mil_opt.h \
-   milprint.h \
-   milprint_summer.h \
+mem.h \
+mil_dce.h \
+milgen.h \
+mil.h \
+mil_mnemonic.h \
+mil_opt.h \
+milprint.h \
+milprint_summer.h \
 msa.h \
 msa_mnemonic.h \
 msaprint.h \
-   normalize.h \
-   ns.h \
-   nsres.h \
-   oops.h \
-   options.h \
-   ordering.h \
-   parser.h \
-   pathfinder.h \
-   pfstrings.h \
+normalize.h \
+ns.h \
+nsres.h \
+oops.h \
+options.h \
+ordering.h \
+parser.h \
+pathfinder.h \
+pfstrings.h \
 pf_ferry.h \
 pf_xq.h \
-   physdebug.h \
-   physical.h \
-   physical_mnemonic.h \
-   planner.h \
+physdebug.h \
+physical.h \
+physical_mnemonic.h \
+planner.h \
 plan_bundle.h \
-   prettyp.h \
-   properties.h \
-   qname.h \
-   scanner.h \
-   scope.h \
-   simplify.h \
-   string_utils.h \
-   subtyping.h \
-   timer.h \
-   typecheck.h \
-   types.h \
-   variable.h \
-   varscope.h \
-   xml2lalg.h \
-   xml2lalg_converters.h \
-   xml2lalg_xpath_utils.h \
-   xquery_fo.h \
-   sql.h \
-   sql_opt.h \
-   sql_mnemonic.h \
-   lalg2sql.h \
-   lalg2msa.h \
-   sqlprint.h \
+prettyp.h \
+properties.h \
+qname.h \
+scanner.h \
+scope.h \
+simplify.h \
+string_utils.h \
+subtyping.h \
+timer.h \
+typecheck.h \
+types.h \
+variable.h \
+varscope.h \
+xml2lalg.h \
+xml2lalg_converters.h \
+xml2lalg_xpath_utils.h \
+xquery_fo.h \
+sql.h \
+sql_opt.h \
+sql_mnemonic.h \
+lalg2sql.h \
+lalg2msa.h \
+sqlprint.h \
 load_stats.h

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

MonetDB: default - Fix 'make dist' (Wrong header file name was i...

2010-06-17 Thread Jan Rittinger

Changeset: 86ce0d6c508d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86ce0d6c508d
Modified Files:
pathfinder/compiler/include/Makefile.ag
Branch: default
Log Message:

Fix 'make dist' (Wrong header file name was included.)


diffs (19 lines):

diff -r e7bbd5d0cd46 -r 86ce0d6c508d pathfinder/compiler/include/Makefile.ag
--- a/pathfinder/compiler/include/Makefile.ag   Wed Jun 16 17:02:29 2010 +0200
+++ b/pathfinder/compiler/include/Makefile.ag   Thu Jun 17 12:02:18 2010 +0200
@@ -47,7 +47,6 @@
coreopt.h \
coreprint.h \
env.h \
-ferry_lib.h \
fs.h \
fmt.h \
func_chk.h \
@@ -81,6 +80,7 @@
parser.h \
pathfinder.h \
pfstrings.h \
+pf_ferry.h \
 pf_xq.h \
physdebug.h \
physical.h \
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Fix the a previous mistake.

2010-06-17 Thread Romulo Goncalves

Changeset: 2f3a218a16bb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f3a218a16bb
Modified Files:
MonetDB5/conf/monetdb5.conf.in
Branch: default
Log Message:

Fix the a previous mistake.
in the configure file use the default_pipe for the optimizers.


diffs (12 lines):

diff -r ca5de789af67 -r 2f3a218a16bb MonetDB5/conf/monetdb5.conf.in
--- a/MonetDB5/conf/monetdb5.conf.inThu Jun 17 13:16:38 2010 +0200
+++ b/MonetDB5/conf/monetdb5.conf.inThu Jun 17 13:18:22 2010 +0200
@@ -187,7 +187,7 @@
 # only.
 
 # Set and define the default pipeline
-sql_optimizer=datacyclotron_pipe
+sql_optimizer=default_pipe
 
 # The minimal pipeline necessary by the server to operate correctly
 minimal_pipe=inline,remap,deadcode,multiplex,garbageCollector
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge from Jun2010 branch.

2010-06-17 Thread Sjoerd Mullender

Changeset: ca5de789af67 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca5de789af67
Modified Files:
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:

Merge from Jun2010 branch.


diffs (229 lines):

diff -r 20f7b1dd3807 -r ca5de789af67 clients/NT/mclient.bat
--- a/clients/NT/mclient.batThu Jun 17 13:05:14 2010 +0200
+++ b/clients/NT/mclient.batThu Jun 17 13:16:38 2010 +0200
@@ -1,14 +1,20 @@
-...@rem figure out the folder name
-...@set MONETDB=%~dp0
+...@echo off
+rem figure out the folder name
+set MONETDB=%~dp0
 
-...@rem remove the final backslash from the path
-...@set MONETDB=%MONETDB:~0,-1%
+rem remove the final backslash from the path
+set MONETDB=%MONETDB:~0,-1%
 
-...@rem extend the search path with our EXE and DLL folders
-...@rem we depend on pthreadVCE.dll having been copied to the lib folder
-...@set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH%
+rem extend the search path with our EXE and DLL folders
+rem we depend on pthreadVCE.dll having been copied to the lib folder
+set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH%
 
-...@rem start the real client
-@"%MONETDB%\bin\mclient.exe" %*
+if "%1"=="/STARTED-FROM-MENU" (
+shift
+if "%DOTMONETDBFILE%"=="" if exist "%MONETDB%\etc\.monetdb" set 
DOTMONETDBFILE=%MONETDB%\etc\.monetdb
+)
 
-...@if ERRORLEVEL 1 pause
+rem start the real client
+"%MONETDB%\bin\mclient.exe" %1 %2 %3 %4 %5 %6 %7 %8
+
+if ERRORLEVEL 1 pause
diff -r 20f7b1dd3807 -r ca5de789af67 
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun 
17 13:05:14 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun 
17 13:16:38 2010 +0200
@@ -4371,7 +4371,7 @@
 
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3"
 {
 "Name" = "8:MonetDB XQuery Client"
-"Arguments" = "8:--language=xquery --user=monetdb --passwd=monetdb 
--encoding=cp437"
+"Arguments" = "8:--language=xquery --encoding=cp437"
 "Description" = "8:"
 "ShowCmd" = "3:1"
 "IconIndex" = "3:0"
diff -r 20f7b1dd3807 -r ca5de789af67 
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj  Thu Jun 
17 13:05:14 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj  Thu Jun 
17 13:16:38 2010 +0200
@@ -4339,7 +4339,7 @@
 
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3"
 {
 "Name" = "8:MonetDB XQuery Client"
-"Arguments" = "8:--language=xquery --user=monetdb --passwd=monetdb 
--encoding=cp437"
+"Arguments" = "8:--language=xquery --encoding=cp437"
 "Description" = "8:"
 "ShowCmd" = "3:1"
 "IconIndex" = "3:0"
diff -r 20f7b1dd3807 -r ca5de789af67 sql/NT/Makefile
--- a/sql/NT/Makefile   Thu Jun 17 13:05:14 2010 +0200
+++ b/sql/NT/Makefile   Thu Jun 17 13:16:38 2010 +0200
@@ -18,7 +18,7 @@
 IBITS = 64
 !ENDIF
 
-all: "$(SRCDIR)\Makefile.msc" all-msc unistd.h inttypes.h RunMserver.bat 
RunMtest.bat RunMapprove.bat
+all: "$(SRCDIR)\Makefile.msc" all-msc unistd.h inttypes.h RunMserver.bat 
RunMtest.bat RunMapprove.bat .monetdb
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" 
"bits=$(bits)" all
 
 check: "$(SRCDIR)\Makefile.msc" RunMtest.bat
@@ -28,6 +28,7 @@
 install: targetdirs all install-m5installer $(INSTALLER_PREREQ)
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" 
"bits=$(bits)" install
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) ..\NT\MSQLserver.bat 
"$(prefix)"
+   $(INSTALL) .monetdb "$(sysconfdir)"
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln "$(prefix)"
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj "$(prefix)"
-if exist "C:\Program Files (x86)" if "$(bits)" == "32" 
C:\cygwin\bin\sed.exe -i "s/Program Files/Program Files (x86)/" 
"$(prefix)\$(INSTALLER)$(IBITS).vdproj"
@@ -78,6 +79,10 @@
$(ECHO) typedef int int32_t; >> inttypes.h
$(ECHO) typedef unsigned int uint32_t; >> inttypes.h
 
+.monetdb:
+   $(ECHO) user=monetdb> .monetdb
+   $(ECHO) password=monetdb>> .monetdb
+
 RunMtest.bat: "$(SRCDIR)\RunMtest.bat.in"
$(CONFIGURE) "$(SRCDIR)\RunMtest.bat.in" > RunMtest.bat
 
diff -r 20f7b1dd3807 -r ca5de789af67 
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thu Jun 17 13:05:14 
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thu Jun 17 13:16:38 
2010 +0200
@@ -1269,6 +1269,12 @@
 }
 "Entry"
 {
+"MsmKey" = "8:_D301CC5DC1BE412A900D7C90166AC804"
+"OwnerKey" = "8:_UNDEFINED"
+

MonetDB: Jun2010 - Get rid of -P option from calls to mclient fr...

2010-06-17 Thread Sjoerd Mullender

Changeset: 33e5a4b811db for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=33e5a4b811db
Modified Files:
clients/NT/mclient.bat
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
sql/NT/Makefile
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: Jun2010
Log Message:

Get rid of -P option from calls to mclient from the start menu.


diffs (229 lines):

diff -r 59719d9ad856 -r 33e5a4b811db clients/NT/mclient.bat
--- a/clients/NT/mclient.batWed Jun 16 16:37:10 2010 +0200
+++ b/clients/NT/mclient.batThu Jun 17 13:06:49 2010 +0200
@@ -1,14 +1,20 @@
-...@rem figure out the folder name
-...@set MONETDB=%~dp0
+...@echo off
+rem figure out the folder name
+set MONETDB=%~dp0
 
-...@rem remove the final backslash from the path
-...@set MONETDB=%MONETDB:~0,-1%
+rem remove the final backslash from the path
+set MONETDB=%MONETDB:~0,-1%
 
-...@rem extend the search path with our EXE and DLL folders
-...@rem we depend on pthreadVCE.dll having been copied to the lib folder
-...@set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH%
+rem extend the search path with our EXE and DLL folders
+rem we depend on pthreadVCE.dll having been copied to the lib folder
+set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH%
 
-...@rem start the real client
-@"%MONETDB%\bin\mclient.exe" %*
+if "%1"=="/STARTED-FROM-MENU" (
+shift
+if "%DOTMONETDBFILE%"=="" if exist "%MONETDB%\etc\.monetdb" set 
DOTMONETDBFILE=%MONETDB%\etc\.monetdb
+)
 
-...@if ERRORLEVEL 1 pause
+rem start the real client
+"%MONETDB%\bin\mclient.exe" %1 %2 %3 %4 %5 %6 %7 %8
+
+if ERRORLEVEL 1 pause
diff -r 59719d9ad856 -r 33e5a4b811db 
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojWed Jun 
16 16:37:10 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun 
17 13:06:49 2010 +0200
@@ -4371,7 +4371,7 @@
 
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3"
 {
 "Name" = "8:MonetDB XQuery Client"
-"Arguments" = "8:--language=xquery --user=monetdb --passwd=monetdb 
--encoding=cp437"
+"Arguments" = "8:--language=xquery --encoding=cp437"
 "Description" = "8:"
 "ShowCmd" = "3:1"
 "IconIndex" = "3:0"
diff -r 59719d9ad856 -r 33e5a4b811db 
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj  Wed Jun 
16 16:37:10 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj  Thu Jun 
17 13:06:49 2010 +0200
@@ -4339,7 +4339,7 @@
 
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3"
 {
 "Name" = "8:MonetDB XQuery Client"
-"Arguments" = "8:--language=xquery --user=monetdb --passwd=monetdb 
--encoding=cp437"
+"Arguments" = "8:--language=xquery --encoding=cp437"
 "Description" = "8:"
 "ShowCmd" = "3:1"
 "IconIndex" = "3:0"
diff -r 59719d9ad856 -r 33e5a4b811db sql/NT/Makefile
--- a/sql/NT/Makefile   Wed Jun 16 16:37:10 2010 +0200
+++ b/sql/NT/Makefile   Thu Jun 17 13:06:49 2010 +0200
@@ -18,7 +18,7 @@
 IBITS = 64
 !ENDIF
 
-all: "$(SRCDIR)\Makefile.msc" all-msc unistd.h inttypes.h RunMserver.bat 
RunMtest.bat RunMapprove.bat
+all: "$(SRCDIR)\Makefile.msc" all-msc unistd.h inttypes.h RunMserver.bat 
RunMtest.bat RunMapprove.bat .monetdb
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" 
"bits=$(bits)" all
 
 check: "$(SRCDIR)\Makefile.msc" RunMtest.bat
@@ -28,6 +28,7 @@
 install: targetdirs all install-m5installer $(INSTALLER_PREREQ)
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" 
"bits=$(bits)" install
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) ..\NT\MSQLserver.bat 
"$(prefix)"
+   $(INSTALL) .monetdb "$(sysconfdir)"
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln "$(prefix)"
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj "$(prefix)"
-if exist "C:\Program Files (x86)" if "$(bits)" == "32" 
C:\cygwin\bin\sed.exe -i "s/Program Files/Program Files (x86)/" 
"$(prefix)\$(INSTALLER)$(IBITS).vdproj"
@@ -78,6 +79,10 @@
$(ECHO) typedef int int32_t; >> inttypes.h
$(ECHO) typedef unsigned int uint32_t; >> inttypes.h
 
+.monetdb:
+   $(ECHO) user=monetdb> .monetdb
+   $(ECHO) password=monetdb>> .monetdb
+
 RunMtest.bat: "$(SRCDIR)\RunMtest.bat.in"
$(CONFIGURE) "$(SRCDIR)\RunMtest.bat.in" > RunMtest.bat
 
diff -r 59719d9ad856 -r 33e5a4b811db 
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Wed Jun 16 16:37:10 
2010 +0200
+++ b/sql/NT/M

MonetDB: default - The sql.bind contains an extra argument, ptr ...

2010-06-17 Thread Romulo Goncalves

Changeset: 20f7b1dd3807 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=20f7b1dd3807
Modified Files:
MonetDB5/conf/monetdb5.conf.in
MonetDB5/src/optimizer/opt_datacyclotron.mx
Branch: default
Log Message:

The sql.bind contains an extra argument, ptr for mvc.
Lets correct the optimizer to take that extra argument in consideration.

We now have a mal instruction
addReg
Which allows us to add register partitions in the optimizer catalog.
Like this, we can debug and test the optimizer without the datacyclotron module.


diffs (68 lines):

diff -r b870dd0201f7 -r 20f7b1dd3807 MonetDB5/conf/monetdb5.conf.in
--- a/MonetDB5/conf/monetdb5.conf.inThu Jun 17 07:59:02 2010 +0200
+++ b/MonetDB5/conf/monetdb5.conf.inThu Jun 17 13:05:14 2010 +0200
@@ -187,7 +187,7 @@
 # only.
 
 # Set and define the default pipeline
-sql_optimizer=default_pipe
+sql_optimizer=datacyclotron_pipe
 
 # The minimal pipeline necessary by the server to operate correctly
 minimal_pipe=inline,remap,deadcode,multiplex,garbageCollector
diff -r b870dd0201f7 -r 20f7b1dd3807 MonetDB5/src/optimizer/opt_datacyclotron.mx
--- a/MonetDB5/src/optimizer/opt_datacyclotron.mx   Thu Jun 17 07:59:02 
2010 +0200
+++ b/MonetDB5/src/optimizer/opt_datacyclotron.mx   Thu Jun 17 13:05:14 
2010 +0200
@@ -29,6 +29,11 @@
 address OPTdatacyclotron
 comment "Datacyclotron code injection";
 
+
+pattern addReg(sch:str, tab:str, col:str, acc:int, f_bun:int, l_bun:int):int
+address addRegWrap
+comment "Add a regist for partition";
+
 @-
 
 The number of overloaded instructions is kept to a minimum.
@@ -75,6 +80,25 @@
 #include "mal_instruction.h"
 
 str
+addRegWrap (Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc) {
+   int *res = (int*) getArgReference(stk,pc,0);
+   str *sch = (str*) getArgReference(stk,pc,1);
+   str *tab = (str*) getArgReference(stk,pc,2);
+   str *col = (str*) getArgReference(stk,pc,3);
+   int acc = *(int*) getArgReference(stk,pc,4);
+   int f_b = *(int*) getArgReference(stk,pc,5);
+   int l_b = *(int*) getArgReference(stk,pc,6);
+
+   (void) res;
+   (void) cntxt;
+   (void) mb;
+
+   addRegist(*sch, *tab, *col, acc, f_b, l_b);
+
+   return MAL_SUCCEED;
+}
+
+str
 printRegists(void) {
DCYcatalog *reg = NULL;
int chunks = 0, parts = 0;
@@ -225,10 +249,10 @@
if (getModuleId(p)== sqlRef && (getFunctionId(p) == bindRef) ) {
 
/*Check if the BAT is a datacyclotron BAT*/
-   str sch  = getVarConstant(mb, getArg(p,1)).val.sval;
-   str tab  = getVarConstant(mb, getArg(p,2)).val.sval;
-   str col  = getVarConstant(mb, getArg(p,3)).val.sval;
-   int acc  = getVarConstant(mb, getArg(p,4)).val.ival;
+   str sch  = getVarConstant(mb, getArg(p,2)).val.sval;
+   str tab  = getVarConstant(mb, getArg(p,3)).val.sval;
+   str col  = getVarConstant(mb, getArg(p,4)).val.sval;
+   int acc  = getVarConstant(mb, getArg(p,5)).val.ival;
 
regs[getArg(p,0)] = findRegist(sch, tab, col, acc);
 
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - merge with Jun2010

MonetDB: Jun2010 - use MAP_ANONYMOUS instead of deprecated MAP_ANON

Re: MonetDB: default - MAP_ANONYMOUS instead of MAP_ANON

MonetDB: default - MAP_ANONYMOUS instead of MAP_ANON

MonetDB: default - Merge from Jun2010 branch.

MonetDB: Jun2010 - Fix XQuery client startup.

MonetDB: default - Treat the 'unreferenced' cache operator in th...

MonetDB: default - Merge git master into default

MonetDB: default - Try to avoid clobbered variables.

MonetDB: default - Retab

MonetDB: default - Fix 'make dist' (Wrong header file name was i...

MonetDB: default - Fix the a previous mistake.

MonetDB: default - Merge from Jun2010 branch.

MonetDB: Jun2010 - Get rid of -P option from calls to mclient fr...

MonetDB: default - The sql.bind contains an extra argument, ptr ...

15 matches

Site Navigation

Mail list logo

Footer information