Changeset: b1e15e90cb13 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/b1e15e90cb13 Added Files: monetdb5/modules/atoms/Tests/contains_join.test monetdb5/modules/atoms/Tests/ends_with_join.test monetdb5/modules/atoms/Tests/starts_with_join.test Modified Files: monetdb5/modules/atoms/Tests/All monetdb5/modules/atoms/Tests/starts_ends_contains_joins.test Branch: sw_ew_c_sorting Log Message:
Split testing of starts ends with and contains and improve test cases diffs (truncated from 491 to 300 lines): diff --git a/monetdb5/modules/atoms/Tests/All b/monetdb5/modules/atoms/Tests/All --- a/monetdb5/modules/atoms/Tests/All +++ b/monetdb5/modules/atoms/Tests/All @@ -38,6 +38,8 @@ startswith endswith contains HAVE_ICONV?asciify -starts_ends_contains_joins +starts_with_join +ends_with_join +contains_join ts_and_tstz_to_str_bug diff --git a/monetdb5/modules/atoms/Tests/contains_join.test b/monetdb5/modules/atoms/Tests/contains_join.test new file mode 100644 --- /dev/null +++ b/monetdb5/modules/atoms/Tests/contains_join.test @@ -0,0 +1,99 @@ +statement ok +CREATE TABLE foo(f string) + +statement ok +CREATE TABLE bar(b string) + +-- TRIGGERS NESTED LOOP JOIN +statement ok +INSERT INTO foo VALUES ('LEFTJOHN'),('TRASH1'),('TRASH2'),(NULL),(NULL),('TRASH3'),('TRASH4'),('RIGHTJANE'),('rightrobert'),('uptim'),(NULL),('leftlex'),('LEFTJOE'),(NULL),('TRASH5'),('TRASH6'),('TRASH7'),('TRASH8'),('TRASH9'),('TRASH10') + +statement ok +INSERT INTO bar VALUES ('left'),('right'),('up') + +query TT +SELECT * FROM foo,bar WHERE [foo.f] contains [bar.b, false] order by f +---- +leftlex +left +rightrobert +right +uptim +up + +query TT +SELECT * FROM foo,bar WHERE [foo.f] contains [bar.b, true] order by f +---- +LEFTJOE +left +LEFTJOHN +left +RIGHTJANE +right +leftlex +left +rightrobert +right +uptim +up + +statement ok +TRUNCATE TABLE foo + +statement ok +TRUNCATE TABLE bar + +-- TRIGGERS SORT BASED JOIN +statement ok +INSERT INTO foo VALUES ('Καλή'),('Frühlingsrauschen'),('Das grüne Monokel'),('Καλή Χρονιά'),('Olá, bom dia'),('Risør'),('Wenn der Ölhahn versiegt'),('Punch-Out!! WITH LYRICS'),('Super Mario Bros. 3 WITH LYRICS'),('Δεν καταλαβαίνω'),('Adeus, boa tarde') + +statement ok +INSERT INTO bar VALUES ('Δεν'),('Frühling'),(NULL),('Καλή'),('kαλή'),(NULL),('Olá'),('Das grüne'),('Punch-Out!!'),('Adeus'),('früh') + +query TT +SELECT * FROM foo,bar WHERE [foo.f] contains [bar.b] ORDER BY f +---- +Adeus, boa tarde +Adeus +Das gr@ne Monokel +Das gr@ne +Fr@hlingsrauschen +Fr@hling +Ol@, bom dia +Ol@ +Punch-Out!! WITH LYRICS +Punch-Out!! +@@@ @@@@@@@@@@@ +@@@ +@@@@ +@@@@ +@@@@ @@@@@@ +@@@@ + +query TT +SELECT * FROM foo,bar WHERE [foo.f] contains [bar.b, true] ORDER BY f +---- +Adeus, boa tarde +Adeus +Das gr@ne Monokel +Das gr@ne +Fr@hlingsrauschen +Fr@hling +Fr@hlingsrauschen +fr@h +Ol@, bom dia +Ol@ +Punch-Out!! WITH LYRICS +Punch-Out!! +@@@ @@@@@@@@@@@ +@@@ +@@@@ +@@@@ +@@@@ @@@@@@ +@@@@ + +statement ok +drop table foo + +statement ok +drop table bar diff --git a/monetdb5/modules/atoms/Tests/ends_with_join.test b/monetdb5/modules/atoms/Tests/ends_with_join.test new file mode 100644 --- /dev/null +++ b/monetdb5/modules/atoms/Tests/ends_with_join.test @@ -0,0 +1,101 @@ +statement ok +CREATE TABLE foo(f string) + +statement ok +CREATE TABLE bar(b string) + +-- TRIGGERS NESTED LOOP JOIN +statement ok +INSERT INTO foo VALUES ('JOHNLEFT'),('TRASH1'),('TRASH2'),(NULL),(NULL),('TRASH3'),('TRASH4'),('JANERIGHT'),('robertright'),('timup'),(NULL),('lexleft'),('JOELEFT'),(NULL),('TRASH5'),('TRASH6'),('TRASH7'),('TRASH8'),('TRASH9'),('TRASH10') + +statement ok +INSERT INTO bar VALUES ('left'),('right'),('up') + +query TT +SELECT * FROM foo,bar WHERE [foo.f] endswith [bar.b, false] order by f +---- +lexleft +left +robertright +right +timup +up + +query TT +SELECT * FROM foo,bar WHERE [foo.f] endswith [bar.b, true] order by f +---- +JANERIGHT +right +JOELEFT +left +JOHNLEFT +left +lexleft +left +robertright +right +timup +up + +statement ok +TRUNCATE TABLE foo + +statement ok +TRUNCATE TABLE bar + +-- TRIGGERS SORT BASED JOIN +statement ok +INSERT INTO foo VALUES ('Καλή'),('srauschenFrühling'),('Monokel Das grüne'),('Χρονιά Καλή'),('bom dia, Olá'),('Risør'),('Wenn der Ölhahn versiegt'),('Punch-Out!! WITH LYRICS'),('Super Mario Bros. 3 WITH LYRICS'),('καταλαβαίνω Δεν'),('boa tarde, Adeus') + +statement ok +INSERT INTO bar VALUES ('Δεν'),('Frühling'),(NULL),('Καλή'),('kαλή'),(NULL),('olá'),('Das grüne'),('WITH LYRICS'),('adeus'),('früh'),('sør') + +query TT +SELECT * FROM foo,bar WHERE [foo.f] endswith [bar.b, false] ORDER BY f +---- +Monokel Das gr@ne +Das gr@ne +Punch-Out!! WITH LYRICS +WITH LYRICS +Ris@r +s@r +Super Mario Bros. 3 WITH LYRICS +WITH LYRICS +srauschenFr@hling +Fr@hling +@@@@ +@@@@ +@@@@@@ @@@@ +@@@@ +@@@@@@@@@@@ @@@ +@@@ + +query TT +SELECT * FROM foo,bar WHERE [foo.f] endswith [bar.b, true] ORDER BY f +---- +Monokel Das gr@ne +Das gr@ne +Punch-Out!! WITH LYRICS +WITH LYRICS +Ris@r +s@r +Super Mario Bros. 3 WITH LYRICS +WITH LYRICS +boa tarde, Adeus +adeus +bom dia, Ol@ +ol@ +srauschenFr@hling +Fr@hling +@@@@ +@@@@ +@@@@@@ @@@@ +@@@@ +@@@@@@@@@@@ @@@ +@@@ + +statement ok +drop table foo + +statement ok +drop table bar diff --git a/monetdb5/modules/atoms/Tests/starts_ends_contains_joins.test b/monetdb5/modules/atoms/Tests/starts_ends_contains_joins.test --- a/monetdb5/modules/atoms/Tests/starts_ends_contains_joins.test +++ b/monetdb5/modules/atoms/Tests/starts_ends_contains_joins.test @@ -1,160 +0,0 @@ -statement ok -create table foo(x string) - -statement ok -create table bar(x string) - -statement ok -insert into foo values ('leftjohn'),('rightjane'),('rightrobert'),('uptim'),('leftlex'),('leftjoe') - -statement ok -insert into bar values ('left'),('right'),('up'),('down') - -query TT rowsort -select * from foo,bar where [foo.x] startswith [bar.x, false] ----- -leftjoe -left -leftjohn -left -leftlex -left -rightjane -right -rightrobert -right -uptim -up - -statement ok -drop table foo - -statement ok -drop table bar - -statement ok -create table foo(x string) - -statement ok -create table bar(x string) - -statement ok -insert into foo values ('johnleft'),('janeright'),('robertright'),('timup'),('lexleft'),('joeleft') - -statement ok -insert into bar values ('left'),('right'),('up'),('down') - -query TT rowsort -select * from foo,bar where [foo.x] endswith [bar.x, false] ----- -janeright -right -joeleft -left -johnleft -left -lexleft -left -robertright -right -timup -up - -statement ok -drop table foo - -statement ok -drop table bar - -statement ok -create table foo(x string) - -statement ok -create table bar(x string) _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org