Changeset: 2ad9e50fbba1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ad9e50fbba1
Modified Files:
sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out
sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.11.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128
sql/backends/monet5/vaults/bam/Tests/query2.8.stable.out
sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out
sql/include/sql_catalog.h
sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_storage.h
sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
sql/test/BugTracker-2015/Tests/quantile_function_resolution.Bug-3773.stable.out
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.out
sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single
sql/test/BugTracker-2017/Tests/sqlsmith01.stable.out
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out
sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.stable.out
sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.stable.out
sql/test/Tests/order_by_complex_exp.stable.out
sql/test/VOC/Tests/VOC.stable.out
sql/test/analytics/Tests/analytics09.stable.err
sql/test/pg_regress/Tests/alter_table.stable.out
sql/test/pg_regress/Tests/random.stable.out
sql/test/sys-schema/Tests/bam_tables_checks.stable.out
sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out
sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
Branch: context
Log Message:
merged with default
diffs (truncated from 3461 to 300 lines):
diff --git a/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
b/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
@@ -182,8 +182,8 @@ function user.main():void;
X_18:bat[:bte] := sql.bind(X_4:int, "sys":str, "udf_fuse":str, "b":str,
0:int);
X_24:bat[:bte] := algebra.projection(C_5:bat[:oid], X_18:bat[:bte]);
X_25:bat[:sht] := batudf.fuse(X_17:bat[:bte], X_24:bat[:bte]);
- X_36:bat[:str] := bat.append(X_29:bat[:str], "sys.L2":str);
- X_38:bat[:str] := bat.append(X_31:bat[:str], "L2":str);
+ X_36:bat[:str] := bat.append(X_29:bat[:str], "sys.L1":str);
+ X_38:bat[:str] := bat.append(X_31:bat[:str], "L1":str);
X_40:bat[:str] := bat.append(X_32:bat[:str], "smallint":str);
X_42:bat[:int] := bat.append(X_33:bat[:int], 16:int);
X_44:bat[:int] := bat.append(X_35:bat[:int], 0:int);
@@ -233,8 +233,8 @@ function user.main():void;
X_18:bat[:sht] := sql.bind(X_4:int, "sys":str, "udf_fuse":str, "d":str,
0:int);
X_24:bat[:sht] := algebra.projection(C_5:bat[:oid], X_18:bat[:sht]);
X_25:bat[:int] := batudf.fuse(X_17:bat[:sht], X_24:bat[:sht]);
- X_36:bat[:str] := bat.append(X_29:bat[:str], "sys.L2":str);
- X_38:bat[:str] := bat.append(X_31:bat[:str], "L2":str);
+ X_36:bat[:str] := bat.append(X_29:bat[:str], "sys.L1":str);
+ X_38:bat[:str] := bat.append(X_31:bat[:str], "L1":str);
X_40:bat[:str] := bat.append(X_32:bat[:str], "int":str);
X_42:bat[:int] := bat.append(X_33:bat[:int], 32:int);
X_44:bat[:int] := bat.append(X_35:bat[:int], 0:int);
@@ -284,8 +284,8 @@ function user.main():void;
X_18:bat[:int] := sql.bind(X_4:int, "sys":str, "udf_fuse":str, "f":str,
0:int);
X_24:bat[:int] := algebra.projection(C_5:bat[:oid], X_18:bat[:int]);
X_25:bat[:lng] := batudf.fuse(X_17:bat[:int], X_24:bat[:int]);
- X_36:bat[:str] := bat.append(X_29:bat[:str], "sys.L2":str);
- X_38:bat[:str] := bat.append(X_31:bat[:str], "L2":str);
+ X_36:bat[:str] := bat.append(X_29:bat[:str], "sys.L1":str);
+ X_38:bat[:str] := bat.append(X_31:bat[:str], "L1":str);
X_40:bat[:str] := bat.append(X_32:bat[:str], "bigint":str);
X_42:bat[:int] := bat.append(X_33:bat[:int], 64:int);
X_44:bat[:int] := bat.append(X_35:bat[:int], 0:int);
@@ -317,8 +317,8 @@ end user.main;
#garbagecollector actions= 1 time=11 usec
#total actions=27 time=149 usec
#select fuse(a,b) from udf_fuse;
-% sys.L2 # table_name
-% L2 # name
+% sys.L1 # table_name
+% L1 # name
% smallint # type
% 4 # length
[ 258 ]
@@ -326,8 +326,8 @@ end user.main;
[ 1286 ]
[ 1800 ]
#select fuse(c,d) from udf_fuse;
-% sys.L2 # table_name
-% L2 # name
+% sys.L1 # table_name
+% L1 # name
% int # type
% 9 # length
[ 65538000 ]
@@ -335,8 +335,8 @@ end user.main;
[ 327686000 ]
[ 458760000 ]
#select fuse(e,f) from udf_fuse;
-% sys.L2 # table_name
-% L2 # name
+% sys.L1 # table_name
+% L1 # name
% bigint # type
% 17 # length
[ 4294967298000000 ]
diff --git a/sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out
b/sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out
--- a/sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out
+++ b/sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out
@@ -118,8 +118,8 @@ function user.main():void;
X_8:bat[:str] := sql.bind(X_4:int, "sys":str, "udf_reverse":str, "x":str,
0:int);
X_17:bat[:str] := algebra.projection(C_5:bat[:oid], X_8:bat[:str]);
X_18:bat[:str] := batudf.reverse(X_17:bat[:str]);
- X_29:bat[:str] := bat.append(X_22:bat[:str], "sys.L2":str);
- X_31:bat[:str] := bat.append(X_24:bat[:str], "L2":str);
+ X_29:bat[:str] := bat.append(X_22:bat[:str], "sys.L1":str);
+ X_31:bat[:str] := bat.append(X_24:bat[:str], "L1":str);
X_33:bat[:str] := bat.append(X_25:bat[:str], "clob":str);
X_35:bat[:int] := bat.append(X_26:bat[:int], 0:int);
X_36:bat[:int] := bat.append(X_28:bat[:int], 0:int);
@@ -149,8 +149,8 @@ end user.main;
#garbagecollector actions= 1 time=52 usec
#total actions=23 time=362 usec
#select reverse(x) from udf_reverse;
-% sys.L2 # table_name
-% L2 # name
+% sys.L1 # table_name
+% L1 # name
% clob # type
% 30 # length
[ "BDtenoM" ]
diff --git a/sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.out
b/sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.out
--- a/sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.out
+++ b/sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.out
@@ -253,7 +253,7 @@ stdout of test 'bam_lib` in directory 's
# bam_flag(flag, 'qual_cont') AS qual_cont,
# bam_flag(flag, 'opti_dupl') AS opti_dupl,
# bam_flag(flag, 'supp_alig') AS supp_alig
-% bam.alignments_1, bam.L3, bam.L5, bam.L7, bam.L11, bam.L13,
bam.L15, bam.L17, bam.L21, bam.L23, bam.L25,
bam.L27, bam.L31 # table_name
+% bam.alignments_1, bam.L1, bam.L2, bam.L3, bam.L4, bam.L5, bam.L6, bam.L7,
bam.L10, bam.L11, bam.L12, bam.L13, bam.L14 #
table_name
% flag, mult_segm, prop_alig, segm_unma, next_unma,
segm_reve, next_reve, firs_segm, last_segm, seco_alig,
qual_cont, opti_dupl, supp_alig # name
% smallint, boolean, boolean, boolean, boolean,
boolean, boolean, boolean, boolean, boolean,
boolean, boolean, boolean # type
% 3, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5 # length
@@ -432,7 +432,7 @@ stdout of test 'bam_lib` in directory 's
[ "????????????" ]
#SELECT seq, reverse_seq(seq) AS reverse_seq
#FROM bam.alignments_1;
-% bam.alignments_1, bam.L3 # table_name
+% bam.alignments_1, bam.L1 # table_name
% seq, reverse_seq # name
% clob, clob # type
% 100, 100 # length
@@ -515,7 +515,7 @@ stdout of test 'bam_lib` in directory 's
[ "desrever eb dluohS" ]
#SELECT qual, reverse_qual(qual) AS reverse_qual
#FROM bam.alignments_1;
-% bam.alignments_1, bam.L3 # table_name
+% bam.alignments_1, bam.L1 # table_name
% qual, reverse_qual # name
% clob, clob # type
% 100, 100 # length
@@ -610,7 +610,7 @@ stdout of test 'bam_lib` in directory 's
[ 100 ]
#SELECT cigar, seq_length(cigar) AS seq_length
#FROM bam.alignments_1;
-% bam.alignments_1, bam.L3 # table_name
+% bam.alignments_1, bam.L1 # table_name
% cigar, seq_length # name
% clob, int # type
% 27, 4 # length
@@ -748,7 +748,7 @@ stdout of test 'bam_lib` in directory 's
#SELECT 17922987 AS ref_pos, seq, pos, cigar, seq_char(17922987, seq, pos,
cigar) AS seq_char
#FROM bam.alignments_1
#WHERE seq_char(17922987, seq, pos, cigar) IS NOT NULL;
-% .L2, bam.alignments_1, bam.alignments_1, bam.alignments_1,
.L7 # table_name
+% .L1, bam.alignments_1, bam.alignments_1, bam.alignments_1,
.L2 # table_name
% ref_pos, seq, pos, cigar, seq_char # name
% int, clob, int, clob, char # type
% 8, 100, 8, 21, 1 # length
diff --git a/sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out
b/sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out
--- a/sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out
+++ b/sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out
@@ -35,7 +35,7 @@ stdout of test 'query2.1` in directory '
# FROM alig
# WHERE qname IN (
# SELECT qname
-% bam.L33, bam.L35, bam.L37, bam.L41, bam.L43 #
table_name
+% bam.L17, bam.L20, bam.L21, bam.L22, bam.L23 #
table_name
% qname, l_seq, qual1, r_seq, qual2 # name
% clob, clob, clob, clob, clob # type
% 0, 0, 0, 0, 0 # length
@@ -48,7 +48,7 @@ stdout of test 'query2.1` in directory '
#WHERE l_mapq < 100
# AND r_mapq < 100
#ORDER BY qname;
-% bam.paired_primary_alignments_3, bam.L3, bam.L5, bam.L7, bam.L11 #
table_name
+% bam.paired_primary_alignments_3, bam.L1, bam.L2, bam.L3, bam.L4 #
table_name
% qname, l_seq, l_qual, r_seq, r_qual # name
% clob, clob, clob, clob, clob # type
% 0, 0, 0, 0, 0 # length
diff --git a/sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out
b/sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out
--- a/sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out
+++ b/sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out
@@ -36,7 +36,7 @@ stdout of test 'query2.10` in directory
# GROUP BY qname
# HAVING COUNT(*) = 2
# AND SUM(bam.bam_flag(flag, 'firs_segm')) = 1
-% bam.L20, bam.L22, bam.L24, bam.L26, bam.L30,
bam.L32, bam.L34, bam.L36, bam.L40, bam.L42,
bam.L44, bam.L46, bam.L50, bam.L52, bam.L54,
bam.L56, bam.L60, bam.L62, bam.L64, bam.L66,
bam.L70 # table_name
+% bam.L13, bam.L14, bam.L15, bam.L16, bam.L17,
bam.L20, bam.L21, bam.L22, bam.L23, bam.L24,
bam.L25, bam.L26, bam.L27, bam.L30, bam.L31,
bam.L32, bam.L33, bam.L34, bam.L35, bam.L36,
bam.L37 # table_name
% qname, l_flag, l_rname, l_pos, l_mapq, l_cigar,
l_rnext, l_pnext, l_tlen, l_seq, qual1, r_flag, r_rname,
r_pos, r_mapq, r_cigar, r_rnext, r_pnext, r_tlen, r_seq,
qual2 # name
% clob, smallint, clob, int, smallint, clob, clob,
int, int, clob, clob, smallint, clob, int, smallint,
clob, clob, int, int, clob, clob # type
% 0, 1, 0, 1, 1, 0, 0, 1, 1, 0,
0, 1, 0, 1, 1, 0, 0, 1, 1, 0,
0 # length
diff --git a/sql/backends/monet5/vaults/bam/Tests/query2.11.stable.out
b/sql/backends/monet5/vaults/bam/Tests/query2.11.stable.out
--- a/sql/backends/monet5/vaults/bam/Tests/query2.11.stable.out
+++ b/sql/backends/monet5/vaults/bam/Tests/query2.11.stable.out
@@ -35,7 +35,7 @@ stdout of test 'query2.11` in directory
#SELECT l.qname AS qname, l.flag AS l_flag, l.rname AS l_rname, l.pos AS
l_pos, l.mapq AS l_mapq, l.cigar AS l_cigar,
# l.rnext AS l_rnext, l.pnext AS l_pnext, l.tlen AS l_tlen, l.seq AS l_seq,
l.qual AS l_qual,
# r.flag AS r_flag, r.rname AS r_rname, r.pos AS
r_pos, r.mapq AS r_mapq, r.cigar AS r_cigar,
-% bam.L13, bam.L15, bam.L17, bam.L21, bam.L23,
bam.L25, bam.L27, bam.L31, bam.L33, bam.L35,
bam.L37, bam.L41, bam.L43, bam.L45, bam.L47,
bam.L51, bam.L53, bam.L55, bam.L57, bam.L61,
bam.L63 # table_name
+% bam.L7, bam.L10, bam.L11, bam.L12, bam.L13,
bam.L14, bam.L15, bam.L16, bam.L17, bam.L20,
bam.L21, bam.L22, bam.L23, bam.L24, bam.L25,
bam.L26, bam.L27, bam.L30, bam.L31, bam.L32,
bam.L33 # table_name
% qname, l_flag, l_rname, l_pos, l_mapq, l_cigar,
l_rnext, l_pnext, l_tlen, l_seq, l_qual, r_flag, r_rname,
r_pos, r_mapq, r_cigar, r_rnext, r_pnext, r_tlen, r_seq,
r_qual # name
% clob, smallint, clob, int, smallint, clob, clob,
int, int, clob, clob, smallint, clob, int, smallint,
clob, clob, int, int, clob, clob # type
% 11, 3, 5, 8, 1, 21, 1, 8, 1, 100,
100, 3, 5, 8, 1, 27, 1, 8, 1, 100,
100 # length
diff --git a/sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out
b/sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out
--- a/sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out
+++ b/sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out
@@ -35,7 +35,7 @@ stdout of test 'query2.2` in directory '
# GROUP BY qname
# HAVING COUNT(*) = 2
# AND SUM(bam.bam_flag(flag, 'firs_segm')) = 1
-% bam.L27, bam.L32 # table_name
+% bam.L10, bam.L12 # table_name
% distance, nr_alignments # name
% bigint, bigint # type
% 3, 1 # length
@@ -62,8 +62,8 @@ stdout of test 'query2.2` in directory '
#FROM bam.paired_primary_alignments_3
#WHERE l_rname = r_rname
#GROUP BY distance
-#ORDER BY nr_alignments DESC;
-% bam.L2, bam.L5 # table_name
+#ORDER BY nr_alignments DESC, distance;
+% bam.L1, bam.L3 # table_name
% distance, nr_alignments # name
% bigint, bigint # type
% 3, 1 # length
diff --git a/sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128
b/sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128
--- a/sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128
+++ b/sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128
@@ -35,7 +35,7 @@ stdout of test 'query2.2` in directory '
# GROUP BY qname
# HAVING COUNT(*) = 2
# AND SUM(bam.bam_flag(flag, 'firs_segm')) = 1
-% bam.L27, bam.L32 # table_name
+% bam.L10, bam.L12 # table_name
% distance, nr_alignments # name
% hugeint, bigint # type
% 3, 1 # length
@@ -62,8 +62,8 @@ stdout of test 'query2.2` in directory '
#FROM bam.paired_primary_alignments_3
#WHERE l_rname = r_rname
#GROUP BY distance
-#ORDER BY nr_alignments DESC;
-% bam.L2, bam.L5 # table_name
+#ORDER BY nr_alignments DESC, distance;
+% bam.L1, bam.L3 # table_name
% distance, nr_alignments # name
% hugeint, bigint # type
% 3, 1 # length
diff --git a/sql/backends/monet5/vaults/bam/Tests/query2.8.stable.out
b/sql/backends/monet5/vaults/bam/Tests/query2.8.stable.out
--- a/sql/backends/monet5/vaults/bam/Tests/query2.8.stable.out
+++ b/sql/backends/monet5/vaults/bam/Tests/query2.8.stable.out
@@ -29,7 +29,7 @@ stdout of test 'query2.8` in directory '
#FROM (
# SELECT *
# FROM bam.alignments_1
-% bam.L6, bam.L10, bam.L12, bam.L14, bam.L16,
bam.L20, bam.L22, bam.L24, bam.L26, bam.L30,
bam.L32, bam.L34, bam.L36, bam.L40, bam.L42,
bam.L44, bam.L46, bam.L50, bam.L52, bam.L54,
bam.L56 # table_name
+% bam.L3, bam.L4, bam.L5, bam.L6, bam.L7, bam.L10, bam.L11,
bam.L12, bam.L13, bam.L14, bam.L15, bam.L16,
bam.L17, bam.L20, bam.L21, bam.L22, bam.L23,
bam.L24, bam.L25, bam.L26, bam.L27 # table_name
% qname, f1_flag, f1_rname, f1_pos, f1_mapq,
f1_cigar, f1_rnext, f1_pnext, f1_tlen, f1_seq,
f1_qual, f2_flag, f2_rname, f2_pos, f2_mapq,
f2_cigar, f2_rnext, f2_pnext, f2_tlen, f2_seq, f2_qual
# name
% clob, smallint, clob, int, smallint, clob, clob,
int, int, clob, clob, smallint, clob, int, smallint,
clob, clob, int, int, clob, clob # type
% 0, 1, 0, 1, 1, 0, 0, 1, 1, 0,
0, 1, 0, 1, 1, 0, 0, 1, 1, 0,
0 # length
@@ -40,7 +40,7 @@ stdout of test 'query2.8` in directory '
#FROM (
# SELECT *
# FROM bam.unpaired_primary_alignments_3
-% .L156, .L160, .L162, .L164, .L166, .L170, .L172, .L174, .L176,
.L200, .L202, .L204, .L206, .L210, .L212, .L214, .L216, .L220, .L222,
.L224, .L226 # table_name
+% .L73, .L74, .L75, .L76, .L77, .L100, .L101, .L102, .L103,
.L104, .L105, .L106, .L107, .L110, .L111, .L112, .L113, .L114, .L115,
.L116, .L117 # table_name
% qname, f1_flag, f1_rname, f1_pos, f1_mapq,
f1_cigar, f1_rnext, f1_pnext, f1_tlen, f1_seq,
f1_qual, f2_flag, f2_rname, f2_pos, f2_mapq,
f2_cigar, f2_rnext, f2_pnext, f2_tlen, f2_seq, f2_qual
# name
% clob, smallint, clob, int, smallint, clob, clob,
int, int, clob, clob, smallint, clob, int, smallint,
clob, clob, int, int, clob, clob # type
% 0, 1, 0, 1, 1, 0, 0, 1, 1, 0,
0, 1, 0, 1, 1, 0, 0, 1, 1, 0,
0 # length
diff --git a/sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out
b/sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out
--- a/sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out
+++ b/sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out
@@ -34,7 +34,7 @@ stdout of test 'sam_export` in directory
#EXCEPT
#SELECT qname, flag, rname, pos, mapq, cigar, rnext, pnext, tlen, seq, qual
#FROM bam.alignments_73;
-% bam.L33, bam.L33, bam.L33, bam.L33, bam.L33,
bam.L33, bam.L33, bam.L33, bam.L33, bam.L33,
bam.L33 # table_name
+% bam.L5, bam.L5, bam.L5, bam.L5, bam.L5, bam.L5, bam.L5, bam.L5, bam.L5,
bam.L5, bam.L5 # table_name
% qname, flag, rname, pos, mapq, cigar, rnext, pnext, tlen,
seq, qual # name
% clob, smallint, clob, int, smallint, clob, clob,
int, int, clob, clob # type
% 0, 1, 0, 1, 1, 0, 0, 1, 1, 0,
0 # length
@@ -53,7 +53,7 @@ stdout of test 'sam_export` in directory
#EXCEPT
#SELECT qname, flag, rname, pos, mapq, cigar, rnext, pnext, tlen, seq, qual
#FROM bam.alignments_74;
-% .L224, .L224, .L224, .L224, .L224, .L224, .L224, .L224, .L224,
.L224, .L224 # table_name
+% .L113, .L113, .L113, .L113, .L113, .L113, .L113, .L113, .L113,
.L113, .L113 # table_name
% qname, flag, rname, pos, mapq, cigar, rnext, pnext, tlen,
seq, qual # name
% clob, smallint, clob, int, smallint, clob, clob,
int, int, clob, clob # type
% 0, 1, 0, 1, 1, 0, 0, 1, 1, 0,
0 # length
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -239,10 +239,10 @@ typedef size_t backend_stack;
typedef struct sql_trans {
char *name;
- int stime; /* read transaction time stamp */
- int wstime; /* write transaction time stamp */
- int rtime;
- int wtime;
+ int stime; /* start of transaction */
+ int wstime; /* first write transaction time stamp */
+ int rtime; /* timestamp of latest read performed in
transaction*/
+ int wtime; /* timestamp of latest write performed in
transaction*/
int schema_number; /* schema timestamp */
int schema_updates; /* set on schema changes */
int status; /* status of the last query */
diff --git a/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
--- a/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
+++ b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
@@ -61,7 +61,7 @@ 1. null
precision 8
scale 0
schemaname
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
