Changeset: ff756ececcfa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ff756ececcfa
Removed Files:
sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out.int128
sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out.int128
sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out.int128
sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out.int128
sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out.int128
sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out.int128
sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out.int128
sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out.int128
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.out.int128
sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out.int128
Modified Files:
sql/server/rel_prop.c
sql/server/rel_prop.h
sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.sql
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.sql
sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.sql
sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.sql
sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.sql
sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.sql
sql/test/BugTracker-2019/Tests/sequence-first-next-value.Bug-6743.stable.out
Branch: default
Log Message:
Merge with Nov2019
diffs (truncated from 1321 to 300 lines):
diff --git a/sql/server/rel_prop.c b/sql/server/rel_prop.c
--- a/sql/server/rel_prop.c
+++ b/sql/server/rel_prop.c
@@ -11,7 +11,7 @@
#include "rel_prop.h"
prop *
-prop_create( sql_allocator *sa, int kind, prop *pre )
+prop_create( sql_allocator *sa, rel_prop kind, prop *pre )
{
prop *p = SA_NEW(sa, prop);
@@ -50,7 +50,7 @@ prop_remove( prop *plist, prop *p )
}
prop *
-find_prop( prop *p, int kind)
+find_prop( prop *p, rel_prop kind)
{
while(p) {
if (p->kind == kind)
diff --git a/sql/server/rel_prop.h b/sql/server/rel_prop.h
--- a/sql/server/rel_prop.h
+++ b/sql/server/rel_prop.h
@@ -9,29 +9,29 @@
#ifndef _REL_PROP_H_
#define _REL_PROP_H_
+typedef enum rel_prop {
+ PROP_COUNT,
+ PROP_JOINIDX, /* could use join idx */
+ PROP_HASHIDX, /* is hash idx */
+ PROP_SORTIDX, /* is sorted */
+ PROP_HASHCOL, /* could use hash idx */
+ PROP_FETCH, /* fetchjoin */
+ PROP_REMOTE, /* uri for remote execution */
+ PROP_USED, /* number of times exp is used */
+ PROP_DISTRIBUTE /* used by merge tables when sql.affectedRows is the
sum of several insert/update/delete statements */
+} rel_prop;
+
typedef struct prop {
- int kind; /* kind of property */
- void *value; /* property value */
- struct prop *p; /* some relations may have many properties,
- which are kept in a chain list */
+ rel_prop kind; /* kind of property */
+ void *value; /* property value */
+ struct prop *p; /* some relations may have many properties, which are
kept in a chain list */
} prop;
-#define PROP_COUNT 0
-#define PROP_JOINIDX 1 /* could use join idx */
-#define PROP_HASHIDX 2 /* is hash idx */
-#define PROP_SORTIDX 3 /* is sorted */
-#define PROP_HASHCOL 4 /* could use hash idx */
-#define PROP_FETCH 5 /* fetchjoin */
-#define PROP_REMOTE 6 /* uri for remote execution */
-#define PROP_USED 10 /* number of times exp is used */
-#define PROP_DISTRIBUTE 11 /* number of times exp is used */
-
-extern prop * prop_create( sql_allocator *sa, int kind, prop *pre );
+extern prop * prop_create( sql_allocator *sa, rel_prop kind, prop *pre );
extern prop * prop_copy( sql_allocator *sa, prop *p);
extern prop * prop_remove( prop *plist, prop *p);
-extern prop * find_prop( prop *p, int kind);
+extern prop * find_prop( prop *p, rel_prop kind);
extern const char * propkind2string( prop *p);
extern char * propvalue2string( prop *p);
#endif /* _REL_PROP_H_ */
-
diff --git a/sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.sql
b/sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.sql
--- a/sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.sql
+++ b/sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.sql
@@ -1,5 +1,5 @@
create table foo (a int);
insert into foo values (1),(2),(3);
-select sum(1) as v from foo group by a;
-select 100*v from (select sum(1) as v from foo group by a) as t;
+select cast(sum(1) as bigint) as v from foo group by a;
+select cast(100*v as bigint) from (select sum(1) as v from foo group by a) as
t;
drop table foo;
diff --git
a/sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128
b/sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128
deleted file mode 100644
---
a/sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128
+++ /dev/null
@@ -1,54 +0,0 @@
-stdout of test 'incorrect_result_type.Bug-3687` in directory
'sql/test/BugTracker-2015` itself:
-
-
-# 15:10:52 >
-# 15:10:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32751" "--set"
"mapi_usock=/var/tmp/mtest-17407/.s.monetdb.32751" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
-# 15:10:52 >
-
-# MonetDB 5 server v11.19.10
-# This is an unreleased version
-# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs 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:32751/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17407/.s.monetdb.32751
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-
-# 15:10:52 >
-# 15:10:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17407" "--port=32751"
-# 15:10:52 >
-
-#create table foo (a int);
-#insert into foo values (1),(2),(3);
-[ 3 ]
-#select sum(1) as v from foo group by a;
-% . # table_name
-# .L3 # table_name
-% v # name
-% hugeint # type
-% 1 # length
-[ 1 ]
-[ 1 ]
-[ 1 ]
-#select 100*v from (select sum(1) as v from foo group by a) as t;
-% . # table_name
-# .L5 # table_name
-% L # name
-# L5 # name
-% hugeint # type
-% 3 # length
-[ 100 ]
-[ 100 ]
-[ 100 ]
-#drop table foo;
-
-# 15:10:52 >
-# 15:10:52 > "Done."
-# 15:10:52 >
-
diff --git
a/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.sql
b/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.sql
--- a/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.sql
+++ b/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.sql
@@ -10,10 +10,10 @@ SELECT a AS "A", b AS "B", c AS "C" FROM
-- SELECT: identifier 'A' unknown
SELECT * FROM (SELECT a AS "A", b AS "B", c AS "C" FROM t_alias) T1 WHERE "A"
< "B";
-SELECT a AS "A", b * b AS "B", c AS "C" FROM t_alias WHERE "b" * b >99;
+SELECT a AS "A", CAST(b * b AS BIGINT) AS "B", c AS "C" FROM t_alias WHERE "b"
* b >99;
SELECT a AS "A", b * b AS "B", c AS "C" FROM t_alias WHERE "B" >99;
-- SELECT: identifier 'B' unknown
-SELECT * FROM (SELECT a AS "A", b * b AS "B", c AS "C" FROM t_alias) T1 WHERE
"B" >99;
+SELECT * FROM (SELECT a AS "A", CAST(b * b AS BIGINT) AS "B", c AS "C" FROM
t_alias) T1 WHERE "B" >99;
SELECT a AS "A", b AS "B", c AS "C" FROM t_alias WHERE "c" LIKE '%en';
SELECT a AS "A", b AS "B", c AS "C" FROM t_alias WHERE "C" LIKE '%en';
@@ -37,8 +37,8 @@ SELECT * FROM (SELECT cast(null as char(
-- column aliases can be used in ORDER BY and GROUP BY clauses
SELECT a AS "A", b AS "B", c AS "C" FROM t_alias ORDER BY "C", "A", "B";
-SELECT a*b AS "A*B", c AS "C" FROM t_alias GROUP BY "C", "A*B";
-SELECT a*b*b AS "A*B", c AS "C" FROM t_alias GROUP BY "C", "A*B" HAVING "A*B"
IS NOT NULL ORDER BY -"A*B";
+SELECT CAST(a*b AS BIGINT) AS "A*B", c AS "C" FROM t_alias GROUP BY "C", "A*B";
+SELECT CAST(a*b*b AS BIGINT) AS "A*B", c AS "C" FROM t_alias GROUP BY "C",
"A*B" HAVING "A*B" IS NOT NULL ORDER BY -"A*B";
DROP TABLE t_alias;
diff --git
a/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out.int128
b/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out.int128
deleted file mode 100644
---
a/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out.int128
+++ /dev/null
@@ -1,170 +0,0 @@
-stdout of test 'column_alias_in_where_clause.Bug-3947` in directory
'sql/test/BugTracker-2016` itself:
-
-
-# 12:19:53 >
-# 12:19:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31701" "--set"
"mapi_usock=/var/tmp/mtest-12389/.s.monetdb.31701" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch2/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "embedded_r=yes"
-# 12:19:53 >
-
-# MonetDB 5 server v11.23.0
-# This is an unreleased version
-# Serving database 'mTests_sql_test_BugTracker-2016', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
-# Found 15.589 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://toulouse.da.cwi.nl:31701/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-12389/.s.monetdb.31701
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-# 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: 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: 24_zorder.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_gsl.sql
-# loading sql script: 46_profiler.sql
-# loading sql script: 51_sys_schema_extension.sql
-# loading sql script: 72_fits.sql
-# loading sql script: 74_netcdf.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
-
-# 12:19:54 >
-# 12:19:54 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-12389" "--port=31701"
-# 12:19:54 >
-
-#CREATE TABLE t_alias (a int NOT NULL, b int NOT NULL, c varchar(10) NOT NULL);
-#INSERT INTO t_alias (a, b, c) VALUES (1, 10, 'tien');
-[ 1 ]
-#INSERT INTO t_alias (a, b, c) VALUES (11, 2, 'elf');
-[ 1 ]
-#SELECT * FROM t_alias ORDER BY 1;
-% sys.t_alias, sys.t_alias, sys.t_alias # table_name
-% a, b, c # name
-% int, int, varchar # type
-% 2, 2, 4 # length
-[ 1, 10, "tien" ]
-[ 11, 2, "elf" ]
-#SELECT a AS "A", b AS "B", c AS "C" FROM t_alias ORDER BY 1;
-% sys.L1, sys.L2, sys.L3 # table_name
-% A, B, C # name
-% int, int, varchar # type
-% 2, 2, 4 # length
-[ 1, 10, "tien" ]
-[ 11, 2, "elf" ]
-#SELECT * FROM (SELECT a AS "A", b AS "B", c AS "C" FROM t_alias) T1 WHERE "A"
< "B";
-% sys.t1, sys.t1, sys.t1 # table_name
-% A, B, C # name
-% int, int, varchar # type
-% 1, 2, 4 # length
-[ 1, 10, "tien" ]
-#SELECT a AS "A", b * b AS "B", c AS "C" FROM t_alias WHERE "b" * b >99;
-% sys.L1, sys.L2, sys.L3 # table_name
-% A, B, C # name
-% int, hugeint, varchar # type
-% 1, 3, 4 # length
-[ 1, 100, "tien" ]
-#SELECT * FROM (SELECT a AS "A", b * b AS "B", c AS "C" FROM t_alias) T1 WHERE
"B" >99;
-% sys.t1, sys.t1, sys.t1 # table_name
-% A, B, C # name
-% int, hugeint, varchar # type
-% 1, 3, 4 # length
-[ 1, 100, "tien" ]
-#SELECT a AS "A", b AS "B", c AS "C" FROM t_alias WHERE "c" LIKE '%en';
-% sys.L1, sys.L2, sys.L3 # table_name
-% A, B, C # name
-% int, int, varchar # type
-% 1, 2, 4 # length
-[ 1, 10, "tien" ]
-#SELECT * FROM (SELECT a AS "A", b AS "B", c AS "C" FROM t_alias) T1 WHERE "C"
LIKE '%en';
-% sys.t1, sys.t1, sys.t1 # table_name
-% A, B, C # name
-% int, int, varchar # type
-% 1, 2, 4 # length
-[ 1, 10, "tien" ]
-#SELECT cast(null as char(1)) AS "CAT", a AS "A", c AS "C" FROM t_alias WHERE
"c" = 'null';
-% .L2, sys.L3, sys.L4 # table_name
-% CAT, A, C # name
-% char, int, varchar # type
-% 1, 1, 0 # length
-#SELECT * FROM (SELECT cast(null as char(1)) AS "CAT", a AS "A", c AS "C" FROM
t_alias) T1 WHERE "CAT" = 'null';
-% .t1, sys.t1, sys.t1 # table_name
-% CAT, A, C # name
-% char, int, varchar # type
-% 1, 1, 0 # length
-#SELECT * FROM (SELECT cast(null as char(1)) AS "CAT", a AS "A", c AS "C" FROM
t_alias) T1 WHERE "CAT" IS NULL;
-% .t1, sys.t1, sys.t1 # table_name
-% CAT, A, C # name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
