Changeset: bcf089a04fd6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bcf089a04fd6
Added Files:
sql/test/copy/Tests/key_copy.stable.err
sql/test/copy/Tests/key_copy.stable.out
Modified Files:
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/server/rel_updates.c
sql/test/leaks/Tests/check1_bam.stable.out.int128
sql/test/leaks/Tests/check2_bam.stable.out.int128
sql/test/leaks/Tests/check3_bam.stable.out.int128
sql/test/leaks/Tests/check4_bam.stable.out.int128
sql/test/leaks/Tests/check5_bam.stable.out.int128
Branch: resultset
Log Message:
fixed merge problem (copy into with headers)
approved more output
diffs (truncated from 495 to 300 lines):
diff --git a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
@@ -29,9 +29,9 @@ Ready.
% clob # type
% 82 # length
function user.s2_1{autoCommit=true}(A0:bte,A1:bte):void;
- X_11:void := querylog.define("explain select
fuse(1,2);","sequential_pipe",5);
+ X_12:void := querylog.define("explain select
fuse(1,2);","sequential_pipe",5);
X_4 := udf.fuse(A0,A1);
- sql.resultSet(".L","fuse_single_value","smallint",16,0,X_4);
+ sql.resultSet(".L","fuse_single_value","smallint",16,0,7,X_4);
end user.s2_1;
#select fuse(1,2);
% .L # table_name
@@ -45,9 +45,9 @@ end user.s2_1;
% clob # type
% 88 # length
function user.s3_1{autoCommit=true}(A0:sht,A1:sht):void;
- X_11:void := querylog.define("explain select
fuse(1000,2000);","sequential_pipe",5);
+ X_12:void := querylog.define("explain select
fuse(1000,2000);","sequential_pipe",5);
X_4 := udf.fuse(A0,A1);
- sql.resultSet(".L","fuse_single_value","int",32,0,X_4);
+ sql.resultSet(".L","fuse_single_value","int",32,0,7,X_4);
end user.s3_1;
#select fuse(1000,2000);
% .L # table_name
@@ -61,9 +61,9 @@ end user.s3_1;
% clob # type
% 94 # length
function user.s4_1{autoCommit=true}(A0:int,A1:int):void;
- X_11:void := querylog.define("explain select
fuse(1000000,2000000);","sequential_pipe",5);
+ X_12:void := querylog.define("explain select
fuse(1000000,2000000);","sequential_pipe",5);
X_4 := udf.fuse(A0,A1);
- sql.resultSet(".L","fuse_single_value","bigint",64,0,X_4);
+ sql.resultSet(".L","fuse_single_value","bigint",64,0,7,X_4);
end user.s4_1;
#select fuse(1000000,2000000);
% .L # table_name
diff --git a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
--- a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
+++ b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
@@ -48,11 +48,11 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 94 # length
+% 95 # length
function user.s2_1{autoCommit=true}(A0:str):void;
- X_9:void := querylog.define("explain select
reverse(\\'MonetDB\\');","sequential_pipe",5);
+ X_10:void := querylog.define("explain select
reverse(\\'MonetDB\\');","sequential_pipe",5);
X_3 := udf.reverse(A0);
- sql.resultSet(".L","reverse_single_value","clob",0,0,X_3);
+ sql.resultSet(".L","reverse_single_value","clob",0,0,4,X_3);
end user.s2_1;
#select reverse('MonetDB');
% .L # table_name
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -1225,7 +1225,7 @@ copyfrom(mvc *sql, dlist *qname, dlist *
return sql_error(sql, 02, "COPY INTO: filename
must "
"have absolute path: %s",
fname);
- nrel = rel_import(sql, t, tsep, rsep, ssep, ns, fname,
nr, offset, locked, best_effort);
+ nrel = rel_import(sql, nt, tsep, rsep, ssep, ns, fname,
nr, offset, locked, best_effort);
if (!rel)
rel = nrel;
@@ -1235,7 +1235,7 @@ copyfrom(mvc *sql, dlist *qname, dlist *
return rel;
}
} else {
- rel = rel_import(sql, t, tsep, rsep, ssep, ns, NULL, nr,
offset, locked, best_effort);
+ rel = rel_import(sql, nt, tsep, rsep, ssep, ns, NULL, nr,
offset, locked, best_effort);
}
if (headers) {
dnode *n;
diff --git a/sql/test/copy/Tests/key_copy.stable.err
b/sql/test/copy/Tests/key_copy.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/copy/Tests/key_copy.stable.err
@@ -0,0 +1,51 @@
+stderr of test 'key_copy` in directory 'sql/test/copy` itself:
+
+
+# 18:36:17 >
+# 18:36:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32293" "--set"
"mapi_usock=/var/tmp/mtest-6766/.s.monetdb.32293" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/resultset/Linux-x86_64/var/MonetDB/mTests_sql_test_copy"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 18:36:17 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/resultset/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 32293
+# cmdline opt mapi_usock = /var/tmp/mtest-6766/.s.monetdb.32293
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/resultset/Linux-x86_64/var/MonetDB/mTests_sql_test_copy
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 18:36:17 >
+# 18:36:17 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6766" "--port=32293"
+# 18:36:17 >
+
+MAPI = (monetdb) /var/tmp/mtest-6766/.s.monetdb.32293
+QUERY = copy 4 records into cik1 from stdin USING DELIMITERS ',','\n','\"'
NULL AS '';
+ 0
+ 5
+ 5
+ 9
+
+MAPI = (monetdb) /var/tmp/mtest-6766/.s.monetdb.32293
+QUERY = copy 4 records into cik1 from stdin USING DELIMITERS ',','\n','\"'
NULL AS '';
+ 0,1
+ 5,1
+ 5,1
+ 9,1
+
+
+# 18:36:17 >
+# 18:36:17 > "Done."
+# 18:36:17 >
+
diff --git a/sql/test/copy/Tests/key_copy.stable.out
b/sql/test/copy/Tests/key_copy.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/copy/Tests/key_copy.stable.out
@@ -0,0 +1,46 @@
+stdout of test 'key_copy` in directory 'sql/test/copy` itself:
+
+
+# 18:36:17 >
+# 18:36:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32293" "--set"
"mapi_usock=/var/tmp/mtest-6766/.s.monetdb.32293" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/resultset/Linux-x86_64/var/MonetDB/mTests_sql_test_copy"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 18:36:17 >
+
+# MonetDB 5 server v11.20.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_copy', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.333 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:32293/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-6766/.s.monetdb.32293
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 18:36:17 >
+# 18:36:17 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6766" "--port=32293"
+# 18:36:17 >
+
+#create table cik1(i int, primary key(i));
+#create table cik2(i int, j int, primary key(i,j));
+#select * from cik1;
+% sys.cik1 # table_name
+% i # name
+% int # type
+% 1 # length
+#select * from cik2;
+% sys.cik2, sys.cik2 # table_name
+% i, j # name
+% int, int # type
+% 1, 1 # length
+#drop table cik1;
+#drop table cik2;
+
+# 18:36:17 >
+# 18:36:17 > "Done."
+# 18:36:17 >
+
diff --git a/sql/test/leaks/Tests/check1_bam.stable.out.int128
b/sql/test/leaks/Tests/check1_bam.stable.out.int128
--- a/sql/test/leaks/Tests/check1_bam.stable.out.int128
+++ b/sql/test/leaks/Tests/check1_bam.stable.out.int128
@@ -40,10 +40,10 @@ Ready.
[ "oid", "bit", 4 ]
[ "oid", "bit", 46 ]
[ "oid", "bit", 333 ]
-[ "oid", "bit", 1516 ]
-[ "oid", "bit", 1516 ]
-[ "oid", "bit", 1516 ]
-[ "oid", "bte", 4243 ]
+[ "oid", "bit", 1521 ]
+[ "oid", "bit", 1521 ]
+[ "oid", "bit", 1521 ]
+[ "oid", "bte", 4256 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -104,16 +104,16 @@ Ready.
[ "oid", "int", 333 ]
[ "oid", "int", 333 ]
[ "oid", "int", 333 ]
-[ "oid", "int", 1516 ]
-[ "oid", "int", 1516 ]
-[ "oid", "int", 1516 ]
-[ "oid", "int", 1516 ]
-[ "oid", "int", 1516 ]
-[ "oid", "int", 4243 ]
-[ "oid", "int", 4243 ]
-[ "oid", "int", 4243 ]
-[ "oid", "int", 4243 ]
-[ "oid", "int", 4243 ]
+[ "oid", "int", 1521 ]
+[ "oid", "int", 1521 ]
+[ "oid", "int", 1521 ]
+[ "oid", "int", 1521 ]
+[ "oid", "int", 1521 ]
+[ "oid", "int", 4256 ]
+[ "oid", "int", 4256 ]
+[ "oid", "int", 4256 ]
+[ "oid", "int", 4256 ]
+[ "oid", "int", 4256 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -236,11 +236,11 @@ Ready.
[ "oid", "str", 333 ]
[ "oid", "str", 333 ]
[ "oid", "str", 333 ]
-[ "oid", "str", 1516 ]
-[ "oid", "str", 1516 ]
-[ "oid", "str", 1516 ]
-[ "oid", "str", 4243 ]
-[ "oid", "str", 4243 ]
+[ "oid", "str", 1521 ]
+[ "oid", "str", 1521 ]
+[ "oid", "str", 1521 ]
+[ "oid", "str", 4256 ]
+[ "oid", "str", 4256 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check2_bam.stable.out.int128
b/sql/test/leaks/Tests/check2_bam.stable.out.int128
--- a/sql/test/leaks/Tests/check2_bam.stable.out.int128
+++ b/sql/test/leaks/Tests/check2_bam.stable.out.int128
@@ -40,10 +40,10 @@ Ready.
[ "oid", "bit", 4 ]
[ "oid", "bit", 46 ]
[ "oid", "bit", 333 ]
-[ "oid", "bit", 1516 ]
-[ "oid", "bit", 1516 ]
-[ "oid", "bit", 1516 ]
-[ "oid", "bte", 4243 ]
+[ "oid", "bit", 1521 ]
+[ "oid", "bit", 1521 ]
+[ "oid", "bit", 1521 ]
+[ "oid", "bte", 4256 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -104,16 +104,16 @@ Ready.
[ "oid", "int", 333 ]
[ "oid", "int", 333 ]
[ "oid", "int", 333 ]
-[ "oid", "int", 1516 ]
-[ "oid", "int", 1516 ]
-[ "oid", "int", 1516 ]
-[ "oid", "int", 1516 ]
-[ "oid", "int", 1516 ]
-[ "oid", "int", 4243 ]
-[ "oid", "int", 4243 ]
-[ "oid", "int", 4243 ]
-[ "oid", "int", 4243 ]
-[ "oid", "int", 4243 ]
+[ "oid", "int", 1521 ]
+[ "oid", "int", 1521 ]
+[ "oid", "int", 1521 ]
+[ "oid", "int", 1521 ]
+[ "oid", "int", 1521 ]
+[ "oid", "int", 4256 ]
+[ "oid", "int", 4256 ]
+[ "oid", "int", 4256 ]
+[ "oid", "int", 4256 ]
+[ "oid", "int", 4256 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -236,11 +236,11 @@ Ready.
[ "oid", "str", 333 ]
[ "oid", "str", 333 ]
[ "oid", "str", 333 ]
-[ "oid", "str", 1516 ]
-[ "oid", "str", 1516 ]
-[ "oid", "str", 1516 ]
-[ "oid", "str", 4243 ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
