Changeset: 0466355d61de for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0466355d61de
Modified Files:
Branch: default
Log Message:
Merge with default
diffs (truncated from 641 to 300 lines):
diff -r e1ffb973e73b -r 0466355d61de MonetDB/src/common/monet_options.mx
--- a/MonetDB/src/common/monet_options.mx Mon Oct 25 16:46:03 2010 +0200
+++ b/MonetDB/src/common/monet_options.mx Mon Oct 25 16:47:11 2010 +0200
@@ -69,7 +69,8 @@
/* the option values can contain ${variable} (or %variable%), these
will be substituted using the mo_substitute function. The return
- value is a newly allocated buffer, it is the caller's responsibility to
free the buffer. */
+ value is a newly allocated buffer, it is the caller's
+ responsibility to free the buffer. */
#ifdef WIN32
/* on Windows, the option values can also contain %prefix% and
%exec_prefix% which will be substituted as well. */
@@ -368,7 +369,7 @@
if (Set == NULL)
return 0;
-#define N_OPTIONS 23 /*MUST MATCH # OPTIONS BELOW */
+#define N_OPTIONS 26 /*MUST MATCH # OPTIONS BELOW */
set = malloc(sizeof(opt) * N_OPTIONS);
if (set == NULL)
return 0;
@@ -468,6 +469,18 @@
set[i].value = strdup("false");
i++;
set[i].kind = opt_builtin;
+ set[i].name = strdup("default_pipe");
+ set[i].value =
strdup("inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector");
+ i++;
+ set[i].kind = opt_builtin;
+ set[i].name = strdup("minimal_pipe");
+ set[i].value =
strdup("inline,remap,deadcode,multiplex,garbageCollector");
+ i++;
+ set[i].kind = opt_builtin;
+ set[i].name = strdup("sql_optimizer");
+ set[i].value = strdup("default_pipe");
+ i++;
+ set[i].kind = opt_builtin;
set[i].name = strdup("sql_debug");
set[i].value = strdup("0");
i++;
diff -r e1ffb973e73b -r 0466355d61de MonetDB4/conf/MonetDB.conf.in
--- a/MonetDB4/conf/MonetDB.conf.in Mon Oct 25 16:46:03 2010 +0200
+++ b/MonetDB4/conf/MonetDB.conf.in Mon Oct 25 16:47:11 2010 +0200
@@ -1,8 +1,26 @@
+# The contents of this file are subject to the MonetDB Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is the MonetDB Database System.
+#
+# The Initial Developer of the Original Code is CWI.
+# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+# Copyright August 2008-2010 MonetDB B.V.
+# All Rights Reserved.
+
+
# Configuration file for MonetDB main-memory database
-# This startup file is read by the GDK kernel, to set
-# system wide parameters. It can reside in either the local directory
-# where Mserver is called, or the home directory of the MonetDB user.
+# This startup file is read by the GDK kernel, to set system wide
+# parameters. It can reside in either the local directory where
+# Mserver is called, or the home directory of the MonetDB user.
# ----------------------------------------------------------- #
# Please keep the comments below aligned with the defaults in #
@@ -17,35 +35,36 @@
# GDK Section
#============
-# All databases are stored as a directory under the directory
-# given below. Use this value to change the overall location
-# of your data.
+# All databases are stored as a directory under the directory given
+# below. Use this value to change the overall location of your data.
gdk_dbfa...@xlocalstatedir@@dir...@monetdb4@dir...@dbfarm
-# MonetDB can only handle one database at a time. You can specify
-# the name of the database to use below. Note that you can use
-# multiple databases, but that you have to edit the database name
-# and restart MonetDB.
+# MonetDB can only handle one database at a time. You can specify the
+# name of the database to use below. Note that you can use multiple
+# databases, but that you have to edit the database name and restart
+# MonetDB.
#gdk_dbname=demo
-# The options below deal with various aspects of memory usage behaviour.
-# If you don't know what these values mean, you should leave them alone.
+# The options below deal with various aspects of memory usage
+# behaviour. If you don't know what these values mean, you should
+# leave them alone.
-# memory chunks of size >= gdk_mem_bigsize (in bytes) will be mmaped
anonymously
-# default set in gdk_utils.mx: 1<<20 == 1024576 == 1 MiB
+# memory chunks of size >= gdk_mem_bigsize (in bytes) will be mmapped
+# anonymously default set in gdk_utils.mx: 1<<20 == 1024576 == 1 MiB
#gdk_mem_bigsize=1024576
# for 32 bit systems try to claim 3G of (virtual) memory;
#gdk_vmtrim=yes
# set to "no" to disable the vmtrim thread.
# valgrind issues:
-# for 32 bit systems it tries claim 3G of (virtual) memory
-# set to "no" to run Mserver with valgrind.
-# also, you need to tell valgrind to use 8-byte alignment, hence:
-# "valgrind --alignment=8 Mserver --set gdk_alloc_map=no ..."
+# For 32 bit systems it tries claim 3G of (virtual) memory set to "no"
+# to run Mserver with valgrind. Also, you need to tell valgrind to
+# use 8-byte alignment, hence: "valgrind --alignment=8 Mserver --set
+# gdk_alloc_map=no ..."
#gdk_alloc_map=no
-# the kernel can be used in embedded situations (don't set this yourself)
+# the kernel can be used in embedded situations (don't set this
+# yourself)
gdk_embedded=no
# You can enable debug for specific parts. By default debug is
@@ -76,8 +95,10 @@
# 2097152 = show join/select algorithm chosen
# 4194304 = show result size estimations (for join,select)
# 8388608 = extended property checking: tells also about not set properties
-#16777216 = disable property checking with join & outerjoin (e.g., for
performance measurements)
-#33554432 = disable "cleaning" of freed memory in GDKfree() (e.g., for
performance measurements)
+#16777216 = disable property checking with join & outerjoin (e.g., for
+# performance measurements) 33554432 = disable "cleaning" of
+# freed memory in GDKfree() (e.g., for performance
+# measurements)
# General client Section
#=======================
@@ -85,18 +106,20 @@
# MonetDB Section
#================
-# Administrator user name
+# Administrator user name
#monet_admin=adm
-# Prompt when using MIL interface
+# Prompt when using MIL interface
#monet_prompt=>
monet_prompt=MonetDB>
-# Show version and copyright information when starting the server or
-# a MIL client?
+# Show version and copyright information when starting the server or a
+# MIL client?
#monet_welcome=yes
# Where do the MonetDB modules reside?
-# The first directory contains MIL modules, and either the second or third
(depending on the system) the C modules.
+# The first directory contains MIL modules, and either the second or
+# third (depending on the system) the C modules.
monet_mod_pa...@xlibdir@@dir...@monetdb4@PATHSEP@@Xlibdir@@dir...@monetdb4@dir...@lib@PATHSEP@@Xlibdir@@dir...@monetdb4@dir...@bin
-# Start Mserver in daemon mode, or start with MIL interactive interface?
+# Start Mserver in daemon mode, or start with MIL interactive
+# interface?
#monet_daemon=no
# Monet Application Interface Section
@@ -104,7 +127,7 @@
# default port to address an Mserver for a MIL session
#mapi_port=50000
#allow mclient sessions from outside the server machine
-#mapi_open=false
+#mapi_open=false
# The number of concurrent clients can be set using mapi_clients
# (smaller than 1 is not very useful)
#mapi_clients=2
@@ -112,22 +135,23 @@
# XQuery Interface Section
#=========================
-#default back-end: "milprint_summer" or "algebra"
+# default back-end: "milprint_summer" or "algebra"
#xquery_backend=algebra
-#output mode "dm" = pretty printed,
-# "xml" = enforce XML with enclosing <XQueryResult> tags
-xquery_output=dm
+# output mode "dm" = pretty printed,
+# "xml" = enforce XML with enclosing <XQueryResult> tags
+xquery_output=dm
-#limit the document cache on disk to 100MB
-xquery_cacheMB=100
+# limit the document cache on disk to 100MB
+xquery_cacheMB=100
-#rules like {URL=seconds;}* e.g. cache w3c for a day, CNN for 5 minutes
-#xquery_cacherules="http://www.w3.org/=79200;http://www.cnn.com=300";
+# rules like {URL=seconds;}* e.g. cache w3c for a day, CNN for 5
+# minutes
+# xquery_cacherules="http://www.w3.org/=79200;http://www.cnn.com=300";
xquery_cacherules=""
-#limit the function cache in memory to 128MB
-xquery_procMB=128
+# limit the function cache in memory to 128MB
+xquery_procMB=128
# if not set port to address the HTTP server for pathfinder = mapi_port+1
xrpc_port=""
diff -r e1ffb973e73b -r 0466355d61de MonetDB5/conf/monetdb5.conf.in
--- a/MonetDB5/conf/monetdb5.conf.in Mon Oct 25 16:46:03 2010 +0200
+++ b/MonetDB5/conf/monetdb5.conf.in Mon Oct 25 16:47:11 2010 +0200
@@ -18,13 +18,13 @@
# Configuration file for MonetDB Version 5 server
-# The configuration file is an integral part of a database store
-# and aimed to initialize the server and service components.
-# This startup file is read by the GDK kernel to set system wide parameters.
+# The configuration file is an integral part of a database store and
+# aimed to initialize the server and service components. This startup
+# file is read by the GDK kernel to set system wide parameters.
# It may be inspected by application/scripts for specific settings,
-# but such client side configurations are better packed in their
-# own structure.
+# but such client side configurations are better packed in their own
+# structure.
# FIXME: remove this notice for the installed monetdb5.conf #
# ----------------------------------------------------------- #
@@ -33,15 +33,14 @@
# ----------------------------------------------------------- #
# Absolute path where MonetDB is installed
-pref...@prefix@
-exec_pref...@exec_prefix@
+pref...@xprefix@
+exec_pref...@xexec_prefix@
# GDK Section
#============
-# All databases are stored as a directory under the directory
-# given below. Use this value to change the overall location
-# of your data.
-gdk_dbfa...@localstatedir@@dir...@monetdb5@dir...@dbfarm
+# All databases are stored as a directory under the directory given
+# below. Use this value to change the overall location of your data.
+gdk_dbfa...@xlocalstatedir@@dir...@monetdb5@dir...@dbfarm
#
# MonetDB can only handle one database at a time. When you start an
# mserver5 manually without specifying the database name yourself, the
@@ -50,30 +49,32 @@
# Monet Section
#==============
-# monet_admin=adm #administrator user name
+#monet_admin=adm #administrator user name
# Prompt when using MAL interface
-# monet_prompt=>
+#monet_prompt=>
#
-# Where do the MonetDB modules reside? The second path is for windows dlls.
-monet_mod_pa...@libdir@@dir...@monetdb5@PATHSEP@@libdir@@dir...@monetdb5@dir...@lib@PATHSEP@@libdir@@dir...@monetdb5@dir...@bin
+# Where do the MonetDB modules reside? The second path is for windows
+# dlls.
+monet_mod_pa...@xlibdir@@dir...@monetdb5@PATHSEP@@Xlibdir@@dir...@monetdb5@dir...@lib@PATHSEP@@Xlibdir@@dir...@monetdb5@dir...@bin
#
-# Start mserver in daemon mode, or start with MAL interactive interface?
+# Start mserver in daemon mode, or start with MAL interactive
+# interface?
#monet_daemon=no
#
# Display version and copyright information upon startup?
#monet_welcome=yes
#
# Where is the file that stores the secret key to unlock the password
-# vault? The file is read up to the first null-byte ('\0'), so you can
-# padd the file with trailing null-bytes to obfuscate the key length.
-# You can easily generate some key by running pwgen and adding a few of
-# the passwords generated. Make sure not to make the key too small.
-# If you leave this unset, some default key is used.
+# vault? The file is read up to the first null-byte ('\0'), so you
+# can padd the file with trailing null-bytes to obfuscate the key
+# length. You can easily generate some key by running pwgen and
+# adding a few of the passwords generated. Make sure not to make the
+# key too small. If you leave this unset, some default key is used.
# Note: changing this key for an existing database makes that database
-# unusable as noone is any longer able to login.
-# If you use Merovingian, a per-database vault key is used and this
-# setting is ignored.
-#monet_vault_k...@sysconfdir@@dir...@monetdb.secret
+# unusable as noone is any longer able to login. If you use
+# Merovingian, a per-database vault key is used and this setting is
+# ignored.
+#monet_vault_k...@xsysconfdir@@dir...@monetdb.secret
# Merovingian section
#====================
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
