Changeset: 1c458a2396b1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c458a2396b1 Modified Files: gdk/gdk_qsort_impl.h geom/sql/conformance/Tests/T1.sql geom/sql/conformance/Tests/T1.stable.out sql/backends/monet5/vaults/bam/Tests/query1.1.sql sql/backends/monet5/vaults/bam/Tests/query1.1.stable.out sql/backends/monet5/vaults/bam/Tests/query2.11.sql sql/backends/monet5/vaults/bam/Tests/query2.11.stable.out sql/backends/monet5/vaults/bam/bam_export.c sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.sql sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.sql sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128 sql/test/Tests/order_by_complex_exp.stable.out sql/test/Tests/rank.stable.out sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out sql/test/order_by_complex_exp.sql sql/test/pg_regress/Tests/point.sql sql/test/pg_regress/Tests/point.stable.out sql/test/rank.sql Branch: default Log Message:
Merge with Aug2018 branch. diffs (truncated from 30541 to 300 lines): diff --git a/gdk/gdk_qsort_impl.h b/gdk/gdk_qsort_impl.h --- a/gdk/gdk_qsort_impl.h +++ b/gdk/gdk_qsort_impl.h @@ -64,7 +64,7 @@ GDKqsort_impl(const struct qsort_t *rest if (n < 7) { /* insertion sort for very small chunks */ for (b = 1; b < n; b++) { - for (a = b; a > 0 && LE(a, a - 1); a--) { + for (a = b; a > 0 && LT(a, a - 1); a--) { SWAP(a, a - 1); } } @@ -134,7 +134,7 @@ GDKqsort_impl(const struct qsort_t *rest if (!swap_cnt && n < 1024) { /* switch to insertion sort, but only for small chunks */ for (b = 1; b < n; b++) { - for (a = b; a > 0 && LE(a, a - 1); a--) { + for (a = b; a > 0 && LT(a, a - 1); a--) { SWAP(a, a - 1); } } diff --git a/geom/sql/conformance/Tests/T1.sql b/geom/sql/conformance/Tests/T1.sql --- a/geom/sql/conformance/Tests/T1.sql +++ b/geom/sql/conformance/Tests/T1.sql @@ -1,2 +1,2 @@ -- Conformance Item T1 -SELECT f_table_name FROM geometry_columns; +SELECT f_table_name FROM geometry_columns ORDER BY f_table_name; diff --git a/geom/sql/conformance/Tests/T1.stable.out b/geom/sql/conformance/Tests/T1.stable.out --- a/geom/sql/conformance/Tests/T1.stable.out +++ b/geom/sql/conformance/Tests/T1.stable.out @@ -29,17 +29,17 @@ Ready. % f_table_name # name % varchar # type % 14 # length -[ "lakes" ] -[ "road_segments" ] +[ "bridges" ] +[ "buildings" ] +[ "buildings" ] [ "divided_routes" ] [ "forests" ] -[ "bridges" ] +[ "lakes" ] +[ "map_neatlines" ] +[ "named_places" ] +[ "ponds" ] +[ "road_segments" ] [ "streams" ] -[ "buildings" ] -[ "buildings" ] -[ "ponds" ] -[ "named_places" ] -[ "map_neatlines" ] # 13:36:56 > # 13:36:56 > "Done." diff --git a/sql/backends/monet5/vaults/bam/Tests/query1.1.sql b/sql/backends/monet5/vaults/bam/Tests/query1.1.sql --- a/sql/backends/monet5/vaults/bam/Tests/query1.1.sql +++ b/sql/backends/monet5/vaults/bam/Tests/query1.1.sql @@ -1,7 +1,7 @@ SELECT qname, flag, rname, pos, mapq, cigar, rnext, pnext, tlen, seq, qual FROM bam.alignments_1 WHERE bam.bam_flag(flag, 'seco_alig') = False -ORDER BY qname; +ORDER BY qname, flag; SELECT qname, flag, rname, pos, mapq, cigar, rnext, pnext, tlen, seq, qual FROM bam.unpaired_primary_alignments_3 @@ -9,4 +9,4 @@ UNION SELECT qname, flag, rname, pos, mapq, cigar, rnext, pnext, tlen, seq, qual FROM bam.unpaired_alignments_3 WHERE bam.bam_flag(flag, 'seco_alig') = False -ORDER BY qname; +ORDER BY qname, flag; diff --git a/sql/backends/monet5/vaults/bam/Tests/query1.1.stable.out b/sql/backends/monet5/vaults/bam/Tests/query1.1.stable.out --- a/sql/backends/monet5/vaults/bam/Tests/query1.1.stable.out +++ b/sql/backends/monet5/vaults/bam/Tests/query1.1.stable.out @@ -33,40 +33,40 @@ Ready. % 11, 3, 5, 8, 3, 26, 1, 8, 1, 100, 100 # length [ "sim_22_1_1", 83, "chr22", 39996429, 255, "62=1X37=", "=", 39996217, 0, "ACTCTGTCGCCCAGGCCGGGGCGTAGCCATGCAAACACGGCTCACTGCAGCCTCGACCTCCCCGGCTCAAGCCATCCTCCCACCTCAACCTCCCAAGTAG", "##?#-@=#?D5?EBC##=2#E6A=E8A:F5+F>=CF8#BDFDF?7B8BAGC2EF?FFFG>EE*F=GDBGDGFEFEFG=FBGFFBFFBGEDCF5EFGGGDG" ] [ "sim_22_1_1", 163, "chr22", 39996217, 255, "100=", "=", 39996429, 0, "AGTAGATGGGATTACAGGCACCCGCCACCGCGCCCAGCTAATTTTTATATATTTTTTAAGTAGAGATGGGGTTTCACCATGTTGGCCAGGCTGGTCTTGA", "EEEEEFAG=GCDAGBF8F:EFGGDEGCFFBAAGCE?DD?5?DGF#DC##BD;D=BD@G?A0F9G6AFC?5#CCCAE6AD-F#CA0#.ADCD;#-#6#A##" ] +[ "sim_22_1_10", 99, "chr22", 24428205, 255, "28=1X54=1X16=", "=", 24428413, 0, "TAATAATCTCAAAAGATAGTTCAATGTAGAACCTAATTAATTCAGTAGGATGACCAGCTCAGTAGCAGTAAGTAGCAGTGCAATATAAGTGGCATTTTAA", "EFE:FC@D?5FGGCAEDAFEGG3GEDA5(CFFFEGD#GEFFG?EDCFC?GBAGEFADCFBGCG@FGCF2F0ED>C@E:DAF:A-BF;:/#;#E##A#A?C" ] [ "sim_22_1_10", 147, "chr22", 24428413, 255, "66=1X33=", "=", 24428205, 0, "ATGCCTTATAAATAAATTTATAAGATGACTACTTTGTAGGCACATCTTGTTATAAGAAAAGTCAATGATATGTGTCCCTTTAATTTTCAAAATGAAAAAT", "#GD###A#5ED#B5.#BE==5FG#E3-@#AB7CA)@DEFF=FF#@AEFDFD4>DF2CCCGGA:DGB'FFDG9AEF?3;DGAE?CGCFD2GAG?GB@GFGF" ] -[ "sim_22_1_10", 99, "chr22", 24428205, 255, "28=1X54=1X16=", "=", 24428413, 0, "TAATAATCTCAAAAGATAGTTCAATGTAGAACCTAATTAATTCAGTAGGATGACCAGCTCAGTAGCAGTAAGTAGCAGTGCAATATAAGTGGCATTTTAA", "EFE:FC@D?5FGGCAEDAFEGG3GEDA5(CFFFEGD#GEFFG?EDCFC?GBAGEFADCFBGCG@FGCF2F0ED>C@E:DAF:A-BF;:/#;#E##A#A?C" ] +[ "sim_22_1_11", 83, "chr22", 41987433, 255, "19=1X50=1X26=1X2=", "=", 41987203, 0, "TGACTATTCTAGGAGACCACGAGTTGGGAAAGGTATGGCAAGGCACCCACAGGAGAGCTGATGACAACTGTGAGGATCAGTGACTGTGGATGATGGAACA", "=?GF3A:EA#GF6#D5=EF##AG>*EE==A#GB=GA.DE'B@AACDECGB3G>DGFDCGFBFE?EFFD;E7GBFGDCAEGBGDAEFB;5GD=GEECF0FE" ] [ "sim_22_1_11", 163, "chr22", 41987203, 255, "68=1X31=", "=", 41987433, 0, "GCCTGGATGGAGCCCTGGGGCTGGAGGCTGGCACTTCCAATCGAGACTGCCCGTTTGGTCCTGCCCTGTGTGACAGTATACAGGCTTATCTTGGCCACCC", "GGGF:GFGG?EGFEG?DAFBEF=FA+>EGG=E:EDBEB7DCCE=DG@?:?CAE4E=DCBGFG@FE8EB>FDAE#CE=ECA@#D-D?:CEA#BD#E#B#EA" ] -[ "sim_22_1_11", 83, "chr22", 41987433, 255, "19=1X50=1X26=1X2=", "=", 41987203, 0, "TGACTATTCTAGGAGACCACGAGTTGGGAAAGGTATGGCAAGGCACCCACAGGAGAGCTGATGACAACTGTGAGGATCAGTGACTGTGGATGATGGAACA", "=?GF3A:EA#GF6#D5=EF##AG>*EE==A#GB=GA.DE'B@AACDECGB3G>DGFDCGFBFE?EFFD;E7GBFGDCAEGBGDAEFB;5GD=GEECF0FE" ] [ "sim_22_1_13", 83, "chr22", 32902057, 255, "100=", "=", 32901856, 0, "AGAGCAAAACATTCTGGCAGATGCACAGCAGGTGGTGGGGCAAAAAGGGACCCGGATGGGGATCAAGAGGCTCACAAGATAGTCTCAGCTCTGCCGCTTA", ";5#GFC#@@#AE@FE@E@4B=BE:6;ADA>E#:GF=?#=:?/EA?G>GF3CFCDEB:EFGDG?G@GGFEG=F5FDGE?#GDFGGFEE@AGADGFGEDEEG" ] [ "sim_22_1_13", 163, "chr22", 32901856, 255, "100=", "=", 32902057, 0, "TTATTACTCATAACAATCTTATGGGGTACATACTCTCATTATCCCGATTTGACAGATTAGTAAACTGAGGTGCAGACAGGCAAGTGATTCTTCCAGAGAG", "F:CADE=EBGDDAEGE>DE@@D=CDDE#EG35CG?E;7CEEBDGGEB@-F=GEGD8CG>=5A=BBAFB#?D:G?E3A##?#F-?#DC#:###E#G8##B#" ] +[ "sim_22_1_14", 99, "chr22", 37296079, 255, "100=", "=", 37296332, 0, "TCGGGCCTAGAACACGGAGCCTGGAGACCCGCGCGCCGTTGACCACAGGGTTTGGCGCCAAACGAGGAGGGCGGGGCGAGGACCAAGGGGCCGGGGCGGG", "FDFGECDG?GDF=2BGEGEGEE@GGG=EEG:GFF@>EADDAFEE?::FGEGB>F>E@6EGGAE#DG#=B?(#@BCDDAEEGGFBAFFE-D#:>#:#CD7#" ] [ "sim_22_1_14", 147, "chr22", 37296332, 255, "27=1X9=1X12=1X49=", "=", 37296079, 0, "GGCGAGGGGGCGGGGCGAGGGCTGAGGGGCGGAAAACTAAGAGGAGCCCCCGCGGGTGGCGAGCTGGGATGACGGAGGGAGGGAGGGAGGGGCGCTGTGG", "E##G#A=CD:.E-E.DEDE71#-5EEAGC;5-=#EE5'?DDED?:CFDFG&=?ACFB=DFGG=EBFDGCAGFGG>FG>GFGFFDFGE=AG6DAGEFFEGA" ] -[ "sim_22_1_14", 99, "chr22", 37296079, 255, "100=", "=", 37296332, 0, "TCGGGCCTAGAACACGGAGCCTGGAGACCCGCGCGCCGTTGACCACAGGGTTTGGCGCCAAACGAGGAGGGCGGGGCGAGGACCAAGGGGCCGGGGCGGG", "FDFGECDG?GDF=2BGEGEGEE@GGG=EEG:GFF@>EADDAFEE?::FGEGB>F>E@6EGGAE#DG#=B?(#@BCDDAEEGGFBAFFE-D#:>#:#CD7#" ] [ "sim_22_1_15", 83, "chr22", 25992258, 255, "100=", "=", 25992044, 0, "ATGTGCTCTATGGTCACCTAACCTGTCTGAGACTCAATATACTCATCTGATAAATAGGCAGAATAAAAATAAGAGGTGCCCTGCCTCTTTTCAGAGTCAC", "##AEG#=GE>75CADDFEB=DF;<7=CF?<B?CBBC6:GDCDE=EBFFGFDE=BDDEEDEB?DD'AAE?CEEDFGFDDG>EGEGDA>FGD;EEEF:@GF<" ] [ "sim_22_1_15", 163, "chr22", 25992044, 255, "2=1X95=1X1=", "=", 25992258, 0, "GAGAGGCAGCCATAGGTTCGAGTCCTAGCTACTGGCTAGGGGACCTTGGACAAGGCACTGATAGTCCCAAGACTCAGTTTACCCATCTGTGCAGTGATGT", "CG.GCEGGGFDGGGGEDCE<BEG5GDGEE=##EEFEFABFDE:#G??>:55;FE:5=A?E;E9BF#E@5=AE;BEGCA:#>EAC#DED#B##A;###B#B" ] [ "sim_22_1_16", 99, "chr22", 20264219, 255, "84=1X4=1X8=1X1=", "=", 20264427, 0, "TCCAGCTCCATCTGCCAGGTTTTGTTTTGCCTGAGCAGTAGGAGCCTAGAAATATTCCTTGCACAACACAGGCACATAATGACTCGCTGAGCAGGACTTG", "FBGGFDGEFA?GGFGEF;AEGCEEGCFE?FE;GA:EAEEGDD>F8E=E=FABFCDCEG@@@E#BDBCBE;=#D5#,55DCAG:B8EGE#AAGBF#?#E#A" ] [ "sim_22_1_16", 147, "chr22", 20264427, 255, "42=1X57=", "=", 20264219, 0, "CTCTGTCCGTTTCTAATGGGAGCATTAACTCACTGCTTTGGGGGGCTGAGATAGTCAAAAAAGAGCAATTTCAGTGCAGGTTCTAGTCCTGGGCATGCTC", "#;>6##<@#C@#8B#>#:GF2G@A2;BFA?B:-<ECG--)GE7F9DGD;/:ACDABDEBD5EG:EB@DDGB#@:AEA?=GG=DE?D5GD<AFEC;DF=GA" ] [ "sim_22_1_17", 83, "chr22", 42396076, 255, "20=1X79=", "=", 42395864, 0, "TAATTTTACCTCTCAGAAAGCTCTGGCTGCTGCTGTTCATCTTTTTGTAAATGTTCACTTAACAGCTGATCCTTTGGAACAAGAACTGGAGAGACAGTGG", "C=#EDEC#5####E#D-E3E#ECGA?EE=GCDD:#@E:B?F?E@GDBDFFG5GC:FE=BEBF:GA?EDG@B<>A?G:FFEFCFECFDCDC<DGEDDF;EG" ] [ "sim_22_1_17", 163, "chr22", 42395864, 255, "8=1X71=1X12=1X6=", "=", 42396076, 0, "TCAGTGTTATCATTTCTAAATTTAAAAGGTAAATTCAATAATTCCTAAGATCTCTGCTTGCTCTAAAATTCCCTGACTCTCATTACTGTCTTTATAGTGT", "G>AEE=EF-GB?EGG@GGEEAB-GCE>E9;DEACG?:CCGDA(E7DFF.GFGEBEEED;D#FG4G:DDGGC=GG.;D@#A#B????#C#B#CB##AFE##" ] +[ "sim_22_1_2", 99, "chr22", 29469417, 255, "100=", "=", 29469608, 0, "TGATGCTGAGCTTGACGGCGGTCCCCCGGGTACCACTCCATCACCCAGTGAAGGAGGCAGGTGGGACCATCTCAGACATGGGCTGTGTTGGGACCCCCAG", "@*G@F:7DEDG?BFGFFGA:DBGG:EAGDCDAGG?E=FGGGGD?EGG5FEFE?#EA@E:DCD?>E-?C?BE<BE?CE:GB=CGC#+?#CC###>C#D@F#" ] [ "sim_22_1_2", 147, "chr22", 29469608, 255, "11=2X13=1X73=", "=", 29469417, 0, "TGGCCAAGTAATCATGCTAACTAGAGCTCTAGCTTCCTCTCCCTGGTTTCGCTTTTCTAAGTATAAATAAATAAATAAATGATAAATTGCCTTATTTTTT", "?#D#A##FBE@-#0EA/?A>#?=EB9%;<-EC>G3EA2ADDF9EGCACFAFC?:GAB5AGE=CGBE5?DEEEFBG:DFDECFDB5AGEGGGGGFD?G?DD" ] -[ "sim_22_1_2", 99, "chr22", 29469417, 255, "100=", "=", 29469608, 0, "TGATGCTGAGCTTGACGGCGGTCCCCCGGGTACCACTCCATCACCCAGTGAAGGAGGCAGGTGGGACCATCTCAGACATGGGCTGTGTTGGGACCCCCAG", "@*G@F:7DEDG?BFGFFGA:DBGG:EAGDCDAGG?E=FGGGGD?EGG5FEFE?#EA@E:DCD?>E-?C?BE<BE?CE:GB=CGC#+?#CC###>C#D@F#" ] +[ "sim_22_1_3", 99, "chr22", 25791286, 255, "40=2X31=1X26=", "=", 25791479, 0, "ATTCTCTGCCCTGAGTAAGGGGAATCAAGAGAGATTTCGATGCAGGAAACAGCACCCGAGAGAATCAATCCAGTTGGGCCTTTTCAATTAGTCTGTTTTT", "?GFGFFAEEEGEF-GGEEGGEEFFGDF;??DGDGD/=DBD09EGG5EDG@DEC,FBGD@BF5:FBE6:FAE@B.EAABCBFCE5D>EF#=#:EE#A>###" ] [ "sim_22_1_3", 147, "chr22", 25791479, 255, "1=1X12=2X12=1X17=1X4=1X48=", "=", 25791286, 0, "CGTCTCTCCTGCCCCCCACCCTCTGTCTGTGAAAACATTAGAGCTGAAAGACGACTCCCCTGGCGATAAACATCTACGCAAAGCCAATTGTCAGGCGATG", "4####B#?C#???#6,D####-BAEF3<)DE>AD(#DD+BFEFFBBEAFBC1GABFAA2GEBGEDF8G7G=AAAD=EGDD:A4ABE?AFGDGD0DD?DB>" ] -[ "sim_22_1_3", 99, "chr22", 25791286, 255, "40=2X31=1X26=", "=", 25791479, 0, "ATTCTCTGCCCTGAGTAAGGGGAATCAAGAGAGATTTCGATGCAGGAAACAGCACCCGAGAGAATCAATCCAGTTGGGCCTTTTCAATTAGTCTGTTTTT", "?GFGFFAEEEGEF-GGEEGGEEFFGDF;??DGDGD/=DBD09EGG5EDG@DEC,FBGD@BF5:FBE6:FAE@B.EAABCBFCE5D>EF#=#:EE#A>###" ] +[ "sim_22_1_4", 99, "chr22", 46558150, 255, "100=", "=", 46558385, 0, "CCCTGGCTGGAGTACAAGTTACTGGGGCTCAGTTCTTAGGATTCCTACAAAGCCCAATTTGGGTCACCTGACTTGTTAAGTCAGGTGAAGGTGACTTACC", "G6EG5GGGGDGGADFGEB?GFDGGAEGGCFFBECGGB*BEA9BFG6E=?=)C5FGAFE6G2FB=CFECF#DAEAG<AGD7F*44D:#B>+?F##;E;#DD" ] [ "sim_22_1_4", 147, "chr22", 46558385, 255, "1X49=1X9=1X39=", "=", 46558150, 0, "TGACTCCAGGGAAGTTAAATAAATGCCAAGAGGATTCACGTGGCAGGGCCATGGAGGTGGGGAGGAAGGAGCACAGGAGACACCAGGTGCTCACTGTCCA", "#E###BF#?;;#>@=1#@=E=B#E-EDF?DBC#EDEF?;6FE>+g...@gde.aede+DAF:4E>FF=EDA;DAEGEGAEFD?GD=DG=G=C5FEGDGGFAG" ] -[ "sim_22_1_4", 99, "chr22", 46558150, 255, "100=", "=", 46558385, 0, "CCCTGGCTGGAGTACAAGTTACTGGGGCTCAGTTCTTAGGATTCCTACAAAGCCCAATTTGGGTCACCTGACTTGTTAAGTCAGGTGAAGGTGACTTACC", "G6EG5GGGGDGGADFGEB?GFDGGAEGGCFFBECGGB*BEA9BFG6E=?=)C5FGAFE6G2FB=CFECF#DAEAG<AGD7F*44D:#B>+?F##;E;#DD" ] [ "sim_22_1_5", 99, "chr22", 28913667, 255, "44=1X26=1X28=", "=", 28913875, 0, "TGGAATGGAGTGGGGTAGAGGACTGCTGATTTAGCAGATGCATTATTTCCCCAAGCCAAAGAGCTGCCCTGGAAATGGGCCAAATATAATTTCTTTTAAG", "FGECEGDGGGGG?DGGEBG=FGGFD@EA9:EGGDGCFDDCEC??=DF:DECAEFC:A@EFEGE6>#GBE5C#BF<EDC=D&?G;E#=#B###G=A#@?5#" ] [ "sim_22_1_5", 147, "chr22", 28913875, 255, "100=", "=", 28913667, 0, "AGGGGCAGTGGGGGTGGTGTGGGGGAGCCGCTGTGAGTCTTAATGCAAAGAGGAATGTAGGCTAGTCAACAGGAAACCCAAAGTGCTTGATACAGCACAG", "##DAA#C-#BE#D##F#9:B#@AB#DF#6D6G8F-D8CFF8E?E:#=>B>AG=6EG#CGEDG9B3:AEEG6AC:BE5DDCDFBBG5GCFG4GAEEFBGG?" ] +[ "sim_22_1_6", 99, "chr22", 18665735, 255, "14=1X10=1X74=", "=", 18665943, 0, "ATTATTCAGCCTCACATTTCAACATCGCAGAACAGGTCAGGGAGTGCAAGGTACCTCCTGCTCTTTCCAGCAGGTGCAAGGTGCACAGGGAGAAGCAGGT", "CDDEFG;?DGEDFE+CECEEGFG>C,EG5?DGE87GBDFGCEDD=BGGDD?GDFGDD?DAGGC<G=GF@A@CE@>?>.6#F#FFDEE?@CE==<9?B?>;" ] [ "sim_22_1_6", 147, "chr22", 18665943, 255, "9=1X90=", "=", 18665735, 0, "CAGGCCGCCCGGGGCGGTTCCACCAAGAAAGTGACATCTGGGAGGGGCATTGAGGCAAAGGGGCCGCGAGAGGGTAGGTGCTCTAGAGGTGGCCCACGGG", "?##??3G#9##=5B#>A#.#>#>CFBEC@:BGC>.A5@6-F4:5?;EGGAA>?6@D<?EAEDE6CGGDGGE@9F?GGGGDD5EDDGFD?:>?FED?DEBA" ] -[ "sim_22_1_6", 99, "chr22", 18665735, 255, "14=1X10=1X74=", "=", 18665943, 0, "ATTATTCAGCCTCACATTTCAACATCGCAGAACAGGTCAGGGAGTGCAAGGTACCTCCTGCTCTTTCCAGCAGGTGCAAGGTGCACAGGGAGAAGCAGGT", "CDDEFG;?DGEDFE+CECEEGFG>C,EG5?DGE87GBDFGCEDD=BGGDD?GDFGDD?DAGGC<G=GF@A@CE@>?>.6#F#FFDEE?@CE==<9?B?>;" ] +[ "sim_22_1_7", 83, "chr22", 45060375, 255, "41=1X56=1X1=", "=", 45060162, 0, "ACCAGCCTGGCCAACATGGTGAAACGCTGTCTCTACTAAAAGTACAAAAAAATTAGCTAGGCGTGGTGGTGGGCACCTGTAATCCCAGCTACTCGGGGAG", "5#>?CG=E,A=#AG#?#>GAEA@=DB<>ED@?CFC@A?=EG65GGD:C@EE(BFABFG5B?G;EFE?@5EG5GAGD5@;DFGG?F?7GAGGAFEFA>E-E" ] [ "sim_22_1_7", 163, "chr22", 45060162, 255, "89=1X5=1X4=", "=", 45060375, 0, "TAGGAATTTTTTTTTTTTTTGAGACAGAGTTTCGCTCTTGTTGCCCAGGCTGGAGTGCAATGGTGCGATTGGCTGGAATTTTTTTTCTTGGCTGTCATAA", "FGFCEEEGDE?CB::GE=FADFCEABEGBF>D;FGGGFFCDFGDGABCCADCDDDC;EF=:ACGGCEC#C=?=>EG@9#A@?=E;=:#B##A##@%C#D#" ] -[ "sim_22_1_7", 83, "chr22", 45060375, 255, "41=1X56=1X1=", "=", 45060162, 0, "ACCAGCCTGGCCAACATGGTGAAACGCTGTCTCTACTAAAAGTACAAAAAAATTAGCTAGGCGTGGTGGTGGGCACCTGTAATCCCAGCTACTCGGGGAG", "5#>?CG=E,A=#AG#?#>GAEA@=DB<>ED@?CFC@A?=EG65GGD:C@EE(BFABFG5B?G;EFE?@5EG5GAGD5@;DFGG?F?7GAGGAFEFA>E-E" ] -[ "sim_22_1_8", 163, "chr22", 29509837, 255, "48=1X51=", "=", 29510064, 0, "TCCTAGGGCAATGCCTAGTTAGGTAAACCAACTGGTGCTGAAGAGGAGCGCTTGGGTCTGGGAAATGCCCATTGTAATCACTTGGGACCGTGTTACTTGA", "F?DE>FGCFDDGGEFAD@GFGEGEGF?DABCF@>@E?<D55ABGEAE#(-#EDE?=D8&@DGEA@#8DDD5DDF#F##E4=@=<BD-#AA?##<A###.#" ] [ "sim_22_1_8", 83, "chr22", 29510064, 255, "66=1X33=", "=", 29509837, 0, "AGGCCTCTGTTTTTTAAAATACTGCAGATACAAATCCTAGATTTTCATTCTTAGCACTAGAATGGCTTCTCCAGAAACAGATTTATGTATTTGTAGGAAT", ">BA#EAB#A?#=DCE#DDEACCDGA?@B?D;AC5EAFA=D)#EG8EG##DGD=?#FFGAABECGFA,G<EGEE:@FDEFE?DGDGGFGFGGGGEGGEFGA" ] +[ "sim_22_1_8", 163, "chr22", 29509837, 255, "48=1X51=", "=", 29510064, 0, "TCCTAGGGCAATGCCTAGTTAGGTAAACCAACTGGTGCTGAAGAGGAGCGCTTGGGTCTGGGAAATGCCCATTGTAATCACTTGGGACCGTGTTACTTGA", "F?DE>FGCFDDGGEFAD@GFGEGEGF?DABCF@>@E?<D55ABGEAE#(-#EDE?=D8&@DGEA@#8DDD5DDF#F##E4=@=<BD-#AA?##<A###.#" ] +[ "sim_22_1_9", 83, "chr22", 15600266, 255, "100=", "=", 15600021, 0, "TTTAAAATATTAAAAGATGAATTACTATCAATTGTTTTGAATTTTAAACTAAAAATCAGTAGTTACTATAAAATTATTATTAAATGTTCTAATAATTGTA", "5<###E?##AB#E=DB#<==;#E#?=AFEE@C@AEA6GDGFFG?DE??::?=@BC#G>GB>GEEDA=G>ADEFDEGABEDDEBCGGEFFF7;=GEGGFGC" ] [ "sim_22_1_9", 163, "chr22", 15600021, 255, "3=1X96=", "=", 15600266, 0, "CACATTTTCAAAAAACAAAAAAAAGTCTGAGCTCCTACTGTTGATTTAAATTCTTTTATAAATCTCTATCAAACTTTTCATGTTTACAGTTCTTATGCAA", "FGDEGFA:GGG@?BE?F;FGCFF5@EF3;5G#FA.G=D?D?AGAE?AFF=>CBDE32?<E?ED#GG?G?E#E#EEE>5#B####EFF##=D####6#:#," ] -[ "sim_22_1_9", 83, "chr22", 15600266, 255, "100=", "=", 15600021, 0, "TTTAAAATATTAAAAGATGAATTACTATCAATTGTTTTGAATTTTAAACTAAAAATCAGTAGTTACTATAAAATTATTATTAAATGTTCTAATAATTGTA", "5<###E?##AB#E=DB#<==;#E#?=AFEE@C@AEA6GDGFFG?DE??::?=@BC#G>GB>GEEDA=G>ADEFDEGABEDDEBCGGEFFF7;=GEGGFGC" ] +[ "sim_22_1_a", 99, "chr22", 15047509, 255, "100=", "=", 15047749, 0, "TAAAAACTTGCTGGTTTTGCGGCTTGGGGGGCATCACGGAACCTACTGACACGTGATGTCTCCCCTGGATGCCCAGCTTTAAAATTTCCCACTTTTGTAC", "F?CBF7BGFGGGDD@GFF@B;:GGGEGCFF>EFGGDFFEDEFFG1EGCC?BDF#F=ED=E?@GBF@=GDED;856FD?@=F#FE?EB5CEGCFE#F####" ] [ "sim_22_1_a", 147, "chr22", 15047749, 255, "100=", "=", 15047509, 0, "ATGGTTTTTGCCTGGTACTGTTGAAGTTAGGCTTAATTTTGAACCAGTAGCTTTGTTGTTTACCTTATGTGGTTTTGGGTTCATTTGTTCTATAAGTATA", "##A#A####D5A>F#E@:G2#3ADBD:?##@CE-?D>BEG?D5DEABG3B5EC?CGDEDE=B@AE5@BDDGD>/DGBAE5@EGFEGEEEFEAD;BB?FGC" ] -[ "sim_22_1_a", 99, "chr22", 15047509, 255, "100=", "=", 15047749, 0, "TAAAAACTTGCTGGTTTTGCGGCTTGGGGGGCATCACGGAACCTACTGACACGTGATGTCTCCCCTGGATGCCCAGCTTTAAAATTTCCCACTTTTGTAC", "F?CBF7BGFGGGDD@GFF@B;:GGGEGCFF>EFGGDFFEDEFFG1EGCC?BDF#F=ED=E?@GBF@=GDED;856FD?@=F#FE?EB5CEGCFE#F####" ] +[ "sim_22_1_b", 99, "chr22", 24215590, 255, "23=1X76=", "=", 24215802, 0, "ACAGTCACCCACAGATTTGCACACCTGTCCAACTTGAGCCAGTGATGAATAAAGACAGATATGGTTGCTGTTCTTTCATGGAGCTTACATCCTAGGGGAG", "GGDEGGEAGGD?ED?>GDGDGFG.-GEFG:FE=FFGGFDGDDE==C==:@C7DEE=#GBC,BFFC?<@:A#:6AC>D?C#;EFD/FE#@CF#C=#B?#6=" ] [ "sim_22_1_b", 147, "chr22", 24215802, 255, "20=1X79=", "=", 24215590, 0, "AGTGGGCAGGGCAGCTTTCTACGAGGAGGTGACTAAATTAAGATCTTGCTGTGAAGATGTTTAGTTGCCTGCTACCCTCCACTTCTCCCTGAATAAAACA", "A=#=C?A5.E##?#A##=#C#D?-A#E+E?CEFFCCB1;=-DG:DGFCECF=GA@FFFAECACF-;=DDDFDFB??F?F5?GGF:;FEBGFC;(CGDGG:" ] -[ "sim_22_1_b", 99, "chr22", 24215590, 255, "23=1X76=", "=", 24215802, 0, "ACAGTCACCCACAGATTTGCACACCTGTCCAACTTGAGCCAGTGATGAATAAAGACAGATATGGTTGCTGTTCTTTCATGGAGCTTACATCCTAGGGGAG", "GGDEGGEAGGD?ED?>GDGDGFG.-GEFG:FE=FFGGFDGDDE==C==:@C7DEE=#GBC,BFFC?<@:A#:6AC>D?C#;EFD/FE#@CF#C=#B?#6=" ] [ "sim_22_1_d", 99, "chr22", 24189222, 255, "86=1X1=1X11=", "=", 24189415, 0, "CCTGTCAAGCCTACCTTGTCACCTGTTGCCAGGAAGTCCTGCTCCCTCCTAGGGCAGCCCCTGGTTAGTGGAGCTGAGAGAACCCAGGGTGCTGAGCCGT", "G5FGBEFEEGFED=EGDABFGGGFGGCE?EF=EEDGG9G?GEAECD9FGBFCEF;GGEC=GC5>F1?CDCCD#FEB=EE5B#CFEB###:ECBA-CE:@A" ] [ "sim_22_1_d", 147, "chr22", 24189415, 255, "100=", "=", 24189222, 0, "CGGGGGGCGGAGCGCAGGCAGGTGAAACTGGAGGAAATTGGAGATACAGCGGGAGGGAGGGGGAAAAGGTAAAACCTCTCACCACCTCCTCAACGCTTAT", "##??BG#C##5AB#D;=G#BF#E#:;@?#<(4BGCG-#EA@<G?FC*GDD@FD:BEBEGFGFDDBDEAD9GGD37DDFDCDFDGEFGFCGEE:?AE>EDG" ] [ "sim_22_1_e", 83, "chr22", 39609212, 255, "4=1X95=", "=", 39608988, 0, "AATATAAATTAAAATCTCAGGCCTCCATCCCCTATCTACTGAATCAGAATCTGCATTTTAACAGATCTTTTGTGGTTCATATACAGTTGAGTTCTTTTTT", "4D@6##D=>G#<E#F#?G#;BC:EE#DB:C#>DE>B>:#ED?CFAFDF>DDC<CG:FEGGF5GEE1EFBFDGDG=GDBFDEDFBEGGGFDEDEDFGC?FF" ] @@ -90,28 +90,28 @@ Ready. [ "sim_22_1_10", 147, "chr22", 24428413, 255, "66=1X33=", "=", 24428205, 0, "ATGCCTTATAAATAAATTTATAAGATGACTACTTTGTAGGCACATCTTGTTATAAGAAAAGTCAATGATATGTGTCCCTTTAATTTTCAAAATGAAAAAT", "#GD###A#5ED#B5.#BE==5FG#E3-@#AB7CA)@DEFF=FF#@AEFDFD4>DF2CCCGGA:DGB'FFDG9AEF?3;DGAE?CGCFD2GAG?GB@GFGF" ] [ "sim_22_1_11", 83, "chr22", 41987433, 255, "19=1X50=1X26=1X2=", "=", 41987203, 0, "TGACTATTCTAGGAGACCACGAGTTGGGAAAGGTATGGCAAGGCACCCACAGGAGAGCTGATGACAACTGTGAGGATCAGTGACTGTGGATGATGGAACA", "=?GF3A:EA#GF6#D5=EF##AG>*EE==A#GB=GA.DE'B@AACDECGB3G>DGFDCGFBFE?EFFD;E7GBFGDCAEGBGDAEFB;5GD=GEECF0FE" ] [ "sim_22_1_11", 163, "chr22", 41987203, 255, "68=1X31=", "=", 41987433, 0, "GCCTGGATGGAGCCCTGGGGCTGGAGGCTGGCACTTCCAATCGAGACTGCCCGTTTGGTCCTGCCCTGTGTGACAGTATACAGGCTTATCTTGGCCACCC", "GGGF:GFGG?EGFEG?DAFBEF=FA+>EGG=E:EDBEB7DCCE=DG@?:?CAE4E=DCBGFG@FE8EB>FDAE#CE=ECA@#D-D?:CEA#BD#E#B#EA" ] +[ "sim_22_1_13", 83, "chr22", 32902057, 255, "100=", "=", 32901856, 0, "AGAGCAAAACATTCTGGCAGATGCACAGCAGGTGGTGGGGCAAAAAGGGACCCGGATGGGGATCAAGAGGCTCACAAGATAGTCTCAGCTCTGCCGCTTA", ";5#GFC#@@#AE@FE@E@4B=BE:6;ADA>E#:GF=?#=:?/EA?G>GF3CFCDEB:EFGDG?G@GGFEG=F5FDGE?#GDFGGFEE@AGADGFGEDEEG" ] [ "sim_22_1_13", 163, "chr22", 32901856, 255, "100=", "=", 32902057, 0, "TTATTACTCATAACAATCTTATGGGGTACATACTCTCATTATCCCGATTTGACAGATTAGTAAACTGAGGTGCAGACAGGCAAGTGATTCTTCCAGAGAG", "F:CADE=EBGDDAEGE>DE@@D=CDDE#EG35CG?E;7CEEBDGGEB@-F=GEGD8CG>=5A=BBAFB#?D:G?E3A##?#F-?#DC#:###E#G8##B#" ] -[ "sim_22_1_13", 83, "chr22", 32902057, 255, "100=", "=", 32901856, 0, "AGAGCAAAACATTCTGGCAGATGCACAGCAGGTGGTGGGGCAAAAAGGGACCCGGATGGGGATCAAGAGGCTCACAAGATAGTCTCAGCTCTGCCGCTTA", ";5#GFC#@@#AE@FE@E@4B=BE:6;ADA>E#:GF=?#=:?/EA?G>GF3CFCDEB:EFGDG?G@GGFEG=F5FDGE?#GDFGGFEE@AGADGFGEDEEG" ] [ "sim_22_1_14", 99, "chr22", 37296079, 255, "100=", "=", 37296332, 0, "TCGGGCCTAGAACACGGAGCCTGGAGACCCGCGCGCCGTTGACCACAGGGTTTGGCGCCAAACGAGGAGGGCGGGGCGAGGACCAAGGGGCCGGGGCGGG", "FDFGECDG?GDF=2BGEGEGEE@GGG=EEG:GFF@>EADDAFEE?::FGEGB>F>E@6EGGAE#DG#=B?(#@BCDDAEEGGFBAFFE-D#:>#:#CD7#" ] [ "sim_22_1_14", 147, "chr22", 37296332, 255, "27=1X9=1X12=1X49=", "=", 37296079, 0, "GGCGAGGGGGCGGGGCGAGGGCTGAGGGGCGGAAAACTAAGAGGAGCCCCCGCGGGTGGCGAGCTGGGATGACGGAGGGAGGGAGGGAGGGGCGCTGTGG", "E##G#A=CD:.E-E.DEDE71#-5EEAGC;5-=#EE5'?DDED?:CFDFG&=?ACFB=DFGG=EBFDGCAGFGG>FG>GFGFFDFGE=AG6DAGEFFEGA" ] [ "sim_22_1_15", 83, "chr22", 25992258, 255, "100=", "=", 25992044, 0, "ATGTGCTCTATGGTCACCTAACCTGTCTGAGACTCAATATACTCATCTGATAAATAGGCAGAATAAAAATAAGAGGTGCCCTGCCTCTTTTCAGAGTCAC", "##AEG#=GE>75CADDFEB=DF;<7=CF?<B?CBBC6:GDCDE=EBFFGFDE=BDDEEDEB?DD'AAE?CEEDFGFDDG>EGEGDA>FGD;EEEF:@GF<" ] [ "sim_22_1_15", 163, "chr22", 25992044, 255, "2=1X95=1X1=", "=", 25992258, 0, "GAGAGGCAGCCATAGGTTCGAGTCCTAGCTACTGGCTAGGGGACCTTGGACAAGGCACTGATAGTCCCAAGACTCAGTTTACCCATCTGTGCAGTGATGT", "CG.GCEGGGFDGGGGEDCE<BEG5GDGEE=##EEFEFABFDE:#G??>:55;FE:5=A?E;E9BF#E@5=AE;BEGCA:#>EAC#DED#B##A;###B#B" ] [ "sim_22_1_16", 99, "chr22", 20264219, 255, "84=1X4=1X8=1X1=", "=", 20264427, 0, "TCCAGCTCCATCTGCCAGGTTTTGTTTTGCCTGAGCAGTAGGAGCCTAGAAATATTCCTTGCACAACACAGGCACATAATGACTCGCTGAGCAGGACTTG", "FBGGFDGEFA?GGFGEF;AEGCEEGCFE?FE;GA:EAEEGDD>F8E=E=FABFCDCEG@@@E#BDBCBE;=#D5#,55DCAG:B8EGE#AAGBF#?#E#A" ] [ "sim_22_1_16", 147, "chr22", 20264427, 255, "42=1X57=", "=", 20264219, 0, "CTCTGTCCGTTTCTAATGGGAGCATTAACTCACTGCTTTGGGGGGCTGAGATAGTCAAAAAAGAGCAATTTCAGTGCAGGTTCTAGTCCTGGGCATGCTC", "#;>6##<@#C@#8B#>#:GF2G@A2;BFA?B:-<ECG--)GE7F9DGD;/:ACDABDEBD5EG:EB@DDGB#@:AEA?=GG=DE?D5GD<AFEC;DF=GA" ] +[ "sim_22_1_17", 83, "chr22", 42396076, 255, "20=1X79=", "=", 42395864, 0, "TAATTTTACCTCTCAGAAAGCTCTGGCTGCTGCTGTTCATCTTTTTGTAAATGTTCACTTAACAGCTGATCCTTTGGAACAAGAACTGGAGAGACAGTGG", "C=#EDEC#5####E#D-E3E#ECGA?EE=GCDD:#@E:B?F?E@GDBDFFG5GC:FE=BEBF:GA?EDG@B<>A?G:FFEFCFECFDCDC<DGEDDF;EG" ] [ "sim_22_1_17", 163, "chr22", 42395864, 255, "8=1X71=1X12=1X6=", "=", 42396076, 0, "TCAGTGTTATCATTTCTAAATTTAAAAGGTAAATTCAATAATTCCTAAGATCTCTGCTTGCTCTAAAATTCCCTGACTCTCATTACTGTCTTTATAGTGT", "G>AEE=EF-GB?EGG@GGEEAB-GCE>E9;DEACG?:CCGDA(E7DFF.GFGEBEEED;D#FG4G:DDGGC=GG.;D@#A#B????#C#B#CB##AFE##" ] -[ "sim_22_1_17", 83, "chr22", 42396076, 255, "20=1X79=", "=", 42395864, 0, "TAATTTTACCTCTCAGAAAGCTCTGGCTGCTGCTGTTCATCTTTTTGTAAATGTTCACTTAACAGCTGATCCTTTGGAACAAGAACTGGAGAGACAGTGG", "C=#EDEC#5####E#D-E3E#ECGA?EE=GCDD:#@E:B?F?E@GDBDFFG5GC:FE=BEBF:GA?EDG@B<>A?G:FFEFCFECFDCDC<DGEDDF;EG" ] [ "sim_22_1_2", 99, "chr22", 29469417, 255, "100=", "=", 29469608, 0, "TGATGCTGAGCTTGACGGCGGTCCCCCGGGTACCACTCCATCACCCAGTGAAGGAGGCAGGTGGGACCATCTCAGACATGGGCTGTGTTGGGACCCCCAG", "@*G@F:7DEDG?BFGFFGA:DBGG:EAGDCDAGG?E=FGGGGD?EGG5FEFE?#EA@E:DCD?>E-?C?BE<BE?CE:GB=CGC#+?#CC###>C#D@F#" ] [ "sim_22_1_2", 147, "chr22", 29469608, 255, "11=2X13=1X73=", "=", 29469417, 0, "TGGCCAAGTAATCATGCTAACTAGAGCTCTAGCTTCCTCTCCCTGGTTTCGCTTTTCTAAGTATAAATAAATAAATAAATGATAAATTGCCTTATTTTTT", "?#D#A##FBE@-#0EA/?A>#?=EB9%;<-EC>G3EA2ADDF9EGCACFAFC?:GAB5AGE=CGBE5?DEEEFBG:DFDECFDB5AGEGGGGGFD?G?DD" ] [ "sim_22_1_3", 99, "chr22", 25791286, 255, "40=2X31=1X26=", "=", 25791479, 0, "ATTCTCTGCCCTGAGTAAGGGGAATCAAGAGAGATTTCGATGCAGGAAACAGCACCCGAGAGAATCAATCCAGTTGGGCCTTTTCAATTAGTCTGTTTTT", "?GFGFFAEEEGEF-GGEEGGEEFFGDF;??DGDGD/=DBD09EGG5EDG@DEC,FBGD@BF5:FBE6:FAE@B.EAABCBFCE5D>EF#=#:EE#A>###" ] [ "sim_22_1_3", 147, "chr22", 25791479, 255, "1=1X12=2X12=1X17=1X4=1X48=", "=", 25791286, 0, "CGTCTCTCCTGCCCCCCACCCTCTGTCTGTGAAAACATTAGAGCTGAAAGACGACTCCCCTGGCGATAAACATCTACGCAAAGCCAATTGTCAGGCGATG", "4####B#?C#???#6,D####-BAEF3<)DE>AD(#DD+BFEFFBBEAFBC1GABFAA2GEBGEDF8G7G=AAAD=EGDD:A4ABE?AFGDGD0DD?DB>" ] +[ "sim_22_1_4", 99, "chr22", 46558150, 255, "100=", "=", 46558385, 0, "CCCTGGCTGGAGTACAAGTTACTGGGGCTCAGTTCTTAGGATTCCTACAAAGCCCAATTTGGGTCACCTGACTTGTTAAGTCAGGTGAAGGTGACTTACC", "G6EG5GGGGDGGADFGEB?GFDGGAEGGCFFBECGGB*BEA9BFG6E=?=)C5FGAFE6G2FB=CFECF#DAEAG<AGD7F*44D:#B>+?F##;E;#DD" ] [ "sim_22_1_4", 147, "chr22", 46558385, 255, "1X49=1X9=1X39=", "=", 46558150, 0, "TGACTCCAGGGAAGTTAAATAAATGCCAAGAGGATTCACGTGGCAGGGCCATGGAGGTGGGGAGGAAGGAGCACAGGAGACACCAGGTGCTCACTGTCCA", "#E###BF#?;;#>@=1#@=E=B#E-EDF?DBC#EDEF?;6FE>+g...@gde.aede+DAF:4E>FF=EDA;DAEGEGAEFD?GD=DG=G=C5FEGDGGFAG" ] -[ "sim_22_1_4", 99, "chr22", 46558150, 255, "100=", "=", 46558385, 0, "CCCTGGCTGGAGTACAAGTTACTGGGGCTCAGTTCTTAGGATTCCTACAAAGCCCAATTTGGGTCACCTGACTTGTTAAGTCAGGTGAAGGTGACTTACC", "G6EG5GGGGDGGADFGEB?GFDGGAEGGCFFBECGGB*BEA9BFG6E=?=)C5FGAFE6G2FB=CFECF#DAEAG<AGD7F*44D:#B>+?F##;E;#DD" ] [ "sim_22_1_5", 99, "chr22", 28913667, 255, "44=1X26=1X28=", "=", 28913875, 0, "TGGAATGGAGTGGGGTAGAGGACTGCTGATTTAGCAGATGCATTATTTCCCCAAGCCAAAGAGCTGCCCTGGAAATGGGCCAAATATAATTTCTTTTAAG", "FGECEGDGGGGG?DGGEBG=FGGFD@EA9:EGGDGCFDDCEC??=DF:DECAEFC:A@EFEGE6>#GBE5C#BF<EDC=D&?G;E#=#B###G=A#@?5#" ] [ "sim_22_1_5", 147, "chr22", 28913875, 255, "100=", "=", 28913667, 0, "AGGGGCAGTGGGGGTGGTGTGGGGGAGCCGCTGTGAGTCTTAATGCAAAGAGGAATGTAGGCTAGTCAACAGGAAACCCAAAGTGCTTGATACAGCACAG", "##DAA#C-#BE#D##F#9:B#@AB#DF#6D6G8F-D8CFF8E?E:#=>B>AG=6EG#CGEDG9B3:AEEG6AC:BE5DDCDFBBG5GCFG4GAEEFBGG?" ] [ "sim_22_1_6", 99, "chr22", 18665735, 255, "14=1X10=1X74=", "=", 18665943, 0, "ATTATTCAGCCTCACATTTCAACATCGCAGAACAGGTCAGGGAGTGCAAGGTACCTCCTGCTCTTTCCAGCAGGTGCAAGGTGCACAGGGAGAAGCAGGT", "CDDEFG;?DGEDFE+CECEEGFG>C,EG5?DGE87GBDFGCEDD=BGGDD?GDFGDD?DAGGC<G=GF@A@CE@>?>.6#F#FFDEE?@CE==<9?B?>;" ] [ "sim_22_1_6", 147, "chr22", 18665943, 255, "9=1X90=", "=", 18665735, 0, "CAGGCCGCCCGGGGCGGTTCCACCAAGAAAGTGACATCTGGGAGGGGCATTGAGGCAAAGGGGCCGCGAGAGGGTAGGTGCTCTAGAGGTGGCCCACGGG", "?##??3G#9##=5B#>A#.#>#>CFBEC@:BGC>.A5@6-F4:5?;EGGAA>?6@D<?EAEDE6CGGDGGE@9F?GGGGDD5EDDGFD?:>?FED?DEBA" ] +[ "sim_22_1_7", 83, "chr22", 45060375, 255, "41=1X56=1X1=", "=", 45060162, 0, "ACCAGCCTGGCCAACATGGTGAAACGCTGTCTCTACTAAAAGTACAAAAAAATTAGCTAGGCGTGGTGGTGGGCACCTGTAATCCCAGCTACTCGGGGAG", "5#>?CG=E,A=#AG#?#>GAEA@=DB<>ED@?CFC@A?=EG65GGD:C@EE(BFABFG5B?G;EFE?@5EG5GAGD5@;DFGG?F?7GAGGAFEFA>E-E" ] [ "sim_22_1_7", 163, "chr22", 45060162, 255, "89=1X5=1X4=", "=", 45060375, 0, "TAGGAATTTTTTTTTTTTTTGAGACAGAGTTTCGCTCTTGTTGCCCAGGCTGGAGTGCAATGGTGCGATTGGCTGGAATTTTTTTTCTTGGCTGTCATAA", "FGFCEEEGDE?CB::GE=FADFCEABEGBF>D;FGGGFFCDFGDGABCCADCDDDC;EF=:ACGGCEC#C=?=>EG@9#A@?=E;=:#B##A##@%C#D#" ] -[ "sim_22_1_7", 83, "chr22", 45060375, 255, "41=1X56=1X1=", "=", 45060162, 0, "ACCAGCCTGGCCAACATGGTGAAACGCTGTCTCTACTAAAAGTACAAAAAAATTAGCTAGGCGTGGTGGTGGGCACCTGTAATCCCAGCTACTCGGGGAG", "5#>?CG=E,A=#AG#?#>GAEA@=DB<>ED@?CFC@A?=EG65GGD:C@EE(BFABFG5B?G;EFE?@5EG5GAGD5@;DFGG?F?7GAGGAFEFA>E-E" ] [ "sim_22_1_8", 83, "chr22", 29510064, 255, "66=1X33=", "=", 29509837, 0, "AGGCCTCTGTTTTTTAAAATACTGCAGATACAAATCCTAGATTTTCATTCTTAGCACTAGAATGGCTTCTCCAGAAACAGATTTATGTATTTGTAGGAAT", ">BA#EAB#A?#=DCE#DDEACCDGA?@B?D;AC5EAFA=D)#EG8EG##DGD=?#FFGAABECGFA,G<EGEE:@FDEFE?DGDGGFGFGGGGEGGEFGA" ] [ "sim_22_1_8", 163, "chr22", 29509837, 255, "48=1X51=", "=", 29510064, 0, "TCCTAGGGCAATGCCTAGTTAGGTAAACCAACTGGTGCTGAAGAGGAGCGCTTGGGTCTGGGAAATGCCCATTGTAATCACTTGGGACCGTGTTACTTGA", "F?DE>FGCFDDGGEFAD@GFGEGEGF?DABCF@>@E?<D55ABGEAE#(-#EDE?=D8&@DGEA@#8DDD5DDF#F##E4=@=<BD-#AA?##<A###.#" ] [ "sim_22_1_9", 83, "chr22", 15600266, 255, "100=", "=", 15600021, 0, "TTTAAAATATTAAAAGATGAATTACTATCAATTGTTTTGAATTTTAAACTAAAAATCAGTAGTTACTATAAAATTATTATTAAATGTTCTAATAATTGTA", "5<###E?##AB#E=DB#<==;#E#?=AFEE@C@AEA6GDGFFG?DE??::?=@BC#G>GB>GEEDA=G>ADEFDEGABEDDEBCGGEFFF7;=GEGGFGC" ] @@ -120,12 +120,12 @@ Ready. [ "sim_22_1_a", 147, "chr22", 15047749, 255, "100=", "=", 15047509, 0, "ATGGTTTTTGCCTGGTACTGTTGAAGTTAGGCTTAATTTTGAACCAGTAGCTTTGTTGTTTACCTTATGTGGTTTTGGGTTCATTTGTTCTATAAGTATA", "##A#A####D5A>F#E@:G2#3ADBD:?##@CE-?D>BEG?D5DEABG3B5EC?CGDEDE=B@AE5@BDDGD>/DGBAE5@EGFEGEEEFEAD;BB?FGC" ] [ "sim_22_1_b", 99, "chr22", 24215590, 255, "23=1X76=", "=", 24215802, 0, "ACAGTCACCCACAGATTTGCACACCTGTCCAACTTGAGCCAGTGATGAATAAAGACAGATATGGTTGCTGTTCTTTCATGGAGCTTACATCCTAGGGGAG", "GGDEGGEAGGD?ED?>GDGDGFG.-GEFG:FE=FFGGFDGDDE==C==:@C7DEE=#GBC,BFFC?<@:A#:6AC>D?C#;EFD/FE#@CF#C=#B?#6=" ] [ "sim_22_1_b", 147, "chr22", 24215802, 255, "20=1X79=", "=", 24215590, 0, "AGTGGGCAGGGCAGCTTTCTACGAGGAGGTGACTAAATTAAGATCTTGCTGTGAAGATGTTTAGTTGCCTGCTACCCTCCACTTCTCCCTGAATAAAACA", "A=#=C?A5.E##?#A##=#C#D?-A#E+E?CEFFCCB1;=-DG:DGFCECF=GA@FFFAECACF-;=DDDFDFB??F?F5?GGF:;FEBGFC;(CGDGG:" ] +[ "sim_22_1_d", 99, "chr22", 24189222, 255, "86=1X1=1X11=", "=", 24189415, 0, "CCTGTCAAGCCTACCTTGTCACCTGTTGCCAGGAAGTCCTGCTCCCTCCTAGGGCAGCCCCTGGTTAGTGGAGCTGAGAGAACCCAGGGTGCTGAGCCGT", "G5FGBEFEEGFED=EGDABFGGGFGGCE?EF=EEDGG9G?GEAECD9FGBFCEF;GGEC=GC5>F1?CDCCD#FEB=EE5B#CFEB###:ECBA-CE:@A" ] [ "sim_22_1_d", 147, "chr22", 24189415, 255, "100=", "=", 24189222, 0, "CGGGGGGCGGAGCGCAGGCAGGTGAAACTGGAGGAAATTGGAGATACAGCGGGAGGGAGGGGGAAAAGGTAAAACCTCTCACCACCTCCTCAACGCTTAT", "##??BG#C##5AB#D;=G#BF#E#:;@?#<(4BGCG-#EA@<G?FC*GDD@FD:BEBEGFGFDDBDEAD9GGD37DDFDCDFDGEFGFCGEE:?AE>EDG" ] -[ "sim_22_1_d", 99, "chr22", 24189222, 255, "86=1X1=1X11=", "=", 24189415, 0, "CCTGTCAAGCCTACCTTGTCACCTGTTGCCAGGAAGTCCTGCTCCCTCCTAGGGCAGCCCCTGGTTAGTGGAGCTGAGAGAACCCAGGGTGCTGAGCCGT", "G5FGBEFEEGFED=EGDABFGGGFGGCE?EF=EEDGG9G?GEAECD9FGBFCEF;GGEC=GC5>F1?CDCCD#FEB=EE5B#CFEB###:ECBA-CE:@A" ] [ "sim_22_1_e", 83, "chr22", 39609212, 255, "4=1X95=", "=", 39608988, 0, "AATATAAATTAAAATCTCAGGCCTCCATCCCCTATCTACTGAATCAGAATCTGCATTTTAACAGATCTTTTGTGGTTCATATACAGTTGAGTTCTTTTTT", "4D@6##D=>G#<E#F#?G#;BC:EE#DB:C#>DE>B>:#ED?CFAFDF>DDC<CG:FEGGF5GEE1EFBFDGDG=GDBFDEDFBEGGGFDEDEDFGC?FF" ] [ "sim_22_1_e", 163, "chr22", 39608988, 255, "92=1X7=", "=", 39609212, 0, "CGTAGTGAGACCCCATCTCCAAAAAATAAATAAATTAAGGACAGGATGGGCATGGACCACTCTTCAAGATTACTGACCAGCTTCTTGATATTGGACAACT", "BC-GDFADDFFFCG@FAF6GCFBD==@=ACG>=G>EC5<>B#E0<CG4,=GBB>DDGAGEDE7BBD6:G#55DD=EEF#B5#;#GEC#BE####A=C?A5" ] +[ "sim_22_1_f", 99, "chr22", 23113643, 255, "100=", "=", 23113851, 0, "CTTTTCTATATAAAACAAATAATTTATAATACTGTATTTGTTTTCTATTACTATTGAAATTACTACAAATGTAGTAGCTAAAACAACACATATTTTTCAT", "DE>FDG5FDGDGFDAGEFABDGGEGADG?BEDDFGGEDGA?GG=9FEDDGBD58=@AFDFD=CBD9GGD=DCC?EE?F#A6GC#>?F#F@2E?CDF?#B?" ] [ "sim_22_1_f", 147, "chr22", 23113851, 255, "14=1X85=", "=", 23113643, 0, "TGCCTTTTCCAGCTGATAGAGACAGCCATGTTTCATGGCTTGTAGCCCCTTCCTCCATCTTCAAAGCCAACAACAACTGGTCAAGTTGTCACATTGCATC", "####FF-0AD#E>@#?#9??E##A>C=C>D7A,<G?D>=>DDD=F:?G=>CE?:CAFGEDGEFDAGGFEF7CGDCEDEEGA@DECFGE-?DEACD?DC=G" ] -[ "sim_22_1_f", 99, "chr22", 23113643, 255, "100=", "=", 23113851, 0, "CTTTTCTATATAAAACAAATAATTTATAATACTGTATTTGTTTTCTATTACTATTGAAATTACTACAAATGTAGTAGCTAAAACAACACATATTTTTCAT", "DE>FDG5FDGDGFDAGEFABDGGEGADG?BEDDFGGEDGA?GG=9FEDDGBD58=@AFDFD=CBD9GGD=DCC?EE?F#A6GC#>?F#F@2E?CDF?#B?" ] # 10:22:40 > # 10:22:40 > "Done." diff --git a/sql/backends/monet5/vaults/bam/Tests/query2.11.sql b/sql/backends/monet5/vaults/bam/Tests/query2.11.sql --- a/sql/backends/monet5/vaults/bam/Tests/query2.11.sql +++ b/sql/backends/monet5/vaults/bam/Tests/query2.11.sql @@ -26,9 +26,9 @@ FROM ( AND l.pnext = r.pos AND ((r.rnext = '=' AND l.rname = r.rname) OR r.rnext = l.rname) AND r.pnext = l.pos -ORDER BY l.qname; +ORDER BY l.qname, l_cigar; SELECT 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 FROM bam.paired_secondary_alignments_3 -ORDER BY qname; +ORDER BY qname, l_cigar; 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 @@ -40,8 +40,8 @@ Ready. % 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 +[ "sim_22_1_1", 339, "chr22", 39995061, 0, "11=1368D51=1X37=", "=", 39994332, 0, "ACTCTGTCGCCCAGGCCGGGGCGTAGCCATGCAAACACGGCTCACTGCAGCCTCGACCTCCCCGGCTCAAGCCATCCTCCCACCTCAACCTCCCAAGTAG", "##?#-@=#?D5?EBC##=2#E6A=E8A:F5+F>=CF8#BDFDF?7B8BAGC2EF?FFFG>EE*F=GDBGDGFEFEFG=FBGFFBFFBGEDCF5EFGGGDG", 419, "chr22", 39994332, 0, "5=1X11=1885D83=", "=", 39995061, 0, "AGTAGATGGGATTACAGGCACCCGCCACCGCGCCCAGCTAATTTTTATATATTTTTTAAGTAGAGATGGGGTTTCACCATGTTGGCCAGGCTGGTCTTGA", "EEEEEFAG=GCDAGBF8F:EFGGDEGCFFBAAGCE?DD?5?DGF#DC##BD;D=BD@G?A0F9G6AFC?5#CCCAE6AD-F#CA0#.ADCD;#-#6#A##" ] [ "sim_22_1_1", 339, "chr22", 39996123, 0, "4=1X1I10=307D46=1X37=", "=", 39995910, 0, "ACTCTGTCGCCCAGGCCGGGGCGTAGCCATGCAAACACGGCTCACTGCAGCCTCGACCTCCCCGGCTCAAGCCATCCTCCCACCTCAACCTCCCAAGTAG", "##?#-@=#?D5?EBC##=2#E6A=E8A:F5+F>=CF8#BDFDF?7B8BAGC2EF?FFFG>EE*F=GDBGDGFEFEFG=FBGFFBFFBGEDCF5EFGGGDG", 419, "chr22", 39995910, 0, "5=1X12=307D82=", "=", 39996123, 0, "AGTAGATGGGATTACAGGCACCCGCCACCGCGCCCAGCTAATTTTTATATATTTTTTAAGTAGAGATGGGGTTTCACCATGTTGGCCAGGCTGGTCTTGA", "EEEEEFAG=GCDAGBF8F:EFGGDEGCFFBAAGCE?DD?5?DGF#DC##BD;D=BD@G?A0F9G6AFC?5#CCCAE6AD-F#CA0#.ADCD;#-#6#A##" ] -[ "sim_22_1_1", 339, "chr22", 39995061, 0, "11=1368D51=1X37=", "=", 39994332, 0, "ACTCTGTCGCCCAGGCCGGGGCGTAGCCATGCAAACACGGCTCACTGCAGCCTCGACCTCCCCGGCTCAAGCCATCCTCCCACCTCAACCTCCCAAGTAG", "##?#-@=#?D5?EBC##=2#E6A=E8A:F5+F>=CF8#BDFDF?7B8BAGC2EF?FFFG>EE*F=GDBGDGFEFEFG=FBGFFBFFBGEDCF5EFGGGDG", 419, "chr22", 39994332, 0, "5=1X11=1885D83=", "=", 39995061, 0, "AGTAGATGGGATTACAGGCACCCGCCACCGCGCCCAGCTAATTTTTATATATTTTTTAAGTAGAGATGGGGTTTCACCATGTTGGCCAGGCTGGTCTTGA", "EEEEEFAG=GCDAGBF8F:EFGGDEGCFFBAAGCE?DD?5?DGF#DC##BD;D=BD@G?A0F9G6AFC?5#CCCAE6AD-F#CA0#.ADCD;#-#6#A##" ] [ "sim_22_1_14", 355, "chr22", 37296079, 0, "92=172D6=1X1=", "=", 37296228, 0, "TCGGGCCTAGAACACGGAGCCTGGAGACCCGCGCGCCGTTGACCACAGGGTTTGGCGCCAAACGAGGAGGGCGGGGCGAGGACCAAGGGGCCGGGGCGGG", "FDFGECDG?GDF=2BGEGEGEE@GGG=EEG:GFF@>EADDAFEE?::FGEGB>F>E@6EGGAE#DG#=B?(#@BCDDAEEGGFBAFFE-D#:>#:#CD7#", 403, "chr22", 37296228, 0, "1=1X7=104D18=1X9=1X12=1X49=", "=", 37296079, 0, "GGCGAGGGGGCGGGGCGAGGGCTGAGGGGCGGAAAACTAAGAGGAGCCCCCGCGGGTGGCGAGCTGGGATGACGGAGGGAGGGAGGGAGGGGCGCTGTGG", "E##G#A=CD:.E-E.DEDE71#-5EEAGC;5-=#EE5'?DDED?:CFDFG&=?ACFB=DFGG=EBFDGCAGFGG>FG>GFGFFDFGE=AG6DAGEFFEGA" ] [ "sim_22_1_7", 339, "chr22", 45060375, 0, "41=1X56=1I1=", "=", 45060235, 0, "ACCAGCCTGGCCAACATGGTGAAACGCTGTCTCTACTAAAAGTACAAAAAAATTAGCTAGGCGTGGTGGTGGGCACCTGTAATCCCAGCTACTCGGGGAG", "5#>?CG=E,A=#AG#?#>GAEA@=DB<>ED@?CFC@A?=EG65GGD:C@EE(BFABFG5B?G;EFE?@5EG5GAGD5@;DFGG?F?7GAGGAFEFA>E-E", 419, "chr22", 45060235, 0, "1=1I12=72I3=1X5=1X4=", "=", 45060375, 0, "TAGGAATTTTTTTTTTTTTTGAGACAGAGTTTCGCTCTTGTTGCCCAGGCTGGAGTGCAATGGTGCGATTGGCTGGAATTTTTTTTCTTGGCTGTCATAA", "FGFCEEEGDE?CB::GE=FADFCEABEGBF>D;FGGGFFCDFGDGABCCADCDDDC;EF=:ACGGCEC#C=?=>EG@9#A@?=E;=:#B##A##@%C#D#" ] [ "sim_22_1_a", 339, "chr14", 18226024, 0, "100=", "=", 18225784, 0, "GTACAAAAGTGGGAAATTTTAAAGCTGGGCATCCAGGGGAGACATCACGTGTCAGTAGGTTCCGTGATGCCCCCCAAGCCGCAAAACCAGCAAGTTTTTA", "####F#EFCGEC5BE?EF#F=@?DF658;DEDG=@FBG@?E=DE=F#FDB?CCGE1GFFEDEFFDGGFE>FFCGEGGG:;B@FFG@DDGGGFGB7FBC?F", 419, "chr14", 18225784, 0, "5=1X31=1X62=", "=", 18226024, 0, "TATACTTATAGAACAAATGAACCCAAAACCACATAAGGTAAACAACAAAGCTACTGGTTCAAAATTAAGCCTAACTTCAACAGTACCAGGCAAAAACCAT", "CGF?BB;DAEFEEEGEFGE@5EABGD/>DGDDB@5EA@B=EDEDGC?CE5B3GBAED5D?GEB>D?-EC@##?:DBDA3#2G:@E#F>A5D####A#A##" ] @@ -53,8 +53,8 @@ Ready. % 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 +[ "sim_22_1_1", 339, "chr22", 39995061, 0, "11=1368D51=1X37=", "=", 39994332, 0, "ACTCTGTCGCCCAGGCCGGGGCGTAGCCATGCAAACACGGCTCACTGCAGCCTCGACCTCCCCGGCTCAAGCCATCCTCCCACCTCAACCTCCCAAGTAG", "##?#-@=#?D5?EBC##=2#E6A=E8A:F5+F>=CF8#BDFDF?7B8BAGC2EF?FFFG>EE*F=GDBGDGFEFEFG=FBGFFBFFBGEDCF5EFGGGDG", 419, "chr22", 39994332, 0, "5=1X11=1885D83=", "=", 39995061, 0, "AGTAGATGGGATTACAGGCACCCGCCACCGCGCCCAGCTAATTTTTATATATTTTTTAAGTAGAGATGGGGTTTCACCATGTTGGCCAGGCTGGTCTTGA", "EEEEEFAG=GCDAGBF8F:EFGGDEGCFFBAAGCE?DD?5?DGF#DC##BD;D=BD@G?A0F9G6AFC?5#CCCAE6AD-F#CA0#.ADCD;#-#6#A##" ] [ "sim_22_1_1", 339, "chr22", 39996123, 0, "4=1X1I10=307D46=1X37=", "=", 39995910, 0, "ACTCTGTCGCCCAGGCCGGGGCGTAGCCATGCAAACACGGCTCACTGCAGCCTCGACCTCCCCGGCTCAAGCCATCCTCCCACCTCAACCTCCCAAGTAG", "##?#-@=#?D5?EBC##=2#E6A=E8A:F5+F>=CF8#BDFDF?7B8BAGC2EF?FFFG>EE*F=GDBGDGFEFEFG=FBGFFBFFBGEDCF5EFGGGDG", 419, "chr22", 39995910, 0, "5=1X12=307D82=", "=", 39996123, 0, "AGTAGATGGGATTACAGGCACCCGCCACCGCGCCCAGCTAATTTTTATATATTTTTTAAGTAGAGATGGGGTTTCACCATGTTGGCCAGGCTGGTCTTGA", "EEEEEFAG=GCDAGBF8F:EFGGDEGCFFBAAGCE?DD?5?DGF#DC##BD;D=BD@G?A0F9G6AFC?5#CCCAE6AD-F#CA0#.ADCD;#-#6#A##" ] -[ "sim_22_1_1", 339, "chr22", 39995061, 0, "11=1368D51=1X37=", "=", 39994332, 0, "ACTCTGTCGCCCAGGCCGGGGCGTAGCCATGCAAACACGGCTCACTGCAGCCTCGACCTCCCCGGCTCAAGCCATCCTCCCACCTCAACCTCCCAAGTAG", "##?#-@=#?D5?EBC##=2#E6A=E8A:F5+F>=CF8#BDFDF?7B8BAGC2EF?FFFG>EE*F=GDBGDGFEFEFG=FBGFFBFFBGEDCF5EFGGGDG", 419, "chr22", 39994332, 0, "5=1X11=1885D83=", "=", 39995061, 0, "AGTAGATGGGATTACAGGCACCCGCCACCGCGCCCAGCTAATTTTTATATATTTTTTAAGTAGAGATGGGGTTTCACCATGTTGGCCAGGCTGGTCTTGA", "EEEEEFAG=GCDAGBF8F:EFGGDEGCFFBAAGCE?DD?5?DGF#DC##BD;D=BD@G?A0F9G6AFC?5#CCCAE6AD-F#CA0#.ADCD;#-#6#A##" ] [ "sim_22_1_14", 355, "chr22", 37296079, 0, "92=172D6=1X1=", "=", 37296228, 0, "TCGGGCCTAGAACACGGAGCCTGGAGACCCGCGCGCCGTTGACCACAGGGTTTGGCGCCAAACGAGGAGGGCGGGGCGAGGACCAAGGGGCCGGGGCGGG", "FDFGECDG?GDF=2BGEGEGEE@GGG=EEG:GFF@>EADDAFEE?::FGEGB>F>E@6EGGAE#DG#=B?(#@BCDDAEEGGFBAFFE-D#:>#:#CD7#", 403, "chr22", 37296228, 0, "1=1X7=104D18=1X9=1X12=1X49=", "=", 37296079, 0, "GGCGAGGGGGCGGGGCGAGGGCTGAGGGGCGGAAAACTAAGAGGAGCCCCCGCGGGTGGCGAGCTGGGATGACGGAGGGAGGGAGGGAGGGGCGCTGTGG", "E##G#A=CD:.E-E.DEDE71#-5EEAGC;5-=#EE5'?DDED?:CFDFG&=?ACFB=DFGG=EBFDGCAGFGG>FG>GFGFFDFGE=AG6DAGEFFEGA" ] [ "sim_22_1_7", 339, "chr22", 45060375, 0, "41=1X56=1I1=", "=", 45060235, 0, "ACCAGCCTGGCCAACATGGTGAAACGCTGTCTCTACTAAAAGTACAAAAAAATTAGCTAGGCGTGGTGGTGGGCACCTGTAATCCCAGCTACTCGGGGAG", "5#>?CG=E,A=#AG#?#>GAEA@=DB<>ED@?CFC@A?=EG65GGD:C@EE(BFABFG5B?G;EFE?@5EG5GAGD5@;DFGG?F?7GAGGAFEFA>E-E", 419, "chr22", 45060235, 0, "1=1I12=72I3=1X5=1X4=", "=", 45060375, 0, "TAGGAATTTTTTTTTTTTTTGAGACAGAGTTTCGCTCTTGTTGCCCAGGCTGGAGTGCAATGGTGCGATTGGCTGGAATTTTTTTTCTTGGCTGTCATAA", "FGFCEEEGDE?CB::GE=FADFCEABEGBF>D;FGGGFFCDFGDGABCCADCDDDC;EF=:ACGGCEC#C=?=>EG@9#A@?=E;=:#B##A##@%C#D#" ] [ "sim_22_1_a", 339, "chr14", 18226024, 0, "100=", "=", 18225784, 0, "GTACAAAAGTGGGAAATTTTAAAGCTGGGCATCCAGGGGAGACATCACGTGTCAGTAGGTTCCGTGATGCCCCCCAAGCCGCAAAACCAGCAAGTTTTTA", "####F#EFCGEC5BE?EF#F=@?DF658;DEDG=@FBG@?E=DE=F#FDB?CCGE1GFFEDEFFDGGFE>FFCGEGGG:;B@FFG@DDGGGFGB7FBC?F", 419, "chr14", 18225784, 0, "5=1X31=1X62=", "=", 18226024, 0, "TATACTTATAGAACAAATGAACCCAAAACCACATAAGGTAAACAACAAAGCTACTGGTTCAAAATTAAGCCTAACTTCAACAGTACCAGGCAAAAACCAT", "CGF?BB;DAEFEEEGEFGE@5EABGD/>DGDDB@5EA@B=EDEDGC?CE5B3GBAED5D?GEB>D?-EC@##?:DBDA3#2G:@E#F>A5D####A#A##" ] diff --git a/sql/backends/monet5/vaults/bam/bam_export.c b/sql/backends/monet5/vaults/bam/bam_export.c --- a/sql/backends/monet5/vaults/bam/bam_export.c +++ b/sql/backends/monet5/vaults/bam/bam_export.c @@ -466,7 +466,7 @@ bam_exportf(Client cntxt, MalBlkPtr mb, (void) stk; (void) pci; - throw(MAL, "bam_export", SQLSTATE(0A000) "Exporting to BAM files is not implemented yet. This is our first priority for the next release of the BAM library."); + throw(MAL, "bam_export", SQLSTATE(0A000) PROGRAM_NYI); #else /* arg 1: path to desired output file */ str output_path = *getArgReference_str(stk, pci, pci->retc); diff --git a/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.sql b/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.sql --- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.sql +++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.sql @@ -68,7 +68,7 @@ select name, query, istable, system, com from tables where tables.system = 1 ) as a - order by name; + order by name, commit_action; select * from ( SELECT 'null' AS TABLE_CAT, @@ -116,4 +116,4 @@ FROM tables, schemas WHERE tables.schema_id = schemas.id AND tables.istable = 0 AND (tables.name = '_tables' or tables.name = '_columns' or tables.name = 'users') -) as tables order by TABLE_NAME; +) as tables order by TABLE_NAME, TABLE_TYPE; diff --git a/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out b/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out --- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out +++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out @@ -69,8 +69,8 @@ Ready. % name, query, istable, system, commit_action, temporary # name % varchar, varchar, boolean, boolean, smallint, tinyint # type % 12, 222, 5, 5, 1, 1 # length +[ "_columns", NULL, true, true, 0, 0 ] [ "_columns", NULL, true, true, 2, 0 ] -[ "_columns", NULL, true, true, 0, 0 ] [ "_tables", NULL, true, true, 0, 0 ] [ "_tables", NULL, true, true, 2, 0 ] [ "args", NULL, true, true, 0, 0 ] @@ -85,8 +85,8 @@ Ready. [ "idxs", NULL, true, true, 2, 0 ] [ "keycolumns", NULL, true, true, 0, 0 ] [ "keycolumns", NULL, true, true, 2, 0 ] +[ "keys", NULL, true, true, 0, 0 ] [ "keys", NULL, true, true, 2, 0 ] -[ "keys", NULL, true, true, 0, 0 ] [ "modules", NULL, true, true, 0, 0 ] [ "privileges", NULL, true, true, 0, 0 ] [ "profile", NULL, true, true, 2, 0 ] @@ -107,8 +107,8 @@ Ready. [ "null", "sys", "db_scens", "SYSTEM TABLE", "", "null", "null", "null", "id", "SYSTEM" ] [ "null", "sys", "db_users", "SYSTEM TABLE", "", "null", "null", "null", "id", "SYSTEM" ] [ "null", "sys", "tables", "SYSTEM TABLE", "", "null", "null", "null", "id", "SYSTEM" ] +[ "null", "sys", "users", "SYSTEM TABLE", "", "null", "null", "null", "id", "SYSTEM" ] [ "null", "sys", "users", "VIEW", "SELECT u.\"t\" AS \"name\", ui.\"fullname\", ui.\"default_schema\" FROM \"sys\".\"db_users\" AS u, \"sys\".\"db_user_info\" AS ui WHERE u.\"h\" = ui.\"id\" AND u.\"h\" NOT IN (SELECT s.\"h\" FROM \"sys\".\"db_scens\" AS s WHERE s.\"t\" NOT LIKE 'sql');", "null", "null", "null", "id", "SYSTEM" ] -[ "null", "sys", "users", "SYSTEM TABLE", "", "null", "null", "null", "id", "SYSTEM" ] # 21:45:34 > # 21:45:34 > Done. diff --git a/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out b/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out --- a/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out +++ b/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out @@ -5,17 +5,17 @@ stdout of test 'use_order_column_first.S # 13:59:55 > mserver5 "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=37694 --set xrpc_port=42627 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. # 13:59:55 > -# MonetDB server v5.16.0, based on kernel v1.34.0 -# Serving database 'mTests_src_test_BugTracker-2009', using 4 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Detected 7.753 GiB (8324386816 bytes) main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:37694/ -# MonetDB/SQL module v2.34.0 loaded - -Ready. +# MonetDB 5 server v11.31.12 (hg id: b48cfee4bf27+) +# This is an unreleased version _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list