Changeset: 0465ef6a9a6c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0465ef6a9a6c
Modified Files:
monetdb5/optimizer/Tests/manifold2.stable.out.single
sql/test/sys-schema/Tests/check_MaxStrLength_violations.sql
sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
Branch: default
Log Message:
Approved output
diffs (53 lines):
diff --git a/monetdb5/optimizer/Tests/manifold2.stable.out.single
b/monetdb5/optimizer/Tests/manifold2.stable.out.single
--- a/monetdb5/optimizer/Tests/manifold2.stable.out.single
+++ b/monetdb5/optimizer/Tests/manifold2.stable.out.single
@@ -32,7 +32,7 @@ function user.tst(b:bat[:dbl], b2:bat[:d
barrier (X_6:oid, X_7:dbl) := iterator.new(b:bat[:dbl]); #[4] (0)
ITRbunIterator 12 13 <- 1
X_9:dbl := algebra.fetch(b2:bat[:dbl], X_6:oid); #[5] (0) ALGfetchoid 15
<- 2 12
X_11:dbl := calc.max(X_7:dbl, X_9:dbl); #[6] (0) CALCmax 17 <- 13 15
- bat.append(X_3:bat[:dbl], X_11:dbl); #[7] (0) BKCappend_val_wrap 18
<- 9 17
+ X_3:bat[:dbl] := bat.append(X_3:bat[:dbl], X_11:dbl); #[7] (0)
BKCappend_val_wrap 9 <- 9 17
redo (X_6:oid, X_7:dbl) := iterator.next(b:bat[:dbl]); #[8] (0)
ITRbunNext 12 13 <- 1
exit (X_6:oid, X_7:dbl); #[9] (0) 12 13
z:bat[:dbl] := X_3:bat[:dbl]; #[10] (0) 5 <- 9
@@ -57,7 +57,7 @@ function user.tst(b:bat[:dbl], b2:bat[:d
barrier (X_6:oid, X_7:dbl) := iterator.new(b:bat[:dbl]); #[4] (0)
ITRbunIterator 12 13 <- 1
X_9:dbl := algebra.fetch(b2:bat[:dbl], X_6:oid); #[5] (0) ALGfetchoid 15
<- 2 12
X_11:dbl := calc.max(X_7:dbl, X_9:dbl); #[6] (0) CALCmax 17 <- 13 15
- bat.append(X_3:bat[:dbl], X_11:dbl); #[7] (0) BKCappend_val_wrap 18
<- 9 17
+ X_3:bat[:dbl] := bat.append(X_3:bat[:dbl], X_11:dbl); #[7] (0)
BKCappend_val_wrap 9 <- 9 17
redo (X_6:oid, X_7:dbl) := iterator.next(b:bat[:dbl]); #[8] (0)
ITRbunNext 12 13 <- 1
exit (X_6:oid, X_7:dbl); #[9] (0) 12 13
z:bat[:dbl] := X_3:bat[:dbl]; #[10] (0) 5 <- 9
diff --git a/sql/test/sys-schema/Tests/check_MaxStrLength_violations.sql
b/sql/test/sys-schema/Tests/check_MaxStrLength_violations.sql
--- a/sql/test/sys-schema/Tests/check_MaxStrLength_violations.sql
+++ b/sql/test/sys-schema/Tests/check_MaxStrLength_violations.sql
@@ -143,8 +143,6 @@ SELECT '"sys"."tablestorage"."schema"' a
SELECT '"sys"."tablestorage"."table"' as full_col_nm, 1024 as
max_allowed_length, length("table") as data_length, t."table" as data_value
FROM "sys"."tablestorage" t WHERE "table" IS NOT NULL AND length("table") >
(select type_digits from sys._columns where name = 'table' and table_id in
(select id from tables where name = 'tablestorage' and schema_id in (select id
from sys.schemas where name = 'sys')));
SELECT '"sys"."tablestoragemodel"."schema"' as full_col_nm, 1024 as
max_allowed_length, length("schema") as data_length, t."schema" as data_value
FROM "sys"."tablestoragemodel" t WHERE "schema" IS NOT NULL AND
length("schema") > (select type_digits from sys._columns where name = 'schema'
and table_id in (select id from tables where name = 'tablestoragemodel' and
schema_id in (select id from sys.schemas where name = 'sys')));
SELECT '"sys"."tablestoragemodel"."table"' as full_col_nm, 1024 as
max_allowed_length, length("table") as data_length, t."table" as data_value
FROM "sys"."tablestoragemodel" t WHERE "table" IS NOT NULL AND length("table")
> (select type_digits from sys._columns where name = 'table' and table_id in
(select id from tables where name = 'tablestoragemodel' and schema_id in
(select id from sys.schemas where name = 'sys')));
-SELECT '"sys"."tracelog"."clk"' as full_col_nm, 20 as max_allowed_length,
length("clk") as data_length, t."clk" as data_value FROM "sys"."tracelog" t
WHERE "clk" IS NOT NULL AND length("clk") > (select type_digits from
sys._columns where name = 'clk' and table_id in (select id from tables where
name = 'tracelog' and schema_id in (select id from sys.schemas where name =
'sys')));
-SELECT '"sys"."tracelog"."pc"' as full_col_nm, 50 as max_allowed_length,
length("pc") as data_length, t."pc" as data_value FROM "sys"."tracelog" t WHERE
"pc" IS NOT NULL AND length("pc") > (select type_digits from sys._columns where
name = 'pc' and table_id in (select id from tables where name = 'tracelog' and
schema_id in (select id from sys.schemas where name = 'sys')));
SELECT '"sys"."triggers"."condition"' as full_col_nm, 2048 as
max_allowed_length, length("condition") as data_length, t."condition" as
data_value FROM "sys"."triggers" t WHERE "condition" IS NOT NULL AND
length("condition") > (select type_digits from sys._columns where name =
'condition' and table_id in (select id from tables where name = 'triggers' and
schema_id in (select id from sys.schemas where name = 'sys')));
SELECT '"sys"."triggers"."name"' as full_col_nm, 1024 as max_allowed_length,
length("name") as data_length, t."name" as data_value FROM "sys"."triggers" t
WHERE "name" IS NOT NULL AND length("name") > (select type_digits from
sys._columns where name = 'name' and table_id in (select id from tables where
name = 'triggers' and schema_id in (select id from sys.schemas where name =
'sys')));
SELECT '"sys"."triggers"."new_name"' as full_col_nm, 1024 as
max_allowed_length, length("new_name") as data_length, t."new_name" as
data_value FROM "sys"."triggers" t WHERE "new_name" IS NOT NULL AND
length("new_name") > (select type_digits from sys._columns where name =
'new_name' and table_id in (select id from tables where name = 'triggers' and
schema_id in (select id from sys.schemas where name = 'sys')));
diff --git a/sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
b/sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
--- a/sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
+++ b/sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
@@ -653,16 +653,6 @@ stdout of test 'check_MaxStrLength_viola
% full_col_nm, max_allowed_length, data_length, data_value # name
% char, smallint, int, varchar # type
% 33, 1, 1, 0 # length
-#SELECT '"sys"."tracelog"."clk"' as full_col_nm, 20 as max_allowed_length,
length("clk") as data_length, t."clk" as data_value FROM "sys"."tracelog" t
WHERE "clk" IS NOT NULL AND length("clk") > (select type_digits from
sys._columns where name = 'clk' and table_id in (select id from tables where
name = 'tracelog' and schema_id in (select id from sys.schemas where name =
'sys')));
-% .L25, .L26, .L27, .L30 # table_name
-% full_col_nm, max_allowed_length, data_length, data_value # name
-% char, tinyint, int, varchar # type
-% 22, 1, 1, 0 # length
-#SELECT '"sys"."tracelog"."pc"' as full_col_nm, 50 as max_allowed_length,
length("pc") as data_length, t."pc" as data_value FROM "sys"."tracelog" t WHERE
"pc" IS NOT NULL AND length("pc") > (select type_digits from sys._columns where
name = 'pc' and table_id in (select id from tables where name = 'tracelog' and
schema_id in (select id from sys.schemas where name = 'sys')));
-% .L25, .L26, .L27, .L30 # table_name
-% full_col_nm, max_allowed_length, data_length, data_value # name
-% char, tinyint, int, varchar # type
-% 21, 1, 1, 0 # length
#SELECT '"sys"."triggers"."condition"' as full_col_nm, 2048 as
max_allowed_length, length("condition") as data_length, t."condition" as
data_value FROM "sys"."triggers" t WHERE "condition" IS NOT NULL AND
length("condition") > (select type_digits from sys._columns where name =
'condition' and table_id in (select id from tables where name = 'triggers' and
schema_id in (select id from sys.schemas where name = 'sys')));
% .L21, .L22, sys.L23, sys.L24 # table_name
% full_col_nm, max_allowed_length, data_length, data_value # name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
