Changeset: b826d54cf689 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b826d54cf689
Modified Files:
MonetDB5/src/optimizer/opt_support.mx
clients/src/mapilite/Makefile.ag
clients/src/mapilite/mapilite.c
clients/src/mapilite/mapilite.h
clients/src/mapilite/tests/__init__.py
clients/src/mapilite/tests/generate.sh
clients/src/mapilite/tests/mapi_structs.h
clients/src/mapilite/tests/mapi_structs.py
clients/src/mapilite/tests/runtests.py
clients/src/mapilite/tests/test_mapi.py
Branch: default
Log Message:
Merge results
diffs (truncated from 9043 to 300 lines):
diff -r 81e8aefb8cc9 -r b826d54cf689 .hgignore
--- a/.hgignore Wed Jul 21 08:29:21 2010 +0200
+++ b/.hgignore Wed Jul 21 08:31:03 2010 +0200
@@ -50,6 +50,8 @@
^java/NT/.*\.jar$
^java/NT/nl/
^java/NT/tests/
+^java/build/
+^java/jars/
^pathfinder/NT/compiler/
^pathfinder/NT/modules/
^pathfinder/NT/runtime/
diff -r 81e8aefb8cc9 -r b826d54cf689
MonetDB4/tests/BugsViaSourgeforce/Tests/ID.853867.timeout
--- a/MonetDB4/tests/BugsViaSourgeforce/Tests/ID.853867.timeout Wed Jul 21
08:29:21 2010 +0200
+++ b/MonetDB4/tests/BugsViaSourgeforce/Tests/ID.853867.timeout Wed Jul 21
08:31:03 2010 +0200
@@ -1,1 +1,1 @@
-0.1
+0.3
diff -r 81e8aefb8cc9 -r b826d54cf689 MonetDB5/src/mal/Tests/tst036.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB5/src/mal/Tests/tst036.stable.err Wed Jul 21 08:31:03 2010 +0200
@@ -0,0 +1,75 @@
+stderr of test 'tst036` in directory 'src/mal` itself:
+
+
+# 17:28:20 >
+# 17:28:20 > mserver5 "--config=/ufs/mk/Jun2010//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/Jun2010//Linux/lib/MonetDB5:/ufs/mk/Jun2010//Linux/lib/MonetDB5/lib:/ufs/mk/Jun2010//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/Jun2010//Linux/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=38406 --set xrpc_port=45263
--set monet_prompt= --set mal_listing=2 --trace --dbname=mTests_src_mal
tst036.mal
+# 17:28:20 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.39.0
+# builtin opt prefix = /ufs/mk/Jun2010//Linux
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 50000
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/mk/Jun2010//Linux
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/mk/Jun2010//Linux
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt sql_optimizer = default_pipe
+# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt no_mitosis_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sequential_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,derivePath,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt dictionary_pipe =
inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt compression_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,compression,dataflow,history,multiplex,garbageCollector
+# config opt opt_debug =
+# cmdline opt config = /ufs/mk/Jun2010//Linux/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt monet_mod_path =
/ufs/mk/Jun2010//Linux/lib/MonetDB5:/ufs/mk/Jun2010//Linux/lib/MonetDB5/lib:/ufs/mk/Jun2010//Linux/lib/MonetDB5/bin
+# cmdline opt gdk_dbfarm = /ufs/mk/Jun2010//Linux/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 38406
+# cmdline opt xrpc_port = 45263
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_src_mal
+#warning: please don't forget to set your vault key!
+#(see /ufs/mk/Jun2010//Linux/etc/monetdb5.conf)
+
+# 17:28:20 >
+# 17:28:20 > Done.
+# 17:28:20 >
+
diff -r 81e8aefb8cc9 -r b826d54cf689 MonetDB5/src/mal/Tests/tst036.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB5/src/mal/Tests/tst036.stable.out Wed Jul 21 08:31:03 2010 +0200
@@ -0,0 +1,35 @@
+stdout of test 'tst036` in directory 'src/mal` itself:
+
+
+# 17:28:20 >
+# 17:28:20 > mserver5 "--config=/ufs/mk/Jun2010//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/Jun2010//Linux/lib/MonetDB5:/ufs/mk/Jun2010//Linux/lib/MonetDB5/lib:/ufs/mk/Jun2010//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/Jun2010//Linux/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=38406 --set xrpc_port=45263
--set monet_prompt= --set mal_listing=2 --trace --dbname=mTests_src_mal
tst036.mal
+# 17:28:20 >
+
+# MonetDB server v5.21.0, based on kernel v1.39.0
+# Serving database 'mTests_src_mal', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.751 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2010 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:38406/
+# MonetDB/SQL module v2.39.0 loaded
+# MonetDB/GIS module v0.19.0 loaded
+!TypeException:user.main[6]:Multiple assignment mismatch
+!TypeException:user.main[7]:Multiple assignment mismatch
+!TypeException:user.main[8]:Multiple assignment mismatch
+function user.main():void;
+# test for proper use of list assignments
+ (z0,z1) := (1,"help");
+ io.print(z0);
+ io.print(z1);
+# all three are wrong
+ l1 := (1,2);
+ (l2,l3) := 3;
+ (l4,l5) := (4,5,6);
+end main;
+
+# 17:28:20 >
+# 17:28:20 > Done.
+# 17:28:20 >
+
diff -r 81e8aefb8cc9 -r b826d54cf689 MonetDB5/src/optimizer/opt_remap.mx
--- a/MonetDB5/src/optimizer/opt_remap.mx Wed Jul 21 08:29:21 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_remap.mx Wed Jul 21 08:31:03 2010 +0200
@@ -163,7 +163,7 @@
OPTmultiplexInline(Client cntxt, MalBlkPtr mb, InstrPtr p, int pc )
{
MalBlkPtr mq;
- InstrPtr q,sig;
+ InstrPtr q = NULL, sig;
char buf[1024];
int i,j,k, actions=0;
int refbat=0;
@@ -317,7 +317,8 @@
terminateMX:
OPTDEBUGremap {
stream_printf(cntxt->fdout,"Abort remap\n");
- printInstruction(cntxt->fdout,mb,0,q,LIST_MAL_ALL);
+ if (q)
+
printInstruction(cntxt->fdout,mb,0,q,LIST_MAL_ALL);
}
freeMalBlk(mq);
GDKfree(upgrade);
diff -r 81e8aefb8cc9 -r b826d54cf689 MonetDB5/src/optimizer/opt_support.mx
--- a/MonetDB5/src/optimizer/opt_support.mx Wed Jul 21 08:29:21 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_support.mx Wed Jul 21 08:31:03 2010 +0200
@@ -570,7 +570,7 @@
#define DEBUG_OPT_HEURISTIC 49
#define DEBUG_OPT_TARANTULA 50
-#define DEBUG_OPT(X) ( 1 << (X))
+#define DEBUG_OPT(X) ((lng) 1 << (X))
opt_export lng optDebug;
opt_export str MALoptimizer(Client c);
@@ -761,7 +761,7 @@
}
}
for ( t = s = name; t && *t ; t = s){
- s = index(s,',');
+ s = strchr(s,',');
if ( s ) *s++ = 0;
for ( i=0; optcatalog[i].name; i++)
if ( strcmp(t,optcatalog[i].name) == 0){
diff -r 81e8aefb8cc9 -r b826d54cf689 clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Wed Jul 21 08:29:21 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Wed Jul 21 08:31:03 2010 +0200
@@ -1,3 +1,7 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Tue Jul 20 2010 Sjoerd Mullender <[email protected]>
+- In case of an incomplete line from the server, add a newline.
+ This fixes bug 2619.
+
diff -r 81e8aefb8cc9 -r b826d54cf689 clients/configure.ag
--- a/clients/configure.ag Wed Jul 21 08:29:21 2010 +0200
+++ b/clients/configure.ag Wed Jul 21 08:31:03 2010 +0200
@@ -83,18 +83,6 @@
AC_PROG_LIBTOOL
-have_mapilite=no
-AC_ARG_WITH([mapilite],
-[AS_HELP_STRING([--with-mapilite],
-[enable experimental lightweight mapi library])],
-[have_mapilite=yes],
-[have_mapilite=no])
-
-AS_IF([test "x$have_mapilite" != xno],
- AC_DEFINE([HAVE_MAPILITE], [1], [Define if you want to use the mapilite
library])
-)
-AM_CONDITIONAL(HAVE_MAPILITE, test x$have_mapilite != xno)
-
# Checks for libraries.
dnl unixODBC
dnl this is only used by the ODBC driver
diff -r 81e8aefb8cc9 -r b826d54cf689 clients/src/Makefile.ag
--- a/clients/src/Makefile.ag Wed Jul 21 08:29:21 2010 +0200
+++ b/clients/src/Makefile.ag Wed Jul 21 08:31:03 2010 +0200
@@ -15,4 +15,4 @@
# Copyright August 2008-2010 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php
HAVE_RUBYGEM?ruby examples HAVE_MAPILITE?mapilite
+SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php
HAVE_RUBYGEM?ruby examples
diff -r 81e8aefb8cc9 -r b826d54cf689 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Wed Jul 21 08:29:21 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Wed Jul 21 08:31:03 2010 +0200
@@ -3541,13 +3541,18 @@
printf("got next block: length:" SSZFMT "\n", len);
printf("text:%s\n", mid->blk.buf + mid->blk.end);
}
- if (!len) { /* add prompt */
+ if (len == 0) { /* add prompt */
+ if (mid->blk.end > mid->blk.nxt) {
+ /* add fake newline since newline was
+ * missing from server */
+ nl = mid->blk.buf + mid->blk.end;
+ *nl = '\n';
+ mid->blk.end++;
+ }
len = 2;
mid->blk.buf[mid->blk.end] = PROMPTBEG;
mid->blk.buf[mid->blk.end + 1] = '\n';
mid->blk.buf[mid->blk.end + 2] = 0;
- if (!nl)
- nl = mid->blk.buf + mid->blk.end + 1;
}
mid->blk.end += (int) len;
}
diff -r 81e8aefb8cc9 -r b826d54cf689 clients/src/mapilite/Makefile.ag
--- a/clients/src/mapilite/Makefile.ag Wed Jul 21 08:29:21 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# 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.
-
-MTSAFE
-INCLUDES = $(MONETDB_INCS) $(READLINE_INCS) $(OPENSSL_INCS)
-
-MAPI_LIBS = $(SOCKET_LIBS) $(OPENSSL_LIBS)
-
-lib_mapilite = {
- SOURCES = mapilite.c
- LIBS = $(MAPI_LIBS) $(MONETDB_LIBS) -lmutils -lstream
-}
-
-headers_mapilite = {
- DIR = includedir/MonetDB/mapilitelib
- HEADERS = h
- SOURCES = mapilite.h
-}
diff -r 81e8aefb8cc9 -r b826d54cf689 clients/src/mapilite/mapilite.c
--- a/clients/src/mapilite/mapilite.c Wed Jul 21 08:29:21 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4046 +0,0 @@
-
-#include "clients_config.h"
-#include <monet_utils.h>
-#include <stream.h> /* include before Mapi.h */
-#include <stream_socket.h>
-#include "mapilite.h"
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
