Changeset: afeb4e3df9a9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=afeb4e3df9a9
Modified Files:
gdk/gdk.h
gdk/gdk_bat.c
sql/backends/monet5/Tests/cfunction01.stable.out
sql/backends/monet5/Tests/cqstream00.stable.out
sql/backends/monet5/Tests/cqstream01.stable.out
sql/backends/monet5/Tests/cqstream02.stable.out
sql/backends/monet5/Tests/cqstream03.stable.out
sql/backends/monet5/Tests/cquery05.stable.out
sql/backends/monet5/Tests/cquery06.stable.out
sql/backends/monet5/Tests/cquery07.stable.out
sql/backends/monet5/Tests/cquery08.stable.out
sql/backends/monet5/Tests/cquery09.stable.out
sql/backends/monet5/Tests/cquery10.stable.out
sql/backends/monet5/Tests/cquery11.stable.out
sql/backends/monet5/Tests/cquery12.stable.out
sql/backends/monet5/Tests/cquery13.stable.out
sql/backends/monet5/Tests/cquery14.stable.out
sql/backends/monet5/Tests/cquery15.stable.out
sql/backends/monet5/Tests/cquery16.stable.out
sql/backends/monet5/Tests/cquery17.stable.out
sql/backends/monet5/Tests/cquery18.stable.out
sql/backends/monet5/Tests/cquery19.stable.out
sql/backends/monet5/Tests/cquery20.stable.out
sql/backends/monet5/Tests/cquery21.stable.out
sql/backends/monet5/Tests/cquery22.stable.out
sql/backends/monet5/sql_basket.c
Branch: trails
Log Message:
Test fixes
diffs (truncated from 1003 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -932,6 +932,8 @@ gdk_export gdk_return BUNappend(BAT *b,
gdk_export gdk_return BATappend(BAT *b, BAT *n, BAT *s, bool force)
__attribute__((__warn_unused_result__));
+gdk_export gdk_return BUNremoveproperties(BAT *b)
+ __attribute__((__warn_unused_result__));
gdk_export gdk_return BUNdelete(BAT *b, oid o)
__attribute__((__warn_unused_result__));
gdk_export gdk_return BATdel(BAT *b, BAT *d)
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -1100,6 +1100,14 @@ BUNappend(BAT *b, const void *t, bool fo
}
gdk_return
+BUNremoveproperties(BAT *b)
+{
+ BATrmprop(b, GDK_MAX_VALUE);
+ BATrmprop(b, GDK_MIN_VALUE);
+ return GDK_SUCCEED;
+}
+
+gdk_return
BUNdelete(BAT *b, oid o)
{
BUN p;
diff --git a/sql/backends/monet5/Tests/cfunction01.stable.out
b/sql/backends/monet5/Tests/cfunction01.stable.out
--- a/sql/backends/monet5/Tests/cfunction01.stable.out
+++ b/sql/backends/monet5/Tests/cfunction01.stable.out
@@ -19,52 +19,9 @@ stdout of test 'cfunction01` in director
# MonetDB/SQL module loaded
# MonetDB/Timetrails module loaded
-Ready.
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading sql script: 11_times.sql
-# loading sql script: 12_url.sql
-# loading sql script: 13_date.sql
-# loading sql script: 14_inet.sql
-# loading sql script: 15_querylog.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 17_temporal.sql
-# loading sql script: 18_index.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_functions.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 26_sysmon.sql
-# loading sql script: 27_rejects.sql
-# loading sql script: 39_analytics.sql
-# loading sql script: 39_analytics_hge.sql
-# loading sql script: 40_geom.sql
-# loading sql script: 40_json.sql
-# loading sql script: 40_json_hge.sql
-# loading sql script: 41_md5sum.sql
-# loading sql script: 45_uuid.sql
-# loading sql script: 46_profiler.sql
-# loading sql script: 50_cquery.sql
-# loading sql script: 51_sys_schema_extension.sql
-# loading sql script: 60_wlcr.sql
-# loading sql script: 72_fits.sql
-# loading sql script: 74_netcdf.sql
-# loading sql script: 75_lidar.sql
-# loading sql script: 75_shp.sql
-# loading sql script: 75_storagemodel.sql
-# loading sql script: 80_statistics.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 80_udf_hge.sql
-# loading sql script: 85_bam.sql
-# loading sql script: 90_generator.sql
-# loading sql script: 90_generator_hge.sql
-# loading sql script: 99_system.sql
-
-# 16:27:02 >
-# 16:27:02 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-2361" "--port=36085"
-# 16:27:02 >
+# 14:34:58 >
+# 14:34:58 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-260199" "--port=31840"
+# 14:34:58 >
#create stream table ftmp(i integer) set window 2;
#create function aggr01()
diff --git a/sql/backends/monet5/Tests/cqstream00.stable.out
b/sql/backends/monet5/Tests/cqstream00.stable.out
--- a/sql/backends/monet5/Tests/cqstream00.stable.out
+++ b/sql/backends/monet5/Tests/cqstream00.stable.out
@@ -18,7 +18,9 @@ stdout of test 'cqstream00` in directory
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
-Ready.
+# 14:34:40 >
+# 14:34:40 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-260199" "--port=31840"
+# 14:34:40 >
# 13:18:56 >
# 13:18:56 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6019" "--port=33396"
@@ -41,8 +43,8 @@ Ready.
# insert into result2 select * from stmp2 where val >12;
#end;
#select 'RESULT';
-% .L2 # table_name
-% L2 # name
+% . # table_name
+% single_value # name
% char # type
% 6 # length
[ "RESULT" ]
diff --git a/sql/backends/monet5/Tests/cqstream01.stable.out
b/sql/backends/monet5/Tests/cqstream01.stable.out
--- a/sql/backends/monet5/Tests/cqstream01.stable.out
+++ b/sql/backends/monet5/Tests/cqstream01.stable.out
@@ -18,7 +18,9 @@ stdout of test 'cqstream01` in directory
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
-Ready.
+# 14:34:46 >
+# 14:34:46 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-260199" "--port=31840"
+# 14:34:46 >
# 13:05:17 >
# 13:05:17 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-22244" "--port=30307"
@@ -42,8 +44,8 @@ Ready.
# insert into result2 select * from stmp2 where val >12;
#end;
#select 'RESULT';
-% .L2 # table_name
-% L2 # name
+% . # table_name
+% single_value # name
% char # type
% 6 # length
[ "RESULT" ]
diff --git a/sql/backends/monet5/Tests/cqstream02.stable.out
b/sql/backends/monet5/Tests/cqstream02.stable.out
--- a/sql/backends/monet5/Tests/cqstream02.stable.out
+++ b/sql/backends/monet5/Tests/cqstream02.stable.out
@@ -18,11 +18,9 @@ stdout of test 'cqstream02` in directory
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
-Ready.
-
-# 13:01:24 >
-# 13:01:24 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20007" "--port=32966"
-# 13:01:24 >
+# 14:34:50 >
+# 14:34:50 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-260199" "--port=31840"
+# 14:34:50 >
#create stream table stmp10 (t timestamp, sensor integer, val decimal(8,2)) ;
#create table tmp_aggregate(tmp_total decimal(8,2), tmp_count decimal(8,2));
diff --git a/sql/backends/monet5/Tests/cqstream03.stable.out
b/sql/backends/monet5/Tests/cqstream03.stable.out
--- a/sql/backends/monet5/Tests/cqstream03.stable.out
+++ b/sql/backends/monet5/Tests/cqstream03.stable.out
@@ -18,7 +18,9 @@ stdout of test 'cqstream03` in directory
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
-Ready.
+# 14:34:54 >
+# 14:34:54 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-260199" "--port=31840"
+# 14:34:54 >
# 12:58:46 >
# 12:58:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17764" "--port=38071"
@@ -36,7 +38,7 @@ Ready.
# end if;
#end;
#select * from cquery.status();
-% .L1, .L1, .L1, .L1 # table_name
+% .%1, .%1, .%1, .%1 # table_name
% tick, alias, state, errors # name
% timestamp, clob, clob, clob # type
% 26, 0, 0, 0 # length
diff --git a/sql/backends/monet5/Tests/cquery05.stable.out
b/sql/backends/monet5/Tests/cquery05.stable.out
--- a/sql/backends/monet5/Tests/cquery05.stable.out
+++ b/sql/backends/monet5/Tests/cquery05.stable.out
@@ -18,11 +18,9 @@ stdout of test 'cquery05` in directory '
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
-Ready.
-
-# 10:28:03 >
-# 10:28:03 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25654" "--port=33494"
-# 10:28:03 >
+# 14:05:25 >
+# 14:05:25 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-243009" "--port=38929"
+# 14:05:25 >
#create table cqresult05(i integer);
#create procedure cq_basic()
@@ -30,8 +28,8 @@ Ready.
# insert into cqresult05 (select count(*) from cqresult05);
#end;
#select 'RESULT';
-% .L2 # table_name
-% L2 # name
+% . # table_name
+% single_value # name
% char # type
% 6 # length
[ "RESULT" ]
diff --git a/sql/backends/monet5/Tests/cquery06.stable.out
b/sql/backends/monet5/Tests/cquery06.stable.out
--- a/sql/backends/monet5/Tests/cquery06.stable.out
+++ b/sql/backends/monet5/Tests/cquery06.stable.out
@@ -19,11 +19,9 @@ stdout of test 'cquery06` in directory '
# MonetDB/SQL module loaded
# MonetDB/Timetrails module loaded
-Ready.
-
-# 10:26:37 >
-# 10:26:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24395" "--port=39287"
-# 10:26:37 >
+# 14:05:29 >
+# 14:05:29 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-243009" "--port=38929"
+# 14:05:29 >
#create table cqresult06(i integer);
#create procedure cq_basic06()
diff --git a/sql/backends/monet5/Tests/cquery07.stable.out
b/sql/backends/monet5/Tests/cquery07.stable.out
--- a/sql/backends/monet5/Tests/cquery07.stable.out
+++ b/sql/backends/monet5/Tests/cquery07.stable.out
@@ -19,11 +19,9 @@ stdout of test 'cquery07` in directory '
# MonetDB/SQL module loaded
# MonetDB/Timetrails module loaded
-Ready.
-
-# 10:26:39 >
-# 10:26:39 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24395" "--port=39287"
-# 10:26:39 >
+# 14:05:32 >
+# 14:05:32 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-243009" "--port=38929"
+# 14:05:32 >
#create table cqresult07(i integer);
#create procedure cq_basic07()
diff --git a/sql/backends/monet5/Tests/cquery08.stable.out
b/sql/backends/monet5/Tests/cquery08.stable.out
--- a/sql/backends/monet5/Tests/cquery08.stable.out
+++ b/sql/backends/monet5/Tests/cquery08.stable.out
@@ -19,11 +19,9 @@ stdout of test 'cquery08` in directory '
# MonetDB/SQL module loaded
# MonetDB/Timetrails module loaded
-Ready.
-
-# 22:02:36 >
-# 22:02:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9376" "--port=30916"
-# 22:02:36 >
+# 14:05:35 >
+# 14:05:35 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-243009" "--port=38929"
+# 14:05:35 >
#create table cqresult081(i integer);
#create procedure cq_basic081()
diff --git a/sql/backends/monet5/Tests/cquery09.stable.out
b/sql/backends/monet5/Tests/cquery09.stable.out
--- a/sql/backends/monet5/Tests/cquery09.stable.out
+++ b/sql/backends/monet5/Tests/cquery09.stable.out
@@ -19,51 +19,9 @@ stdout of test 'cquery09` in directory '
# MonetDB/SQL module loaded
# MonetDB/Timetrails module loaded
-Ready.
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading sql script: 11_times.sql
-# loading sql script: 12_url.sql
-# loading sql script: 13_date.sql
-# loading sql script: 14_inet.sql
-# loading sql script: 15_querylog.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 17_temporal.sql
-# loading sql script: 18_index.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_functions.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 26_sysmon.sql
-# loading sql script: 27_rejects.sql
-# loading sql script: 39_analytics.sql
-# loading sql script: 39_analytics_hge.sql
-# loading sql script: 40_geom.sql
-# loading sql script: 40_json.sql
-# loading sql script: 40_json_hge.sql
-# loading sql script: 41_md5sum.sql
-# loading sql script: 45_uuid.sql
-# loading sql script: 46_profiler.sql
-# loading sql script: 50_cquery.sql
-# loading sql script: 51_sys_schema_extension.sql
-# loading sql script: 60_wlcr.sql
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
