From ae74b3aac66b6db7112f70d27e3d604044d951d1 Mon Sep 17 00:00:00 2001 From: amascolo <12738821+amascolo@users.noreply.github.com> Date: Tue, 8 Oct 2024 17:15:27 +0100 Subject: [PATCH] Got rid of new queries with null results --- progs/job/fj/10b.sdql | 41 ------------------ progs/job/fj/2c.sdql | 26 ------------ progs/job/fj/32a.sdql | 38 ----------------- progs/job/gj/10b.sdql | 42 ------------------- progs/job/gj/2c.sdql | 25 ----------- progs/job/gj/32a.sdql | 38 ----------------- .../scala/sdql/backend/CppCodegenTest.scala | 6 --- .../scala/sdql/backend/CppCompileTest.scala | 6 --- src/test/scala/sdql/frontend/ParserTest.scala | 6 --- 9 files changed, 228 deletions(-) delete mode 100644 progs/job/fj/10b.sdql delete mode 100644 progs/job/fj/2c.sdql delete mode 100644 progs/job/fj/32a.sdql delete mode 100644 progs/job/gj/10b.sdql delete mode 100644 progs/job/gj/2c.sdql delete mode 100644 progs/job/gj/32a.sdql diff --git a/progs/job/fj/10b.sdql b/progs/job/fj/10b.sdql deleted file mode 100644 index 11ca2a59..00000000 --- a/progs/job/fj/10b.sdql +++ /dev/null @@ -1,41 +0,0 @@ -let mc = load[ int}, movie_id: @vec {int -> int}, company_id: @vec {int -> int}, company_type_id: @vec {int -> int}, note: @vec {int -> string}, size: int>]("datasets/job/movie_companies.csv") -let t = load[ int}, title: @vec {int -> string}, imdb_index: @vec {int -> string}, kind_id: @vec {int -> int}, production_year: @vec {int -> int}, imdb_id: @vec {int -> string}, phonetic_code: @vec {int -> string}, episode_of_id: @vec {int -> int}, season_nr: @vec {int -> int}, episode_nr: @vec {int -> int}, series_years: @vec {int -> string}, md5sum: @vec {int -> string}, size: int>]("datasets/job/10b/t.csv") -let ct = load[ int}, kind: @vec {int -> string}, size: int>]("datasets/job/company_type.csv") -let cn = load[ int}, name: @vec {int -> string}, country_code: @vec {int -> string}, imdb_id: @vec {int -> string}, name_pcode_nf: @vec {int -> string}, name_pcode_sf: @vec {int -> string}, md5sum: @vec {int -> string}, size: int>]("datasets/job/10b/cn.csv") -let ci = load[ int}, person_id: @vec {int -> int}, movie_id: @vec {int -> int}, person_role_id: @vec {int -> int}, note: @vec {int -> string}, nr_order: @vec {int -> int}, role_id: @vec {int -> int}, size: int>]("datasets/job/10b/ci.csv") -let rt = load[ int}, role: @vec {int -> string}, size: int>]("datasets/job/10b/rt.csv") -let chn = load[ int}, name: @vec {int -> string}, imdb_index: @vec {int -> string}, imdb_id: @vec {int -> int}, name_pcode_cf: @vec {int -> string}, surname_pcode: @vec {int -> string}, md5sum: @vec {int -> string}, size: int>]("datasets/job/char_name.csv") - -let ct_trie0 = sum( <- range(ct.size)) @phmap(ct.size) { unique(ct.id(i)) -> 1 } in -let cn_trie0 = sum( <- range(cn.size)) @phmap(cn.size) { unique(cn.id(i)) -> 1 } in -let t_trie0 = sum( <- range(t.size)) @phmap(t.size) { t.id(i) -> @smallvecdict(4) { i -> 1 } } in -let interm0_trie0 = sum( <- range(mc.size)) - let x0 = mc.company_type_id(mc_off) in - if (x0 ∈ ct_trie0) then - let ct_trie1 = ct_trie0(x0) in - let x1 = mc.company_id(mc_off) in - if (x1 ∈ cn_trie0) then - let cn_trie1 = cn_trie0(x1) in - let x2 = mc.movie_id(mc_off) in - if (x2 ∈ t_trie0) then - let t_trie1 = t_trie0(x2) in - sum( <- t_trie1) - @phmap(promote[min_sum](1000000) + promote[min_sum](mc.size)) { mc.movie_id(mc_off) -> @smallvecdict(4) { -> 1 } } -in - -let rt_trie0 = sum( <- range(rt.size)) @phmap(rt.size) { unique(rt.id(i)) -> 1 } in -let chn_trie0 = sum( <- range(chn.size)) @phmap(chn.size) { chn.id(i) -> @smallvecdict(4) { i -> 1 } } in -sum( <- range(ci.size)) - let x0 = ci.role_id(ci_off) in - if (x0 ∈ rt_trie0) then - let rt_trie1 = rt_trie0(x0) in - let x1 = ci.movie_id(ci_off) in - if (x1 ∈ interm0_trie0) then - let interm0_trie1 = interm0_trie0(x1) in - let x2 = ci.person_role_id(ci_off) in - if (x2 ∈ chn_trie0) then - let chn_trie1 = chn_trie0(x2) in - let mn_interm0 = sum( <- interm0_trie1) promote[min_sum]() in - let mn_chn = sum( <- chn_trie1) promote[min_sum]() in - promote[min_sum]() - diff --git a/progs/job/fj/2c.sdql b/progs/job/fj/2c.sdql deleted file mode 100644 index 951db358..00000000 --- a/progs/job/fj/2c.sdql +++ /dev/null @@ -1,26 +0,0 @@ -let mk = load[ int}, movie_id: @vec {int -> int}, keyword_id: @vec {int -> int}, size: int>]("datasets/job/movie_keyword.csv") -let t = load[ int}, title: @vec {int -> string}, imdb_index: @vec {int -> string}, kind_id: @vec {int -> int}, production_year: @vec {int -> int}, imdb_id: @vec {int -> string}, phonetic_code: @vec {int -> string}, episode_of_id: @vec {int -> int}, season_nr: @vec {int -> int}, episode_nr: @vec {int -> int}, series_years: @vec {int -> string}, md5sum: @vec {int -> string}, size: int>]("datasets/job/title.csv") -let mc = load[ int}, movie_id: @vec {int -> int}, company_id: @vec {int -> int}, company_type_id: @vec {int -> int}, note: @vec {int -> string}, size: int>]("datasets/job/movie_companies.csv") -let k = load[ int}, keyword: @vec {int -> string}, phonetic_code: @vec {int -> string}, size: int>]("datasets/job/2c/k.csv") -let cn = load[ int}, name: @vec {int -> string}, country_code: @vec {int -> string}, imdb_id: @vec {int -> string}, name_pcode_nf: @vec {int -> string}, name_pcode_sf: @vec {int -> string}, md5sum: @vec {int -> string}, size: int>]("datasets/job/2c/cn.csv") - -let k_trie0 = sum( <- range(k.size)) @phmap(k.size) { unique(k.id(i)) -> 1 } in -let t_trie0 = sum( <- range(t.size)) @phmap(t.size) { t.id(i) -> @smallvecdict(4) { i -> 1 } } in -let mc_trie0 = sum( <- range(mc.size)) @phmap(mc.size) { mc.movie_id(i) -> @smallvecdict(4) { i -> 1 } } in -let cn_trie0 = sum( <- range(cn.size)) @phmap(cn.size) { unique(cn.id(i)) -> 1 } in -sum( <- range(mk.size)) - let x0 = mk.keyword_id(mk_off) in - if (x0 ∈ k_trie0) then - let k_trie1 = k_trie0(x0) in - let x1 = mk.movie_id(mk_off) in - if (x1 ∈ t_trie0) then - if (x1 ∈ mc_trie0) then - let t_trie1 = t_trie0(x1) in - let mc_trie1 = mc_trie0(x1) in - sum( <- mc_trie1) - let x2 = mc.company_id(mc_off) in - if (x2 ∈ cn_trie0) then - let cn_trie1 = cn_trie0(x2) in - let mn_t = sum( <- t_trie1) promote[min_sum]() in - promote[min_sum]() - diff --git a/progs/job/fj/32a.sdql b/progs/job/fj/32a.sdql deleted file mode 100644 index 54ca3197..00000000 --- a/progs/job/fj/32a.sdql +++ /dev/null @@ -1,38 +0,0 @@ -let t1 = load[ int}, title: @vec {int -> string}, imdb_index: @vec {int -> string}, kind_id: @vec {int -> int}, production_year: @vec {int -> int}, imdb_id: @vec {int -> string}, phonetic_code: @vec {int -> string}, episode_of_id: @vec {int -> int}, season_nr: @vec {int -> int}, episode_nr: @vec {int -> int}, series_years: @vec {int -> string}, md5sum: @vec {int -> string}, size: int>]("datasets/job/title.csv") -let ml = load[ int}, movie_id: @vec {int -> int}, linked_movie_id: @vec {int -> int}, link_type_id: @vec {int -> int}, size: int>]("datasets/job/movie_link.csv") -let t2 = load[ int}, title: @vec {int -> string}, imdb_index: @vec {int -> string}, kind_id: @vec {int -> int}, production_year: @vec {int -> int}, imdb_id: @vec {int -> string}, phonetic_code: @vec {int -> string}, episode_of_id: @vec {int -> int}, season_nr: @vec {int -> int}, episode_nr: @vec {int -> int}, series_years: @vec {int -> string}, md5sum: @vec {int -> string}, size: int>]("datasets/job/title.csv") -let mk = load[ int}, movie_id: @vec {int -> int}, keyword_id: @vec {int -> int}, size: int>]("datasets/job/movie_keyword.csv") -let lt = load[ int}, link: @vec {int -> string}, size: int>]("datasets/job/link_type.csv") -let k = load[ int}, keyword: @vec {int -> string}, phonetic_code: @vec {int -> string}, size: int>]("datasets/job/32a/k.csv") - -let ml_trie0 = sum( <- range(ml.size)) @phmap(ml.size) { ml.movie_id(i) -> @smallvecdict(4) { i -> 1 } } in -let t2_trie0 = sum( <- range(t2.size)) @phmap(t2.size) { t2.id(i) -> @smallvecdict(4) { i -> 1 } } in -let interm0_trie0 = sum( <- range(t1.size)) - let x0 = t1.id(t1_off) in - if (x0 ∈ ml_trie0) then - let ml_trie1 = ml_trie0(x0) in - sum( <- ml_trie1) - let x1 = ml.linked_movie_id(ml_off) in - if (x1 ∈ t2_trie0) then - let t2_trie1 = t2_trie0(x1) in - sum( <- t2_trie1) - @phmap(promote[min_sum](1000000) + promote[min_sum](t1.size)) { t1.id(t1_off) -> @smallvecdict(4) { -> 1 } } -in - -let lt_trie0 = sum( <- range(lt.size)) @phmap(lt.size) { lt.id(i) -> @smallvecdict(4) { i -> 1 } } in -let k_trie0 = sum( <- range(k.size)) @phmap(k.size) { unique(k.id(i)) -> 1 } in -sum( <- range(mk.size)) - let x0 = mk.movie_id(mk_off) in - if (x0 ∈ interm0_trie0) then - let interm0_trie1 = interm0_trie0(x0) in - sum( <- interm0_trie1) - let x1 = interm0_tuple.col3 in - if (x1 ∈ lt_trie0) then - let lt_trie1 = lt_trie0(x1) in - let x2 = mk.keyword_id(mk_off) in - if (x2 ∈ k_trie0) then - let k_trie1 = k_trie0(x2) in - let mn_interm0 = in - let mn_lt = sum( <- lt_trie1) promote[min_sum]() in - promote[min_sum]() - diff --git a/progs/job/gj/10b.sdql b/progs/job/gj/10b.sdql deleted file mode 100644 index 9cdafb91..00000000 --- a/progs/job/gj/10b.sdql +++ /dev/null @@ -1,42 +0,0 @@ -let mc = load[ int}, movie_id: @vec {int -> int}, company_id: @vec {int -> int}, company_type_id: @vec {int -> int}, note: @vec {int -> string}, size: int>]("datasets/job/movie_companies.csv") -let t = load[ int}, title: @vec {int -> string}, imdb_index: @vec {int -> string}, kind_id: @vec {int -> int}, production_year: @vec {int -> int}, imdb_id: @vec {int -> string}, phonetic_code: @vec {int -> string}, episode_of_id: @vec {int -> int}, season_nr: @vec {int -> int}, episode_nr: @vec {int -> int}, series_years: @vec {int -> string}, md5sum: @vec {int -> string}, size: int>]("datasets/job/10b/t.csv") -let ct = load[ int}, kind: @vec {int -> string}, size: int>]("datasets/job/company_type.csv") -let cn = load[ int}, name: @vec {int -> string}, country_code: @vec {int -> string}, imdb_id: @vec {int -> string}, name_pcode_nf: @vec {int -> string}, name_pcode_sf: @vec {int -> string}, md5sum: @vec {int -> string}, size: int>]("datasets/job/10b/cn.csv") -let ci = load[ int}, person_id: @vec {int -> int}, movie_id: @vec {int -> int}, person_role_id: @vec {int -> int}, note: @vec {int -> string}, nr_order: @vec {int -> int}, role_id: @vec {int -> int}, size: int>]("datasets/job/10b/ci.csv") -let rt = load[ int}, role: @vec {int -> string}, size: int>]("datasets/job/10b/rt.csv") -let chn = load[ int}, name: @vec {int -> string}, imdb_index: @vec {int -> string}, imdb_id: @vec {int -> int}, name_pcode_cf: @vec {int -> string}, surname_pcode: @vec {int -> string}, md5sum: @vec {int -> string}, size: int>]("datasets/job/char_name.csv") - -let mc_trie0 = sum( <- range(mc.size)) { mc.movie_id(i) -> { mc.company_type_id(i) -> { mc.company_id(i) -> @smallvecdict(0) { i -> 1 } } } } in -let t_trie0 = sum( <- range(t.size)) @phmap(t.size) { t.id(i) -> @smallvecdict(4) { i -> 1 } } in -let ct_trie0 = sum( <- range(ct.size)) { ct.id(i) -> 1 } in -let cn_trie0 = sum( <- range(cn.size)) { cn.id(i) -> 1 } in -let interm0_trie0 = sum( <- mc_trie0) - if (x0 ∈ t_trie0) then - let t_trie1 = t_trie0(x0) in - sum( <- mc_trie1) - if (x1 ∈ ct_trie0) then - let ct_trie1 = ct_trie0(x1) in - sum( <- mc_trie2) - if (x2 ∈ cn_trie0) then - let cn_trie1 = cn_trie0(x2) in - sum( <- mc_trie3) - sum( <- t_trie1) - { mc.movie_id(mc_off) -> @smallvecdict(0) { -> 1 } } -in - -let ci_trie0 = sum( <- range(ci.size)) { ci.role_id(i) -> { ci.movie_id(i) -> { ci.person_role_id(i) -> 1 } } } in -let rt_trie0 = sum( <- range(rt.size)) { rt.id(i) -> 1 } in -let chn_trie0 = sum( <- range(chn.size)) @phmap(chn.size) { chn.id(i) -> @smallvecdict(4) { i -> 1 } } in -sum( <- ci_trie0) - if (x0 ∈ rt_trie0) then - let rt_trie1 = rt_trie0(x0) in - sum( <- ci_trie1) - if (x1 ∈ interm0_trie0) then - let interm0_trie1 = interm0_trie0(x1) in - sum( <- ci_trie2) - if (x2 ∈ chn_trie0) then - let chn_trie1 = chn_trie0(x2) in - let mn_interm0 = sum( <- interm0_trie1) promote[min_sum]() in - let mn_chn = sum( <- chn_trie1) promote[min_sum]() in - promote[min_sum]() - diff --git a/progs/job/gj/2c.sdql b/progs/job/gj/2c.sdql deleted file mode 100644 index 76d096a4..00000000 --- a/progs/job/gj/2c.sdql +++ /dev/null @@ -1,25 +0,0 @@ -let mk = load[ int}, movie_id: @vec {int -> int}, keyword_id: @vec {int -> int}, size: int>]("datasets/job/movie_keyword.csv") -let t = load[ int}, title: @vec {int -> string}, imdb_index: @vec {int -> string}, kind_id: @vec {int -> int}, production_year: @vec {int -> int}, imdb_id: @vec {int -> string}, phonetic_code: @vec {int -> string}, episode_of_id: @vec {int -> int}, season_nr: @vec {int -> int}, episode_nr: @vec {int -> int}, series_years: @vec {int -> string}, md5sum: @vec {int -> string}, size: int>]("datasets/job/title.csv") -let mc = load[ int}, movie_id: @vec {int -> int}, company_id: @vec {int -> int}, company_type_id: @vec {int -> int}, note: @vec {int -> string}, size: int>]("datasets/job/movie_companies.csv") -let k = load[ int}, keyword: @vec {int -> string}, phonetic_code: @vec {int -> string}, size: int>]("datasets/job/2c/k.csv") -let cn = load[ int}, name: @vec {int -> string}, country_code: @vec {int -> string}, imdb_id: @vec {int -> string}, name_pcode_nf: @vec {int -> string}, name_pcode_sf: @vec {int -> string}, md5sum: @vec {int -> string}, size: int>]("datasets/job/2c/cn.csv") - -let mk_trie0 = sum( <- range(mk.size)) { mk.movie_id(i) -> { mk.keyword_id(i) -> 1 } } in -let t_trie0 = sum( <- range(t.size)) @phmap(t.size) { t.id(i) -> @smallvecdict(4) { i -> 1 } } in -let mc_trie0 = sum( <- range(mc.size)) { mc.movie_id(i) -> { mc.company_id(i) -> 1 } } in -let k_trie0 = sum( <- range(k.size)) { k.id(i) -> 1 } in -let cn_trie0 = sum( <- range(cn.size)) { cn.id(i) -> 1 } in -sum( <- mk_trie0) - if (x0 ∈ t_trie0) then - if (x0 ∈ mc_trie0) then - let t_trie1 = t_trie0(x0) in - let mc_trie1 = mc_trie0(x0) in - sum( <- mk_trie1) - if (x1 ∈ k_trie0) then - let k_trie1 = k_trie0(x1) in - sum( <- mc_trie1) - if (x2 ∈ cn_trie0) then - let cn_trie1 = cn_trie0(x2) in - let mn_t = sum( <- t_trie1) promote[min_sum]() in - promote[min_sum]() - diff --git a/progs/job/gj/32a.sdql b/progs/job/gj/32a.sdql deleted file mode 100644 index e7842d1e..00000000 --- a/progs/job/gj/32a.sdql +++ /dev/null @@ -1,38 +0,0 @@ -let t1 = load[ int}, title: @vec {int -> string}, imdb_index: @vec {int -> string}, kind_id: @vec {int -> int}, production_year: @vec {int -> int}, imdb_id: @vec {int -> string}, phonetic_code: @vec {int -> string}, episode_of_id: @vec {int -> int}, season_nr: @vec {int -> int}, episode_nr: @vec {int -> int}, series_years: @vec {int -> string}, md5sum: @vec {int -> string}, size: int>]("datasets/job/title.csv") -let ml = load[ int}, movie_id: @vec {int -> int}, linked_movie_id: @vec {int -> int}, link_type_id: @vec {int -> int}, size: int>]("datasets/job/movie_link.csv") -let t2 = load[ int}, title: @vec {int -> string}, imdb_index: @vec {int -> string}, kind_id: @vec {int -> int}, production_year: @vec {int -> int}, imdb_id: @vec {int -> string}, phonetic_code: @vec {int -> string}, episode_of_id: @vec {int -> int}, season_nr: @vec {int -> int}, episode_nr: @vec {int -> int}, series_years: @vec {int -> string}, md5sum: @vec {int -> string}, size: int>]("datasets/job/title.csv") -let mk = load[ int}, movie_id: @vec {int -> int}, keyword_id: @vec {int -> int}, size: int>]("datasets/job/movie_keyword.csv") -let lt = load[ int}, link: @vec {int -> string}, size: int>]("datasets/job/link_type.csv") -let k = load[ int}, keyword: @vec {int -> string}, phonetic_code: @vec {int -> string}, size: int>]("datasets/job/32a/k.csv") - -let t1_trie0 = sum( <- range(t1.size)) @phmap(t1.size) { t1.id(i) -> @smallvecdict(4) { i -> 1 } } in -let ml_trie0 = sum( <- range(ml.size)) { ml.movie_id(i) -> { ml.linked_movie_id(i) -> @smallvecdict(0) { i -> 1 } } } in -let t2_trie0 = sum( <- range(t2.size)) @phmap(t2.size) { t2.id(i) -> @smallvecdict(4) { i -> 1 } } in -let interm0_trie0 = sum( <- t1_trie0) - if (x0 ∈ ml_trie0) then - let ml_trie1 = ml_trie0(x0) in - sum( <- ml_trie1) - if (x1 ∈ t2_trie0) then - let t2_trie1 = t2_trie0(x1) in - sum( <- t1_trie1) - sum( <- ml_trie2) - sum( <- t2_trie1) - { t1.id(t1_off) -> { ml.link_type_id(ml_off) -> @smallvecdict(0) { -> 1 } } } -in - -let mk_trie0 = sum( <- range(mk.size)) { mk.movie_id(i) -> { mk.keyword_id(i) -> 1 } } in -let lt_trie0 = sum( <- range(lt.size)) @phmap(lt.size) { lt.id(i) -> @smallvecdict(4) { i -> 1 } } in -let k_trie0 = sum( <- range(k.size)) { k.id(i) -> 1 } in -sum( <- mk_trie0) - if (x0 ∈ interm0_trie0) then - let interm0_trie1 = interm0_trie0(x0) in - sum( <- interm0_trie1) - if (x1 ∈ lt_trie0) then - let lt_trie1 = lt_trie0(x1) in - sum( <- mk_trie1) - if (x2 ∈ k_trie0) then - let k_trie1 = k_trie0(x2) in - let mn_interm0 = sum( <- interm0_trie2) promote[min_sum]() in - let mn_lt = sum( <- lt_trie1) promote[min_sum]() in - promote[min_sum]() - diff --git a/src/test/scala/sdql/backend/CppCodegenTest.scala b/src/test/scala/sdql/backend/CppCodegenTest.scala index 0ba46d5a..983715db 100644 --- a/src/test/scala/sdql/backend/CppCodegenTest.scala +++ b/src/test/scala/sdql/backend/CppCodegenTest.scala @@ -179,7 +179,6 @@ class CppCodegenTestGJ extends AnyFlatSpec with ParallelTestExecution { it should "codegen GJ 2" in { CodegenHelpers.compilesFile("progs/job/gj/2a.sdql") CodegenHelpers.compilesFile("progs/job/gj/2b.sdql") - CodegenHelpers.compilesFile("progs/job/gj/2c.sdql") CodegenHelpers.compilesFile("progs/job/gj/2d.sdql") } it should "codegen GJ 3" in { @@ -222,7 +221,6 @@ class CppCodegenTestGJ extends AnyFlatSpec with ParallelTestExecution { } it should "codegen GJ 10" in { CodegenHelpers.compilesFile("progs/job/gj/10a.sdql") - CodegenHelpers.compilesFile("progs/job/gj/10b.sdql") CodegenHelpers.compilesFile("progs/job/gj/10c.sdql") } it should "codegen GJ 11" in { @@ -339,7 +337,6 @@ class CppCodegenTestGJ extends AnyFlatSpec with ParallelTestExecution { CodegenHelpers.compilesFile("progs/job/gj/31c.sdql") } it should "codegen GJ 32" in { - CodegenHelpers.compilesFile("progs/job/gj/32a.sdql") CodegenHelpers.compilesFile("progs/job/gj/32b.sdql") } it should "codegen GJ 33" in { @@ -359,7 +356,6 @@ class CppCodegenTestFJ extends AnyFlatSpec with ParallelTestExecution { it should "codegen FJ 2" in { CodegenHelpers.compilesFile("progs/job/fj/2a.sdql") CodegenHelpers.compilesFile("progs/job/fj/2b.sdql") - CodegenHelpers.compilesFile("progs/job/fj/2c.sdql") CodegenHelpers.compilesFile("progs/job/fj/2d.sdql") } it should "codegen FJ 3" in { @@ -402,7 +398,6 @@ class CppCodegenTestFJ extends AnyFlatSpec with ParallelTestExecution { } it should "codegen FJ 10" in { CodegenHelpers.compilesFile("progs/job/fj/10a.sdql") - CodegenHelpers.compilesFile("progs/job/fj/10b.sdql") CodegenHelpers.compilesFile("progs/job/fj/10c.sdql") } it should "codegen FJ 11" in { @@ -519,7 +514,6 @@ class CppCodegenTestFJ extends AnyFlatSpec with ParallelTestExecution { CodegenHelpers.compilesFile("progs/job/fj/31c.sdql") } it should "codegen FJ 32" in { - CodegenHelpers.compilesFile("progs/job/fj/32a.sdql") CodegenHelpers.compilesFile("progs/job/fj/32b.sdql") } it should "codegen FJ 33" in { diff --git a/src/test/scala/sdql/backend/CppCompileTest.scala b/src/test/scala/sdql/backend/CppCompileTest.scala index f0a7acce..92f1acd3 100644 --- a/src/test/scala/sdql/backend/CppCompileTest.scala +++ b/src/test/scala/sdql/backend/CppCompileTest.scala @@ -180,7 +180,6 @@ class CppCompileTestGJ extends AnyFlatSpec with ParallelTestExecution { CompileHelpers.assertOutputs("progs/job/gj/2a.sdql", "results/job/2a.result") CompileHelpers.assertOutputs("progs/job/gj/2b.sdql", "results/job/2b.result") - CompileHelpers.assertOutputs("progs/job/gj/2c.sdql", "results/job/2c.result") CompileHelpers.assertOutputs("progs/job/gj/2d.sdql", "results/job/2d.result") CompileHelpers.assertOutputs("progs/job/gj/3a.sdql", "results/job/3a.result") @@ -205,7 +204,6 @@ class CppCompileTestGJ extends AnyFlatSpec with ParallelTestExecution { CompileHelpers.assertOutputs("progs/job/gj/9d.sdql", "results/job/9d.result") CompileHelpers.assertOutputs("progs/job/gj/10a.sdql", "results/job/10a.result") - CompileHelpers.assertOutputs("progs/job/gj/10b.sdql", "results/job/10b.result") CompileHelpers.assertOutputs("progs/job/gj/10c.sdql", "results/job/10c.result") CompileHelpers.assertOutputs("progs/job/gj/11a.sdql", "results/job/11a.result") @@ -323,7 +321,6 @@ class CppCompileTestGJ extends AnyFlatSpec with ParallelTestExecution { CompileHelpers.assertOutputs("progs/job/gj/31b.sdql", "results/job/31b.result") CompileHelpers.assertOutputs("progs/job/gj/31c.sdql", "results/job/31c.result") - CompileHelpers.assertOutputs("progs/job/gj/32a.sdql", "results/job/32a.result") CompileHelpers.assertOutputs("progs/job/gj/32b.sdql", "results/job/32b.result") CompileHelpers.assertOutputs("progs/job/gj/33a.sdql", "results/job/33a.result") @@ -348,7 +345,6 @@ class CppCompileTestFJ extends AnyFlatSpec with ParallelTestExecution { CompileHelpers.assertOutputs("progs/job/fj/2a.sdql", "results/job/2a.result") CompileHelpers.assertOutputs("progs/job/fj/2b.sdql", "results/job/2b.result") - CompileHelpers.assertOutputs("progs/job/fj/2c.sdql", "results/job/2c.result") CompileHelpers.assertOutputs("progs/job/fj/2d.sdql", "results/job/2d.result") CompileHelpers.assertOutputs("progs/job/fj/3a.sdql", "results/job/3a.result") @@ -373,7 +369,6 @@ class CppCompileTestFJ extends AnyFlatSpec with ParallelTestExecution { CompileHelpers.assertOutputs("progs/job/fj/9d.sdql", "results/job/9d.result") CompileHelpers.assertOutputs("progs/job/fj/10a.sdql", "results/job/10a.result") - CompileHelpers.assertOutputs("progs/job/fj/10b.sdql", "results/job/10b.result") CompileHelpers.assertOutputs("progs/job/fj/10c.sdql", "results/job/10c.result") CompileHelpers.assertOutputs("progs/job/fj/11a.sdql", "results/job/11a.result") @@ -491,7 +486,6 @@ class CppCompileTestFJ extends AnyFlatSpec with ParallelTestExecution { CompileHelpers.assertOutputs("progs/job/fj/31b.sdql", "results/job/31b.result") CompileHelpers.assertOutputs("progs/job/fj/31c.sdql", "results/job/31c.result") - CompileHelpers.assertOutputs("progs/job/fj/32a.sdql", "results/job/32a.result") CompileHelpers.assertOutputs("progs/job/fj/32b.sdql", "results/job/32b.result") CompileHelpers.assertOutputs("progs/job/fj/33a.sdql", "results/job/33a.result") diff --git a/src/test/scala/sdql/frontend/ParserTest.scala b/src/test/scala/sdql/frontend/ParserTest.scala index 7e744d56..9051ee55 100644 --- a/src/test/scala/sdql/frontend/ParserTest.scala +++ b/src/test/scala/sdql/frontend/ParserTest.scala @@ -210,7 +210,6 @@ class ParserTest extends AnyFlatSpec with Matchers { SourceCode.fromFile("progs/job/gj/2a.sdql") SourceCode.fromFile("progs/job/gj/2b.sdql") - SourceCode.fromFile("progs/job/gj/2c.sdql") SourceCode.fromFile("progs/job/gj/2d.sdql") SourceCode.fromFile("progs/job/gj/3a.sdql") @@ -245,7 +244,6 @@ class ParserTest extends AnyFlatSpec with Matchers { SourceCode.fromFile("progs/job/gj/9d.sdql") SourceCode.fromFile("progs/job/gj/10a.sdql") - SourceCode.fromFile("progs/job/gj/10b.sdql") SourceCode.fromFile("progs/job/gj/10c.sdql") SourceCode.fromFile("progs/job/gj/11a.sdql") @@ -340,7 +338,6 @@ class ParserTest extends AnyFlatSpec with Matchers { SourceCode.fromFile("progs/job/gj/31b.sdql") SourceCode.fromFile("progs/job/gj/31c.sdql") - SourceCode.fromFile("progs/job/gj/32a.sdql") SourceCode.fromFile("progs/job/gj/32b.sdql") SourceCode.fromFile("progs/job/gj/33a.sdql") @@ -356,7 +353,6 @@ class ParserTest extends AnyFlatSpec with Matchers { SourceCode.fromFile("progs/job/fj/2a.sdql") SourceCode.fromFile("progs/job/fj/2b.sdql") - SourceCode.fromFile("progs/job/fj/2c.sdql") SourceCode.fromFile("progs/job/fj/2d.sdql") SourceCode.fromFile("progs/job/fj/3a.sdql") @@ -391,7 +387,6 @@ class ParserTest extends AnyFlatSpec with Matchers { SourceCode.fromFile("progs/job/fj/9d.sdql") SourceCode.fromFile("progs/job/fj/10a.sdql") - SourceCode.fromFile("progs/job/fj/10b.sdql") SourceCode.fromFile("progs/job/fj/10c.sdql") SourceCode.fromFile("progs/job/fj/11a.sdql") @@ -486,7 +481,6 @@ class ParserTest extends AnyFlatSpec with Matchers { SourceCode.fromFile("progs/job/fj/31b.sdql") SourceCode.fromFile("progs/job/fj/31c.sdql") - SourceCode.fromFile("progs/job/fj/32a.sdql") SourceCode.fromFile("progs/job/fj/32b.sdql") SourceCode.fromFile("progs/job/fj/33a.sdql")