This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit c65fa869af8af4f1964d0b88fd6376c220477785 Author: Dmitry Lychagin <dmitry.lycha...@couchbase.com> AuthorDate: Fri Feb 5 19:26:50 2021 -0800 [NO ISSUE][COMP] Additional plan sanity check - user model changes: no - storage format changes: no - interface changes: no Details: - Add plan sanity check to ensure that operator's produced variables are disjoint from its used variables Change-Id: Id4800f2fff66c9ace89889ab89a6b7f442cd7a0e Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/9847 Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Dmitry Lychagin <dmitry.lycha...@couchbase.com> Reviewed-by: Ali Alsuliman <ali.al.solai...@gmail.com> --- .../inverted-index-join-noeqjoin/ngram-edit-distance-inline.sqlpp | 2 ++ .../inverted-index-join-noeqjoin/ngram-fuzzyeq-edit-distance.sqlpp | 2 +- .../inverted-index-join-noeqjoin/olist-edit-distance-inline.sqlpp | 2 ++ ...leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp | 2 ++ ...touterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp | 2 +- .../queries/inverted-index-join/ngram-edit-distance-check_02.sqlpp | 2 ++ .../queries/inverted-index-join/ngram-edit-distance-check_03.sqlpp | 2 ++ .../queries/inverted-index-join/ngram-edit-distance-check_04.sqlpp | 2 ++ .../queries/inverted-index-join/ngram-edit-distance_02.sqlpp | 2 ++ .../queries/inverted-index-join/ngram-edit-distance_03.sqlpp | 2 ++ .../queries/inverted-index-join/ngram-edit-distance_04.sqlpp | 2 ++ .../queries/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp | 2 +- .../queries/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp | 2 +- .../queries/inverted-index-join/olist-edit-distance-check_02.sqlpp | 2 ++ .../queries/inverted-index-join/olist-edit-distance-check_03.sqlpp | 2 ++ .../queries/inverted-index-join/olist-edit-distance-check_04.sqlpp | 2 ++ .../queries/inverted-index-join/olist-edit-distance_02.sqlpp | 2 ++ .../queries/inverted-index-join/olist-edit-distance_03.sqlpp | 2 ++ .../queries/inverted-index-join/olist-edit-distance_04.sqlpp | 2 ++ .../queries/inverted-index-join/olist-fuzzyeq-edit-distance_02.sqlpp | 2 +- .../queries/inverted-index-join/olist-fuzzyeq-edit-distance_03.sqlpp | 2 +- ...touterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp | 1 + ...touterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp | 1 + ...touterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp | 1 + .../probe-pidx-with-join-invidx-sidx2.3.query.sqlpp | 1 + .../probe-pidx-with-join-invidx-sidx2.3.query.sqlpp | 1 + .../probe-pidx-with-join-invidx-sidx2.3.query.sqlpp | 1 + .../probe-pidx-with-join-invidx-sidx2.3.query.sqlpp | 1 + .../probe-pidx-with-join-invidx-sidx2.3.ast | 1 + .../probe-pidx-with-join-invidx-sidx2.3.ast | 1 + .../probe-pidx-with-join-invidx-sidx2.3.ast | 1 + .../probe-pidx-with-join-invidx-sidx2.3.ast | 1 + .../hyracks/algebricks/core/algebra/plan/PlanStructureVerifier.java | 3 +-- 33 files changed, 48 insertions(+), 8 deletions(-) diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline.sqlpp index c29de43..7c71c3e 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-edit-distance-inline.sqlpp @@ -44,6 +44,8 @@ create dataset DBLP(DBLPType) primary key id; create index ngram_index on DBLP (authors) type ngram (3); write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-edit-distance-inline.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'aauthors':a.authors,'bauthors':b.authors,'ed':ed} from DBLP as a, DBLP as b diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-fuzzyeq-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-fuzzyeq-edit-distance.sqlpp index 1234824..30ea450 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-fuzzyeq-edit-distance.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-fuzzyeq-edit-distance.sqlpp @@ -55,8 +55,8 @@ create index ngram_index on CSX (authors) type ngram (3); write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-fuzzyeq-edit-distance.adm"; set `simfunction` `edit-distance`; - set `simthreshold` `3`; +set `compiler.internal.sanitycheck` "false"; select element {'aauthors':a.authors,'bauthors':b.authors} from DBLP as a, diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline.sqlpp index 40c8c5f..0638b0c 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-edit-distance-inline.sqlpp @@ -56,6 +56,8 @@ create dataset Customers(CustomerType) primary key cid; create index interests_index on Customers (interests) type keyword; write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-edit-distance-inline.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'ainterests':a.interests,'binterests':b.interests,'ed':ed} from Customers as a, Customers as b diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp index 8c2869f..157d4e4 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp @@ -66,6 +66,8 @@ create index msgNgramIx on TweetMessages (`message-text`) type ngram (3); create index topicKeywordIx on TweetMessages (`referred-topics`) type keyword; write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'tweet':{'id':t1.tweetid,'topics':t1.`message-text`},'similar-tweets':( select element {'id':t2.tweetid,'topics':t2.`message-text`} from TweetMessages as t2 diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp index 2c5ac71..691bcca 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp @@ -28,7 +28,6 @@ create dataverse test; use test; - create type test.TwitterUserType as closed { `screen-name` : string, @@ -67,6 +66,7 @@ create index topicKeywordIx on TweetMessages (`referred-topics`) type keyword; write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm"; set `compiler.sort.parallel` "true"; +set `compiler.internal.sanitycheck` "false"; select element {'tweet':{'id':t1.tweetid,'topics':t1.`message-text`},'similar-tweets':( select element {'id':t2.tweetid,'topics':t2.`message-text`} diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_02.sqlpp index a6ade32..6549c0f 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_02.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_02.sqlpp @@ -53,6 +53,8 @@ create dataset CSX(CSXType) primary key id; create index ngram_index on CSX (authors) type ngram (3); write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_02.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'arec':a,'brec':b} from DBLP as a, CSX as b diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_03.sqlpp index ed8d6b6..274a4c0 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_03.sqlpp @@ -42,6 +42,8 @@ create dataset DBLP(DBLPType) primary key id; create index ngram_index on DBLP (authors) type ngram (3); write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_03.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'arec':a,'brec':b} from DBLP as a, DBLP as b diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_04.sqlpp index 7a24772..2e7e6da 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_04.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_04.sqlpp @@ -43,6 +43,8 @@ create dataset DBLP(DBLPType) primary key id; create index ngram_index on DBLP (authors) type ngram (3); write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_04.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'arec':a,'brec':b,'ed':ed[1]} from DBLP as a, DBLP as b diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_02.sqlpp index 950a058..246d50e 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_02.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_02.sqlpp @@ -53,6 +53,8 @@ create dataset CSX(CSXType) primary key id; create index ngram_index on CSX (authors) type ngram (3); write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_02.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'arec':a,'brec':b} from DBLP as a, CSX as b diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_03.sqlpp index dc8ca3c..a12ab9a 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_03.sqlpp @@ -42,6 +42,8 @@ create dataset DBLP(DBLPType) primary key id; create index ngram_index on DBLP (authors) type ngram (3); write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_03.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'arec':a,'brec':b} from DBLP as a, DBLP as b diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_04.sqlpp index 0284ff4..fe2cde2 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_04.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_04.sqlpp @@ -43,6 +43,8 @@ create dataset DBLP(DBLPType) primary key id; create index ngram_index on DBLP (authors) type ngram (3); write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_03.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'arec':a,'brec':b,'ed':ed} from DBLP as a, DBLP as b diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp index 2021605..522a4f8 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp @@ -54,8 +54,8 @@ create index ngram_index on CSX (authors) type ngram (3); write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm"; set `simfunction` `edit-distance`; - set `simthreshold` `3`; +set `compiler.internal.sanitycheck` "false"; select element {'arec':a,'brec':b} from DBLP as a, diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp index d900a72..c3a34b3 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp @@ -43,8 +43,8 @@ create index ngram_index on DBLP (authors) type ngram (3); write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_03.adm"; set `simfunction` `edit-distance`; - set `simthreshold` `3`; +set `compiler.internal.sanitycheck` "false"; select element {'arec':a,'brec':b} from DBLP as a, diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_02.sqlpp index f7e6047..1a9cd82 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_02.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_02.sqlpp @@ -56,6 +56,8 @@ create dataset Customers2(CustomerType) primary key cid; create index interests_index on Customers2 (interests) type keyword; write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance-check_02.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'arec':a,'brec':b} from Customers as a, Customers2 as b diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_03.sqlpp index 6435990..78645c7 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_03.sqlpp @@ -54,6 +54,8 @@ create dataset Customers(CustomerType) primary key cid; create index interests_index on Customers (interests) type keyword; write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance-check_03.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'arec':a,'brec':b} from Customers as a, Customers as b diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_04.sqlpp index 9f14368..cffc18b 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_04.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_04.sqlpp @@ -55,6 +55,8 @@ create dataset Customers(CustomerType) primary key cid; create index interests_index on Customers (interests) type keyword; write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance-check_04.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'arec':a,'brec':b,'ed':ed[1]} from Customers as a, Customers as b diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_02.sqlpp index 5ebb518..d66efdf 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_02.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_02.sqlpp @@ -56,6 +56,8 @@ create dataset Customers2(CustomerType) primary key cid; create index interests_index on Customers2 (interests) type keyword; write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance_02.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'arec':a,'brec':b} from Customers as a, Customers2 as b diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_03.sqlpp index ac7e6ba..f8cd85b 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_03.sqlpp @@ -54,6 +54,8 @@ create dataset Customers(CustomerType) primary key cid; create index interests_index on Customers (interests) type keyword; write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance_03.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'arec':a,'brec':b} from Customers as a, Customers as b diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_04.sqlpp index 0655746..4a78cee 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_04.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_04.sqlpp @@ -55,6 +55,8 @@ create dataset Customers(CustomerType) primary key cid; create index interests_index on Customers (interests) type keyword; write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance_04.adm"; +set `compiler.internal.sanitycheck` "false"; + select element {'arec':a,'brec':b,'ed':ed} from Customers as a, Customers as b diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-fuzzyeq-edit-distance_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-fuzzyeq-edit-distance_02.sqlpp index cd3d74f..3fe35d6 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-fuzzyeq-edit-distance_02.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-fuzzyeq-edit-distance_02.sqlpp @@ -57,8 +57,8 @@ create index interests_index on Customers2 (interests) type keyword; write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_02.adm"; set `simfunction` `edit-distance`; - set `simthreshold` `3`; +set `compiler.internal.sanitycheck` "false"; select element {'arec':a,'brec':b} from Customers as a, diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-fuzzyeq-edit-distance_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-fuzzyeq-edit-distance_03.sqlpp index a184602..8db10eeb 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-fuzzyeq-edit-distance_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-fuzzyeq-edit-distance_03.sqlpp @@ -55,8 +55,8 @@ create index interests_index on Customers (interests) type keyword; write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_03.adm"; set `simfunction` `edit-distance`; - set `simthreshold` `3`; +set `compiler.internal.sanitycheck` "false"; select element {'arec':a,'brec':b} from Customers as a, diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp index bfd2bf4..e61386b 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp @@ -62,6 +62,7 @@ create index msgNgramIx on TweetMessages (nested.`message-text`) type ngram (3 write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm"; set `compiler.sort.parallel` "true"; +set `compiler.internal.sanitycheck` "false"; select element {'tweet':{'id':t1.nested.tweetid,'topics':t1.nested.`message-text`},'similar-tweets':( select element {'id':t2.nested.tweetid,'topics':t2.nested.`message-text`} diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp index 0a55178..3a5e14f 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp @@ -61,6 +61,7 @@ create index msgNgramIx on TweetMessages (nested.`message-text`:string?) type write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm"; set `compiler.sort.parallel` "true"; +set `compiler.internal.sanitycheck` "false"; select element {'tweet':{'id':t1.nested.tweetid,'topics':t1.nested.`message-text`},'similar-tweets':( select element {'id':t2.nested.tweetid,'topics':t2.nested.`message-text`} diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp index 2d9b15b..d81fcd9 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01_ps.sqlpp @@ -56,6 +56,7 @@ create index msgNgramIx on TweetMessages (`message-text`:string?) type ngram ( write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm"; set `compiler.sort.parallel` "true"; +set `compiler.internal.sanitycheck` "false"; select element {'tweet':{'id':t1.tweetid,'topics':t1.`message-text`},'similar-tweets':( select element {'id':t2.tweetid,'topics':t2.`message-text`} diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp index 6503f24..e58d44c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp @@ -25,6 +25,7 @@ use test; +set `compiler.internal.sanitycheck` "false"; select element {'tweet':{'id':t1.tweetid,'topics':t1.`message-text`},'similar-tweets':( select element {'id':t2.tweetid,'topics':t2.`message-text`} diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp index a98f152..2a5f1c7 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp @@ -25,6 +25,7 @@ use test; +set `compiler.internal.sanitycheck` "false"; select element {'tweet':{'id':t1.nested.tweetid,'topics':t1.nested.`message-text`},'similar-tweets':( select element {'id':t2.nested.tweetid,'topics':t2.nested.`message-text`} diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp index e5d44e8..0a214d7 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp @@ -25,6 +25,7 @@ use test; +set `compiler.internal.sanitycheck` "false"; select element {'tweet':{'id':t1.tweetid,'topics':t1.`message-text`},'similar-tweets':( select element {'id':t2.nested.tweetid,'topics':t2.nested.`message-text`} diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp index f441956..b249bfd 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.query.sqlpp @@ -25,6 +25,7 @@ use test; +set `compiler.internal.sanitycheck` "false"; select element {'tweet':{'id':t1.tweetid,'topics':t1.`message-text`},'similar-tweets':( select element {'id':t2.tweetid,'topics':t2.`message-text`} diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast index 86e3c17..e224a60 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast @@ -1,4 +1,5 @@ DataverseUse test +Set compiler.internal.sanitycheck=false Query: SELECT ELEMENT [ RecordConstructor [ diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast index 5abf3e3..f2162b0 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast @@ -1,4 +1,5 @@ DataverseUse test +Set compiler.internal.sanitycheck=false Query: SELECT ELEMENT [ RecordConstructor [ diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast index e0496a1..c55d33e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast @@ -1,4 +1,5 @@ DataverseUse test +Set compiler.internal.sanitycheck=false Query: SELECT ELEMENT [ RecordConstructor [ diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast index d4bad51..f0d7535 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast @@ -1,4 +1,5 @@ DataverseUse test +Set compiler.internal.sanitycheck=false Query: SELECT ELEMENT [ RecordConstructor [ diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/plan/PlanStructureVerifier.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/plan/PlanStructureVerifier.java index 80a949a..eeac87e 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/plan/PlanStructureVerifier.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/plan/PlanStructureVerifier.java @@ -213,8 +213,7 @@ public final class PlanStructureVerifier { VariableUtilities.getUsedVariables(op, tmpVarSet1); if (!tmpVarSet1.isEmpty()) { ensureUsedVarsAreDefined(op, tmpVarSet1); - //TODO(dmitry): disabled for now - //ensureProducedVarsDisjointFromUsedVars(op, tmpVarSet1); + ensureProducedVarsDisjointFromUsedVars(op, tmpVarSet1); } }