diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/aql/AQLTestCase.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/aql/AQLTestCase.java
deleted file mode 100644
index cfd5373..0000000
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/aql/AQLTestCase.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.asterix.test.aql;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.asterix.common.config.GlobalConfig;
-import org.apache.asterix.common.exceptions.AsterixException;
-import org.apache.asterix.lang.aql.parser.AQLParserFactory;
-import org.apache.asterix.lang.aql.parser.ParseException;
-import org.apache.asterix.lang.common.base.IParser;
-import org.apache.asterix.lang.common.base.IParserFactory;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
-import org.junit.Test;
-
-import junit.framework.TestCase;
-
-public class AQLTestCase extends TestCase {
-
-    private final File queryFile;
-    private final IParserFactory aqlParserFactory = new AQLParserFactory();
-
-    AQLTestCase(File queryFile) {
-        super("testAQL");
-        this.queryFile = queryFile;
-    }
-
-    @Test
-    public void testAQL() throws UnsupportedEncodingException, FileNotFoundException, ParseException, AsterixException,
-            AlgebricksException {
-        Reader reader = new BufferedReader(new InputStreamReader(new FileInputStream(queryFile), "UTF-8"));
-        IParser parser = aqlParserFactory.createParser(reader);
-        GlobalConfig.ASTERIX_LOGGER.info(queryFile.toString());
-        try {
-            parser.parse();
-        } catch (Exception e) {
-            GlobalConfig.ASTERIX_LOGGER.warn("Failed while testing file " + reader);
-            StringWriter sw = new StringWriter();
-            PrintWriter writer = new PrintWriter(sw);
-            e.printStackTrace(writer);
-            GlobalConfig.ASTERIX_LOGGER.warn(sw.toString());
-            throw new ParseException("Parsing " + queryFile.toString());
-        }
-
-    }
-}
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/aql/AQLTestSuite.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/aql/AQLTestSuite.java
deleted file mode 100644
index 4daa7eb..0000000
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/aql/AQLTestSuite.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.asterix.test.aql;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.asterix.lang.aql.parser.ParseException;
-import org.apache.commons.lang3.StringUtils;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AQLTestSuite extends TestSuite {
-    private static String AQLTS_PATH = StringUtils
-            .join(new String[] { "src", "test", "resources", "parserts", "queries" + File.separator }, File.separator);
-    private static String AQLTS_SQL_LIKE_PATH = StringUtils.join(
-            new String[] { "src", "test", "resources", "parserts", "queries-sql-like" + File.separator },
-            File.separator);
-
-    public static Test suite() throws ParseException, UnsupportedEncodingException, FileNotFoundException {
-        File testData = new File(AQLTS_PATH);
-        File[] queries = testData.listFiles();
-        TestSuite testSuite = new TestSuite();
-        for (File file : queries) {
-            if (file.isFile()) {
-                testSuite.addTest(new AQLTestCase(file));
-            }
-        }
-        testData = new File(AQLTS_SQL_LIKE_PATH);
-        queries = testData.listFiles();
-        for (File file : queries) {
-            if (file.isFile()) {
-                testSuite.addTest(new AQLTestCase(file));
-            }
-        }
-        return testSuite;
-    }
-
-    public static void main(String args[]) throws Throwable {
-        junit.textui.TestRunner.run(AQLTestSuite.suite());
-    }
-}
diff --git a/asterixdb/asterix-app/src/test/resources/dapd/denorm_user_event.aql b/asterixdb/asterix-app/src/test/resources/dapd/denorm_user_event.aql
deleted file mode 100644
index fad1243..0000000
--- a/asterixdb/asterix-app/src/test/resources/dapd/denorm_user_event.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse events;
-
-declare type UserType as {
-  u_name: string,
-  interests: {{string}},
-  member_of: {{
-    {
-      sig_name: string,
-      chap_name: string
-    }
-  }} 
-}
-
-declare type EventType as {
-  e_name: string,
-  organizer: string,
-  sponsoring_sigs: [ 
-    {
-      sig_name: string,
-      chap_name: string
-    }
-  ],
-  interest_keywords: {{string}},
-  start_time: datetime,
-  end_time: datetime
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Users(UserType) primary key u_name with {"node-group":{"name":"group1"}};
-declare dataset Events(EventType) primary key e_name with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/denorm_user_event.adm";
-
-for $u in dataset('Users')
-let $events := 
-  for $e in dataset('Events')
-  where $e.organizer = $u.u_name
-  order by $e.start_time asc
-  return $e
-return { "user": $u, "org_events": $events }  
diff --git a/asterixdb/asterix-app/src/test/resources/dapd/q1.aql b/asterixdb/asterix-app/src/test/resources/dapd/q1.aql
deleted file mode 100644
index b30641d..0000000
--- a/asterixdb/asterix-app/src/test/resources/dapd/q1.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse events;
-
-declare type UserType as open {
-  name: string,
-  email: string,
-  interests: {{string}},
-  address: AddressType,
-  member_of: {{
-    {
-      sig_name: string,
-      chapter_name: string,
-      member_since: date
-    }
-  }}
-}
-
-declare type AddressType as closed {
-  street: string,
-  city: string,
-  zip: string,
-  latlong: point
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset User(UserType) primary key name with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/q1.adm";
-
-for $user in dataset('User')
-where some $i in $user.interests
-  satisfies $i = "movies"
-return {"name": $user.name}
diff --git a/asterixdb/asterix-app/src/test/resources/dapd/q2.aql b/asterixdb/asterix-app/src/test/resources/dapd/q2.aql
deleted file mode 100644
index 0b8ea6c..0000000
--- a/asterixdb/asterix-app/src/test/resources/dapd/q2.aql
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse events;
-
-declare type EventType as closed {
-  event_id: int64,
-  name: string,
-  location: AddressType ?,
-  organizers: {{
-   {
-     name: string
-   }
-  }},
-  sponsoring_sigs: [
-    {
-      sig_id: int32,
-      chapter_name: string
-    }
-  ],
-  interest_keywords: {{string}},
-  price: double?,
-  start_time: datetime,
-  end_time: datetime
-}
-
-declare type AddressType as closed {
-  street: string,
-  city: string,
-  zip: string,
-  latlong: point
-}
-
-declare nodegroup group1 on asterix_nc1;
-
-/*
-declare dataset Event(EventType)
-  splits asterix_nc1:"/home/nicnic/Work/Asterix/adg/event.adm";
-*/
-
-drop dataset Event;
-declare dataset Event(EventType)
-  primary key event_id with {"node-group":{"name":"group1"}};
-
-load dataset Event
-using localfs
-(("path"="asterix_nc1:///home/nicnic/Work/Asterix/adg/event.adm"),("format"="adm"));
-
-write output to asterix_nc1:"/tmp/dapd_q2.adm";
-
-for $event in dataset('Event')
-for $sponsor in $event.sponsoring_sigs
-let $es := { "event": $event, "sponsor": $sponsor }
-group by $sig_id := $sponsor.sig_id with $es
-let $sig_sponsorship_count := count($es)
-let $by_chapter :=
-   for $e in $es
-   group by $chapter_name := $e.sponsor.chapter_name with $e
-   return { "chapter_name": $chapter_name, "escount" : count($e) }
-order by $sig_sponsorship_count desc
-limit 5
-return { "sig_id": $sig_id, "total_count": $sig_sponsorship_count, "chapter_breakdown": $by_chapter }
-
diff --git a/asterixdb/asterix-app/src/test/resources/demo0216/01-load-dblp-large.aql b/asterixdb/asterix-app/src/test/resources/demo0216/01-load-dblp-large.aql
deleted file mode 100644
index 24d7a77..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0216/01-load-dblp-large.aql
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
- id: int32,
- dblpid: string,
- title: string,
- authors: string,
- misc: string
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03,
-rainbow-04, rainbow-05;
-
-declare dataset DBLP(DBLPType)
- primary key id on group1;
-
-load dataset DBLP 
-using localfs
-(("path"="rainbow-01:///home/hyracks/demo-data/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":") pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/demo0216/02-fuzzy-select.aql b/asterixdb/asterix-app/src/test/resources/demo0216/02-fuzzy-select.aql
deleted file mode 100644
index 7320578..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0216/02-fuzzy-select.aql
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
- id: int32,
- dblpid: string,
- title: string,
- authors: string,
- misc: string
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03,
-rainbow-04, rainbow-05;
-
-declare dataset DBLP(DBLPType)
- partitioned by key id on group1;
-
-write output to rainbow-01:"/home/hyracks/out.txt";
-
-for $x in dataset('DBLP')
-let $ed := edit-distance($x.authors, "Michael Carey")
-where $ed <= 3
-order by $ed, $x.authors
-return { "edit-distance":$ed, "authors":$x.authors, "title":$x.title }
diff --git a/asterixdb/asterix-app/src/test/resources/demo0216/03-load-dblp-small.aql b/asterixdb/asterix-app/src/test/resources/demo0216/03-load-dblp-small.aql
deleted file mode 100644
index 20509aa..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0216/03-load-dblp-small.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
- id: int32,
- dblpid: string,
- title: string,
- authors: string,
- misc: string
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03,
-rainbow-04, rainbow-05;
-
-declare dataset DBLPSmall(DBLPType)
- primary key id on group1;
-
-load dataset DBLPSmall 
-using localfs
-(("path"="rainbow-01:///home/hyracks/demo-data/dblp-small-id.txt"),("format"="delimited-text"),("delimiter"=":") pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/demo0216/110-self-join-dblp.aql b/asterixdb/asterix-app/src/test/resources/demo0216/110-self-join-dblp.aql
deleted file mode 100644
index 7171e43..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0216/110-self-join-dblp.aql
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
- id: int32,
- dblpid: string,
- title: string,
- authors: string,
- misc: string
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03,
-rainbow-04, rainbow-05;
-
-declare dataset DBLP(DBLPType) 
-  primary key id on group1;
-
-write output to rainbow-01:"/home/hyracks/dblp-self-join.adm";
-
-//
-// -- - Stage 3 - --
-//
-for $ridpair in 
-    //
-    // -- - Stage 2 - --
-    //
-    for $paperR in dataset('DBLP')
-    let $tokensR :=
-        for $word in counthashed-word-tokens($paperR.title)
-        for $token at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $paper in dataset('DBLP')
-            for $word in counthashed-word-tokens($paper.title)
-            group by $item := $word with $paper
-            order by count($paper)
-            return $item
-        where $word = $token
-        order by $i
-        return $i
-    for $prefix_tokenR in subset-collection(
-                                $tokensR, 
-                                0,
-                                prefix-len(
-                                    len($tokensR), 'Jaccard', .8))
-
-    for $paperS in dataset('DBLP')
-    let $tokensS :=
-        for $word in counthashed-word-tokens($paperS.title)
-        for $token at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $paper in dataset('DBLP')
-            for $word in counthashed-word-tokens($paper.title)
-            group by $item := $word with $paper
-            order by count($paper)
-            return $item
-        where $word = $token
-        order by $i
-        return $i
-    for $prefix_tokenS in subset-collection(
-                                $tokensS, 
-                                0,
-                                prefix-len(
-                                    len($tokensS), 'Jaccard', .8))
-
-    where $prefix_tokenR = $prefix_tokenS
-
-    let $sim := similarity(
-                    len(counthashed-word-tokens($paperR.title)),
-                    $tokensR,
-                    len(counthashed-word-tokens($paperS.title)),
-                    $tokensS,
-                    $prefix_tokenR,
-                    'Jaccard',
-                    .8)
-    where $sim >= .8 // and $paperR.id != $paperS.id
-    group by $idR := $paperR.id, $idS := $paperS.id with $sim
-    where $idR < $idS
-    return {'idR': $idR, 'idS': $idS, 'sim': $sim[0]}
-
-for $paperR in dataset('DBLP')
-for $paperS in dataset('DBLP')
-where $ridpair.idR = $paperR.id and $ridpair.idS = $paperS.id
-return {'R': {'dblpid': $paperR.dblpid, 'title': $paperR.title}, 
-        'S': {'dblpid': $paperS.dblpid, 'title': $paperS.title}, 
-        'sim': $ridpair.sim}
diff --git a/asterixdb/asterix-app/src/test/resources/demo0216/120-self-join-dblp-small.aql b/asterixdb/asterix-app/src/test/resources/demo0216/120-self-join-dblp-small.aql
deleted file mode 100644
index 5785872..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0216/120-self-join-dblp-small.aql
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
- id: int32,
- dblpid: string,
- title: string,
- authors: string,
- misc: string
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03,
-rainbow-04, rainbow-05;
-
-declare dataset DBLPSmall(DBLPType) 
-  primary key id on group1;
-
-write output to rainbow-01:"/home/hyracks/small-dblp-self-join.adm";
-
-//
-// -- - Stage 3 - --
-//
-for $ridpair in 
-    //
-    // -- - Stage 2 - --
-    //
-    for $paperR in dataset('DBLPSmall')
-    let $tokensR :=
-        for $word in counthashed-word-tokens($paperR.title)
-        for $token at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $paper in dataset('DBLPSmall')
-            for $word in counthashed-word-tokens($paper.title)
-            group by $item := $word with $paper
-            order by count($paper)
-            return $item
-        where $word = $token
-        order by $i
-        return $i
-    for $prefix_tokenR in subset-collection(
-                                $tokensR, 
-                                0,
-                                prefix-len(
-                                    len($tokensR), 'Jaccard', .8))
-
-    for $paperS in dataset('DBLPSmall')
-    let $tokensS :=
-        for $word in counthashed-word-tokens($paperS.title)
-        for $token at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $paper in dataset('DBLPSmall')
-            for $word in counthashed-word-tokens($paper.title)
-            group by $item := $word with $paper
-            order by count($paper)
-            return $item
-        where $word = $token
-        order by $i
-        return $i
-    for $prefix_tokenS in subset-collection(
-                                $tokensS, 
-                                0,
-                                prefix-len(
-                                    len($tokensS), 'Jaccard', .8))
-
-    where $prefix_tokenR = $prefix_tokenS
-
-    let $sim := similarity(
-                    len(counthashed-word-tokens($paperR.title)),
-                    $tokensR,
-                    len(counthashed-word-tokens($paperS.title)),
-                    $tokensS,
-                    $prefix_tokenR,
-                    'Jaccard',
-                    .8)
-    where $sim >= .8 // and $paperR.id != $paperS.id
-    group by $idR := $paperR.id, $idS := $paperS.id with $sim
-    where $idR < $idS
-    return {'idR': $idR, 'idS': $idS, 'sim': $sim[0]}
-
-for $paperR in dataset('DBLPSmall')
-for $paperS in dataset('DBLPSmall')
-where $ridpair.idR = $paperR.id and $ridpair.idS = $paperS.id
-return {'R': {'dblpid': $paperR.dblpid, 'title': $paperR.title}, 
-        'S': {'dblpid': $paperS.dblpid, 'title': $paperS.title}, 
-        'sim': $ridpair.sim}
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/local/create-index.aql b/asterixdb/asterix-app/src/test/resources/demo0927/local/create-index.aql
deleted file mode 100644
index d14e965..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0927/local/create-index.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo0927;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1,asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-
-create index NameIndex on Customers(name);
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql b/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql
deleted file mode 100644
index 88dc20f..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo0927;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/mycustomers.adm";
-
-for $c in dataset('Customers')
-where $c.age < 21 
-//  return $c
-return { "custname":$c.name, "custage": $c.age }
-
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql b/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql
deleted file mode 100644
index a281084..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo0927;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/mycustomers.adm";
-
-for $c in dataset('Customers')
-where $c.name = 'Noreen Doe' 
-  return $c
-// return { "custname":$c.name }
-
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-scan.aql b/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-scan.aql
deleted file mode 100644
index 47905c5..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-scan.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo0927;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-
-write output to asterix_nc1:"/tmp/mycustomers.adm";
-
-for $c in dataset('Customers')
-return $c
-// return { "custname":$c.name }
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/local/declare-index.aql b/asterixdb/asterix-app/src/test/resources/demo0927/local/declare-index.aql
deleted file mode 100644
index df13f9b..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0927/local/declare-index.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo0927;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1,asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-
-declare index NameIndex on Customers(name);
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql b/asterixdb/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql
deleted file mode 100644
index 1c66f44..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo0927;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-
-declare type OrderType as closed {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/custorder.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where $c.cid = $o.cid
-return {"cust":$c.name, "ordertot":$o.total} 
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/local/load-cust.aql b/asterixdb/asterix-app/src/test/resources/demo0927/local/load-cust.aql
deleted file mode 100644
index 0588b7f..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0927/local/load-cust.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo0927;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-
-load dataset Customers 
-using localfs
-(("path"="asterix_nc1:///tmp/customerData.adm"),("format"="json")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/local/load-ord.aql b/asterixdb/asterix-app/src/test/resources/demo0927/local/load-ord.aql
deleted file mode 100644
index a828b6e..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0927/local/load-ord.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo0927;
-
-declare type OrderType as closed {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Orders(OrderType)
-  primary key oid on group1;
-
-load dataset Orders from asterix_nc1:"/tmp/orderData.json";
-using localfs
-(("path"="asterix_nc1:///tmp/orderData.json"),("format"="adm")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/01-load-cust.aql b/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/01-load-cust.aql
deleted file mode 100644
index e295730..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/01-load-cust.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo0927;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-load dataset Customers from rainbow-01:"/home/hyracks/demo-data/customerData.json";
-//  delete dataset Customers;
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/02-filter-cust.aql b/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/02-filter-cust.aql
deleted file mode 100644
index ad3a3c4..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/02-filter-cust.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo0927;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-write output to rainbow-01:"/home/hyracks/mycustomers.adm";
-
-for $c in dataset('Customers')
-// where $c.age < 21
-where $c.name = 'Noreen Doe' 
-  return $c
-// return { "custname":$c.name }
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/03-load-ord.aql b/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/03-load-ord.aql
deleted file mode 100644
index 299e2b5..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/03-load-ord.aql
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo0927;
-
-declare type OrderType as closed {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-load dataset Orders from rainbow-01:"/home/hyracks/demo-data/orderData.json";
-// delete dataset Orders;
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/04-join-custord.aql b/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/04-join-custord.aql
deleted file mode 100644
index abe03f4..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/04-join-custord.aql
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo0927;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-
-declare type OrderType as closed {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-write output to rainbow-01:"/home/hyracks/custorder.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where $c.cid = $o.cid and $c.age < 21
-return {"cust":$c.name, "custage": $c.age, "ordertot":$o.total} 
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql b/asterixdb/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
deleted file mode 100644
index 78fb98a..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-load dataset Customers 
-using localfs
-(("path"="asterix_nc1:///tmp/customerData.adm"),("format"="json")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql b/asterixdb/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql
deleted file mode 100644
index 1127abe..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/mycustomers.adm";
-
-for $c in dataset('Customers')
-where $c.age < 21
-// where $c.name = 'Noreen Doe' 
-  return { "custname":$c.name }
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql b/asterixdb/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
deleted file mode 100644
index 9dc69135b..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-load dataset Orders 
-using localfs
-(("path"="asterix_nc1:///tmp/orderData.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql b/asterixdb/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql
deleted file mode 100644
index 8033a5d..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/custorder.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where $c.cid = $o.cid and $c.age < 21
-return {"cust":$c.name, "custage": $c.age, "ordertot":$o.total} 
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/01-load-cust.aql b/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/01-load-cust.aql
deleted file mode 100644
index 8858936..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/01-load-cust.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-load dataset Customers from rainbow-01:"/home/onose/demo-data/customerData.adm";
-// drop dataset Customers;
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/02-filter-cust.aql b/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/02-filter-cust.aql
deleted file mode 100644
index dc46203..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/02-filter-cust.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-
-write output to rainbow-01:"/home/onose/hyracks-rainbow/results/mycustomers.adm";
-
-for $c in dataset('Customers')
-// where $c.age < 21
-where $c.name = 'Noreen Doe' 
-  return $c
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/03-load-ord.aql b/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/03-load-ord.aql
deleted file mode 100644
index 2fb2740..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/03-load-ord.aql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-load dataset Orders from rainbow-01:"/home/onose/demo-data/orderData.adm";
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/04-join-custord.aql b/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/04-join-custord.aql
deleted file mode 100644
index 0fd3e75..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/04-join-custord.aql
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-write output to rainbow-01:"/home/onose/hyracks-rainbow/results/custorder.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where $c.cid = $o.cid and $c.age < 21
-return {"cust":$c.name, "custage": $c.age, "ordertot":$o.total} 
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/05-count-custord.aql b/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/05-count-custord.aql
deleted file mode 100644
index db3c485..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/05-count-custord.aql
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-write output to rainbow-01:"/home/onose/hyracks-rainbow/results/custorder.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where $c.cid = $o.cid and $o.total > 70
-group by $age := $c.age with $c
-return {"custage": $age, "count":count($c)} 
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
deleted file mode 100644
index 0665520..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-load dataset Customers 
-using localfs
-(("path"="asterix_nc1:///tmp/customer.adm"),("format"="adm")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql
deleted file mode 100644
index c252b5a..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/02-filter-cust.adm";
-
-for $c in dataset('Customers')
-where $c.age < 21 
-return { "custname":$c.name, "custage": $c.age }
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql
deleted file mode 100644
index a4a6c4d..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/03-count-cust-age.adm";
-
-count(
-for $c in dataset('Customers')
-where not(is-null($c.age)) 
-return $c
-)
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
deleted file mode 100644
index a9f6c6d..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-load dataset Orders 
-using localfs
-(("path"="asterix_nc1:///tmp/orders.adm"),("format"="adm"));
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql
deleted file mode 100644
index 722ea81..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/05-count-param1.adm";
-
-count(
-for $o in dataset('Orders')
-where not(is-null($o.param1)) 
-return $o
-)
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql
deleted file mode 100644
index 67be87d..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/06-count-custord.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where $c.cid = $o.cid and $o.total > 70
-group by $age := $c.age with $o
-return {"custage": $age, "count-orders":count($o)}
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
deleted file mode 100644
index 94aafe0..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type DBLPType as open {
- id: int32,
- dblpid: string,
- title: string,
- authors: string,
- misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType)
- primary key id with {"node-group":{"name":"group1"}};
-
-load dataset DBLP 
-using localfs
-(("path"="asterix_nc1:///tmp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":"));
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql
deleted file mode 100644
index e0f0234..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type DBLPType as open {
- id: int32,
- dblpid: string,
- title: string,
- authors: string,
- misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType)
- primary key id with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/102-fuzzy-select.adm";
-
-for $x in dataset('DBLP')
-let $ed := edit-distance($x.authors, "Michael Carey")
-where $ed <= 3
-order by $ed, $x.authors
-return { "edit-distance":$ed, "authors":$x.authors, "title":$x.title }
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql
deleted file mode 100644
index 8d953b8..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type DBLPType as open {
- id: int32,
- dblpid: string,
- title: string,
- authors: string,
- misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/110-self-join-dblp.adm";
-
-set simthreshold '.5f';
-
-for $k in (
-  for $i in dataset('DBLP')
-  for $j in dataset('DBLP')
-  where $i.title ~= $j.title
-  order by $i.id, $j.id
-  return {'dblp1': $i, 'dblp2': $j}
-) 
-where $k.dblp1.id < $k.dblp2.id
-return $k
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/01-load-cust.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/01-load-cust.aql
deleted file mode 100644
index a8be367..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/01-load-cust.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-
-load dataset Customers from rainbow-01:"/home/onose/demo-data/semistructured/customer.adm";
-
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/02-filter-cust.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/02-filter-cust.aql
deleted file mode 100644
index 2154c97..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/02-filter-cust.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-write output to rainbow-01:"/home/onose/hyracks-rainbow/results/02-filter-cust.adm";
-
-for $c in dataset('Customers')
-where $c.age < 21 
-return { "custname":$c.name, "custage": $c.age }
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/03-count-cust-age.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/03-count-cust-age.aql
deleted file mode 100644
index 67f95cc..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/03-count-cust-age.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-
-write output to rainbow-01:"/home/onose/hyracks-rainbow/results/03-count-cust-age.adm";
-
-count(
-for $c in dataset('Customers')
-where not(is-null($c.age)) 
-return $c
-)
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/04-load-ord.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/04-load-ord.aql
deleted file mode 100644
index f9a11d6..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/04-load-ord.aql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Orders(OrderType)
-  primary key oid on group1;
-
-load dataset Orders from rainbow-01:"/home/onose/demo-data/semistructured/orders.adm";
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/05-count-param1.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/05-count-param1.aql
deleted file mode 100644
index 22d8b7b..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/05-count-param1.aql
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-write output to rainbow-01:"/home/onose/hyracks-rainbow/results/05-count-param1.adm";
-
-count(
-for $o in dataset('Orders')
-where not(is-null($o.param1)) 
-return $o
-)
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/06-count-custord.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/06-count-custord.aql
deleted file mode 100644
index 37361b7..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/06-count-custord.aql
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-declare dataset Orders(OrderType)
-  primary key oid on group1;
-
-write output to rainbow-01:"/home/onose/hyracks-rainbow/results/06-count-custord.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where $c.cid = $o.cid and $o.total > 70
-group by $age := $c.age with $o
-return {"custage": $age, "count-orders":count($o)}
- 
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/101-load-dblp.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/101-load-dblp.aql
deleted file mode 100644
index d1efd80..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/101-load-dblp.aql
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type DBLPType as open {
- id: int32,
- dblpid: string,
- title: string,
- authors: string,
- misc: string
-}
-
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset DBLP(DBLPType)
- primary key id with {"node-group":{"name":"group1"}};
-
-load dataset DBLP from
-  rainbow-01:"/home/onose/demo-data/dblp-id.txt" delimited by ":";
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/102-fuzzy-select.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/102-fuzzy-select.aql
deleted file mode 100644
index 5c8e146..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/102-fuzzy-select.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type DBLPType as open {
- id: int32,
- dblpid: string,
- title: string,
- authors: string,
- misc: string
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset DBLP(DBLPType)
- primary key id on group1;
-
-write output to rainbow-01:"/home/onose/hyracks-rainbow/results/102-fuzzy-select.adm";
-
-for $x in dataset('DBLP')
-let $ed := edit-distance($x.authors, "Michael Carey")
-where $ed <= 3
-order by $ed, $x.authors
-return { "edit-distance":$ed, "authors":$x.authors, "title":$x.title }
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/110-self-join-dblp.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/110-self-join-dblp.aql
deleted file mode 100644
index 2aceeeb..0000000
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/110-self-join-dblp.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo_aql;
-
-declare type DBLPType as open {
- id: int32,
- dblpid: string,
- title: string,
- authors: string,
- misc: string
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
-
-declare dataset DBLP(DBLPType) 
-  primary key id on group1;
-
-write output to rainbow-01:"/home/onose/hyracks-rainbow/results/110-self-join-dblp.adm";
-
-set simthreshold '.8f';
-
-for $k in (
-  for $i in dataset('DBLP')
-  for $j in dataset('DBLP')
-  where $i.title ~= $j.title
-  order by $i.id, $j.id
-  return {'dblp1': $i, 'dblp2': $j}
-) 
-where $k.dblp1.id < $k.dblp2.id
-return $k
diff --git a/asterixdb/asterix-app/src/test/resources/dmlts/results/enlist-scan-cust.adm b/asterixdb/asterix-app/src/test/resources/dmlts/results/enlist-scan-cust.adm
deleted file mode 100644
index 57e1c98..0000000
--- a/asterixdb/asterix-app/src/test/resources/dmlts/results/enlist-scan-cust.adm
+++ /dev/null
@@ -1,10 +0,0 @@
-{ "cid": 59, "name": "Lance Pracht", "age": 27, "address": { "number": 342, "street": "Washington St.", "city": "Mountain View" }, "lastorder": { "oid": 59, "total": 26.975239f } }
-{ "cid": 74, "name": "Myrtice Cubias", "age": 11, "address": { "number": 9048, "street": "Park St.", "city": "San Jose" }, "lastorder": { "oid": 74, "total": 47.675938f } }
-{ "cid": 76, "name": "Marvella Loud", "age": 72, "address": { "number": 6988, "street": "7th St.", "city": "Sunnyvale" }, "lastorder": { "oid": 76, "total": 12.811708f } }
-{ "cid": 530, "name": "Clint Coil", "age": 79, "address": { "number": 4491, "street": "7th St.", "city": "San Jose" }, "lastorder": { "oid": 530, "total": 7.5879574f } }
-{ "cid": 586, "name": "Tamie Pollara", "age": 89, "address": { "number": 7424, "street": "Oak St.", "city": "Sunnyvale" }, "lastorder": { "oid": 586, "total": 22.163845f } }
-{ "cid": 758, "name": "Curt Savage", "age": 81, "address": { "number": 5651, "street": "Main St.", "city": "Seattle" }, "lastorder": { "oid": 758, "total": 45.33596f } }
-{ "cid": 775, "name": "Jodi Rotruck", "age": 69, "address": { "number": 8389, "street": "Hill St.", "city": "Mountain View" }, "lastorder": { "oid": 775, "total": 38.618626f } }
-{ "cid": 939, "name": "Larry Gothier", "age": 34, "address": { "number": 1786, "street": "Park St.", "city": "Mountain View" }, "lastorder": { "oid": 939, "total": 33.49055f } }
-{ "cid": 953, "name": "Elias Leonardo", "age": 62, "address": { "number": 7831, "street": "Main St.", "city": "San Jose" }, "lastorder": { "oid": 953, "total": 79.990875f } }
-{ "cid": 996, "name": "Obdulia Dicosmo", "age": 14, "address": { "number": 9237, "street": "Cedar St.", "city": "Los Angeles" }, "lastorder": { "oid": 996, "total": 94.23889f } }
diff --git a/asterixdb/asterix-app/src/test/resources/dmlts/scripts/enlist-scan-cust.aql b/asterixdb/asterix-app/src/test/resources/dmlts/scripts/enlist-scan-cust.aql
deleted file mode 100644
index d8eb051..0000000
--- a/asterixdb/asterix-app/src/test/resources/dmlts/scripts/enlist-scan-cust.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse custord if exists;
-create dataverse custord;
-use dataverse custord;
-
-
-create type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-create type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-enlist dataset Customers;
-
-write output to asterix_nc1:"dmltest/enlist-scan-cust.adm";
-
-for $c in dataset('Customers')
-order by $c.cid
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql b/asterixdb/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql
deleted file mode 100644
index 7c27cb3..0000000
--- a/asterixdb/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse custord if exists;
-create dataverse custord;
-use dataverse custord;
-
-
-create type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-create type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-load dataset Customers 
-using localfs
-(("path"="asterix_nc1://data/custord-tiny/customer-tiny.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx-small.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx-small.aql
deleted file mode 100644
index 97e8c79..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx-small.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type CSXType as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset CSXSmall(CSXType)
-  primary key id on group1;
-
-load dataset CSXSmall
-using localfs
-(("path"="asterix_nc1://data/fuzzyjoin/pub-small/csx-small-id.txt"),("format"="delimited-text"),("delimiter"=":"),("quote"="\u0000")) pre-sorted;
-
-
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx.aql
deleted file mode 100644
index a5a1e1f..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type CSXType as open {
-  id: int32, 
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset CSX(CSXType) 
-  primary key id on group1;
-
-load dataset CSX 
-using localfs
-(("path"="asterix_nc1://data/fuzzyjoin/pub/csx-id.txt"),("format"="delimited-text"),("delimiter"=":")) pre-sorted;
-
-
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-dblp.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-dblp.aql
deleted file mode 100644
index e35290a..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-dblp.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1; 
-
-declare dataset DBLP(DBLPType) 
-  primary key id on group1;
-
-load dataset DBLP 
-using localfs
-(("path"="asterix_nc1://data/fuzzyjoin/dblp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":")) pre-sorted;
-
-
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/20-drop-dblp.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/20-drop-dblp.aql
deleted file mode 100644
index 0f3cfe1..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/20-drop-dblp.aql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id on group1;
-
-drop dataset DBLP;
-
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/30-filter-dblp.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/30-filter-dblp.aql
deleted file mode 100644
index 5eb85d6..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/30-filter-dblp.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/amerix.adm";
-
-for $dblp in dataset('DBLP')
-where $dblp.id = 1
-return $dblp
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/40-self-join-dblp.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/40-self-join-dblp.aql
deleted file mode 100644
index add0e93..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/40-self-join-dblp.aql
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1; 
-
-declare dataset DBLP(DBLPType) 
-  primary key id on group1;
-
-write output to asterix_nc1:"/tmp/amerix.adm";
-
-//
-// -- - Stage 3 - --
-//
-for $ridpair in 
-    //
-    // -- - Stage 2 - --
-    //
-    for $paperR in dataset('DBLP')
-    let $tokensR :=
-        for $word in counthashed-word-tokens($paperR.title)
-        for $token at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $paper in dataset('DBLP')
-            for $word in counthashed-word-tokens($paper.title)
-            group by $item := $word with $paper
-            order by count($paper)
-            return $item
-        where $word = $token
-        order by $i
-        return $i
-    for $prefix_tokenR in subset-collection(
-                                $tokensR, 
-                                0,
-                                prefix-len(
-                                    len($tokensR), 'Jaccard', .8))
-
-    for $paperS in dataset('DBLP')
-    let $tokensS :=
-        for $word in counthashed-word-tokens($paperS.title)
-        for $token at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $paper in dataset('DBLP')
-            for $word in counthashed-word-tokens($paper.title)
-            group by $item := $word with $paper
-            order by count($paper)
-            return $item
-        where $word = $token
-        order by $i
-        return $i
-    for $prefix_tokenS in subset-collection(
-                                $tokensS, 
-                                0,
-                                prefix-len(
-                                    len($tokensS), 'Jaccard', .8))
-
-    where $prefix_tokenR = $prefix_tokenS
-
-    let $sim := similarity(
-                    len(counthashed-word-tokens($paperR.title)),
-                    $tokensR,
-                    len(counthashed-word-tokens($paperS.title)),
-                    $tokensS,
-                    $prefix_tokenR,
-                    'Jaccard',
-                    .8)
-    where $sim >= .8 and $paperR.id < $paperS.id
-    group by $idR := $paperR.id, $idS := $paperS.id with $sim
-    return {'idR': $idR, 'idS': $idS, 'sim': $sim[0]}
-
-for $paperR in dataset('DBLP')
-for $paperS in dataset('DBLP')
-where $ridpair.idR = $paperR.id and $ridpair.idS = $paperS.id
-return {'R': {'dblpid': $paperR.dblpid, 'title': $paperR.title}, 
-        'S': {'dblpid': $paperS.dblpid, 'title': $paperS.title}, 
-        'sim': $ridpair.sim}
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/50-self-join-dblp.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/50-self-join-dblp.aql
deleted file mode 100644
index 191bd61..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/50-self-join-dblp.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id on group1;
-
-write output to asterix_nc1:"/tmp/amerix.adm";
-
-for   $paperR in dataset('DBLP')
-for   $paperS in dataset('DBLP')
-where $paperR.title ~= $paperS.title
-return { 'R': $paperR,
-         'S': $paperS }
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/line.py b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/line.py
deleted file mode 100644
index 9fa678d..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/line.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-m = 0
-for line in open('/data/fuzzyjoin/pub/csx-id.txt'):
-    l = len(line)
-    if (l > m):
-        m = l
-print m
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/000-1-char-at.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/000-1-char-at.aql
deleted file mode 100644
index 114f9c9..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/000-1-char-at.aql
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/dblp.adm";
-
-for $paperR in dataset('DBLP')
-where $paperR.id = 1
-for $authorR in word-tokens($paperR.authors)
-for $paperS in dataset('DBLP')
-for $authorS in word-tokens($paperS.authors)
-where $authorR = $authorS
-return {'R': {'dblpid': $paperR.dblpid, 'authors': $paperR.authors}, 
-        'S': {'dblpid': $paperS.dblpid, 'authors': $paperS.authors}}
-
-/*
-java.lang.RuntimeException: java.lang.IllegalArgumentException
-        at org.apache.hyracks.control.nc.runtime.OperatorRunnable.run(OperatorRunnable.java:70)
-        at org.apache.hyracks.control.nc.Stagelet$1.run(Stagelet.java:120)
-        at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
-        at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
-        at java.lang.Thread.run(Thread.java:619)
-Caused by: java.lang.IllegalArgumentException
-        at org.apache.hyracks.dataflow.common.data.util.StringUtils.charAt(StringUtils.java:62)
-        at org.apache.asterix.jobgen.data.tagged.AqlSchemalessPrinterFactory$1.print(AqlSchemalessPrinterFactory.java:103)
-        at org.apache.asterix.jobgen.data.tagged.AqlSchemalessPrinterFactory$1.print(AqlSchemalessPrinterFactory.java:112)
-        at org.apache.aqua.runtime.operators.std.PrinterRuntime.printTuple(PrinterRuntime.java:90)
-        at org.apache.aqua.runtime.operators.std.PrinterRuntime.nextFrame(PrinterRuntime.java:58)
-        at org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor$2.nextFrame(AquaMetaOperatorDescriptor.java:123)
-        at org.apache.hyracks.control.nc.runtime.OperatorRunnable.run(OperatorRunnable.java:62)
-        ... 4 more
-*/
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/010-load.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/010-load.aql
deleted file mode 100644
index 1f2995b..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/010-load.aql
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id on group1;
-
-load dataset DBLP 
-using localfs
-(("path"="asterix_nc1:///asterix/asterix-app/data/dblp-small/dblp-small-id.txt"),("format"="delimited-text"),("delimiter=":")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/020-drop.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/020-drop.aql
deleted file mode 100644
index 407f455..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/020-drop.aql
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id on group1;
-
-drop dataset DBLP;
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/030-filter.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/030-filter.aql
deleted file mode 100644
index 6c62d26..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/030-filter.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:'/tmp/dblp.adm';
-
-for $paper in dataset('DBLP')
-where $paper.id = 1
-return { 'dblp': $paper }
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/040-self-join-aql.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/040-self-join-aql.aql
deleted file mode 100644
index 68af44c..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/040-self-join-aql.aql
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id on group1;
-
-write output to asterix_nc1:'/tmp/dblp.adm';
-
-//
-// -- - Stage 3 - --
-//
-for $ridpair in 
-    //
-    // -- - Stage 2 - --
-    //
-    for $paperR in dataset('DBLP')
-    let $tokensR :=
-        for $word in counthashed-word-tokens($paperR.title)
-        for $token at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $paper in dataset('DBLP')
-            for $word in counthashed-word-tokens($paper.title)
-            group by $item := $word with $paper
-            order by count($paper)
-            return $item
-        where $word = $token
-        order by $i
-        return $i
-    for $prefix_tokenR in subset-collection(
-                                $tokensR, 
-                                0,
-                                prefix-len(
-                                    len($tokensR), 'Jaccard', .5))
-
-    for $paperS in dataset('DBLP')
-    let $tokensS :=
-        for $word in counthashed-word-tokens($paperS.title)
-        for $token at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $paper in dataset('DBLP')
-            for $word in counthashed-word-tokens($paper.title)
-            group by $item := $word with $paper
-            order by count($paper)
-            return $item
-        where $word = $token
-        order by $i
-        return $i
-    for $prefix_tokenS in subset-collection(
-                                $tokensS, 
-                                0,
-                                prefix-len(
-                                    len($tokensS), 'Jaccard', .5))
-
-    where $prefix_tokenR = $prefix_tokenS
-
-    let $sim := similarity(
-                    len(counthashed-word-tokens($paperR.title)),
-                    $tokensR,
-                    len(counthashed-word-tokens($paperS.title)),
-                    $tokensS,
-                    $prefix_tokenR,
-                    'Jaccard',
-                    .5)
-    where $sim >= .5 and $paperR.id < $paperS.id
-    group by $idR := $paperR.id, $idS := $paperS.id with $sim
-    return {'idR': $idR, 'idS': $idS, 'sim': $sim[0]}
-
-for $paperR in dataset('DBLP')
-for $paperS in dataset('DBLP')
-where $ridpair.idR = $paperR.id and $ridpair.idS = $paperS.id
-return { 'R': { 'dblpid': $paperR.dblpid, 'title': $paperR.title },
-         'S': { 'dblpid': $paperS.dblpid, 'title': $paperS.title },
-         'sim': $ridpair.sim }
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/050-self-join-op.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/050-self-join-op.aql
deleted file mode 100644
index d6a5ff6..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/050-self-join-op.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id on group1;
-
-write output to asterix_nc1:'/tmp/dblp.adm';
-
-set simthreshold '.5';
-
-for $paperR in dataset('DBLP')
-for $paperS in dataset('DBLP')
-where $paperR.title ~= $paperS.title and $paperR.id < $paperS.id
-return { 'R': { 'dblpid': $paperR.dblpid, 'title': $paperR.title },
-         'S': { 'dblpid': $paperS.dblpid, 'title': $paperS.title }}
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
deleted file mode 100644
index fcceee1..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id with {"node-group":{"name":"group1"}};
-
-// load dataset DBLP from asterix_nc1:'/asterix/asterix-app/data/pub-small/dblp-small-id.txt'
-load dataset DBLP 
-using localfs
-(("path"="asterix_nc1:///fuzzyjoin/data/dblp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/020-drop-dblp.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/020-drop-dblp.aql
deleted file mode 100644
index b59ada2..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/020-drop-dblp.aql
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id with {"node-group":{"name":"group1"}};
-
-drop dataset DBLP;
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/030-filter-dblp.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/030-filter-dblp.aql
deleted file mode 100644
index b97bfb7..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/030-filter-dblp.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:'/tmp/pub.adm';
-
-for $paper in dataset('DBLP')
-// where $paper.id = 1
-return { 'dblp': $paper }
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
deleted file mode 100644
index ccebb9e..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type CSXType as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset CSX(CSXType)
-  primary key id with {"node-group":{"name":"group1"}};
-
-// load dataset CSX from asterix_nc1:'/asterix/asterix-app/data/pub-small/csx-small-id.txt'
-load dataset  CSX
-using localfs
-(("path"="asterix_nc1:///asterix/asterix-app/data/pub-small/csx-small-id.txt"),("format"="delimited-text"),("delimiter"=":"),("quote"="\u0000")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/050-drop-csx.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/050-drop-csx.aql
deleted file mode 100644
index 3e48c17..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/050-drop-csx.aql
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type CSXType as open {
-  id: int32, 
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset CSX(CSXType) 
-  primary key id with {"node-group":{"name":"group1"}};
-
-drop dataset CSX;
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/060-filter-csx.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/060-filter-csx.aql
deleted file mode 100644
index aad3065..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/060-filter-csx.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-use dataverse fuzzy1;
-
-declare type CSXType as open {
-  id: int32, 
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset CSX(CSXType) 
-  primary key id with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:'/tmp/pub.adm';
-
-for $paper in dataset('CSX')
-// where $paper.id = 1
-return { 'csx': $paper }
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/070-join-aql.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/070-join-aql.aql
deleted file mode 100644
index 9c8e762..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/070-join-aql.aql
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare type CSXType as open {
-  id: int32, 
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id with {"node-group":{"name":"group1"}};
-
-declare dataset CSX(CSXType) 
-  primary key id on group1;
-
-write output to asterix_nc1:'/tmp/pub.adm';
-
-//
-// -- - Stage 3 - --
-//
-for $ridpair in 
-    //
-    // -- - Stage 2 - --
-    //
-    for $paperR in dataset('DBLP')
-    let $lenR := len(counthashed-word-tokens($paperR.title))
-    let $tokensR :=
-        for $word in counthashed-word-tokens($paperR.title)
-        for $token at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $paper in dataset('DBLP')
-            for $word in counthashed-word-tokens($paper.title)
-            group by $item := $word with $paper
-            order by count($paper)
-            return $item
-        where $word = $token
-        order by $i
-        return $i
-    for $prefix_tokenR in subset-collection(
-                                $tokensR, 
-                                0,
-                                prefix-len($lenR, 'Jaccard', .5))
-
-    for $paperS in dataset('CSX')
-    let $lenS := len(counthashed-word-tokens($paperS.title))
-    let $tokensS :=
-        for $word in counthashed-word-tokens($paperS.title)
-        for $token at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $paper in dataset('DBLP')
-            for $word in counthashed-word-tokens($paper.title)
-            group by $item := $word with $paper
-            order by count($paper)
-            return $item
-        where $word = $token
-        order by $i
-        return $i
-    for $prefix_tokenS in subset-collection(
-                                $tokensS, 
-                                0,
-                                prefix-len($lenS, 'Jaccard', .5))
-
-    where $prefix_tokenR = $prefix_tokenS
-
-    let $sim := similarity(
-                    $lenR,
-                    $tokensR,
-                    $lenS,
-                    $tokensS,
-                    $prefix_tokenR,
-                    'Jaccard',
-                    .5)
-    where $sim >= .5
-    group by $idR := $paperR.id, $idS := $paperS.id with $sim
-    return {'idR': $idR, 'idS': $idS, 'sim': $sim[0]}
-
-for $paperR in dataset('DBLP')
-for $paperS in dataset('CSX')
-where $ridpair.idR = $paperR.id and $ridpair.idS = $paperS.id
-return { 'R': { 'dblpid': $paperR.dblpid, 'title': $paperR.title },
-         'S': { 'csxid': $paperS.csxid, 'title': $paperS.title },
-         'sim': $ridpair.sim }
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/080-join-op.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/080-join-op.aql
deleted file mode 100644
index bd8d48c..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/080-join-op.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare type CSXType as open {
-  id: int32, 
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset DBLP(DBLPType) 
-  primary key id with {"node-group":{"name":"group1"}};
-
-declare dataset CSX(CSXType) 
-  primary key id on group1;
-
-write output to asterix_nc1:'/tmp/pub.adm';
-
-set simthreshold '.5';
-
-for $paperR in dataset('DBLP')
-for $paperS in dataset('CSX')
-where $paperR.title ~= $paperS.title
-return { 'R': { 'dblpid': $paperR.dblpid, 'title': $paperR.title },
-         'S': { 'csxid': $paperS.csxid, 'title': $paperS.title }}
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.dot b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.dot
deleted file mode 100644
index 03700d6..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.dot
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-digraph hyracks_job {
-size = "20,20";
-rankdir = "BT";
-node [shape = box, color = black, fillcolor = lightblue2, style = "rounded,filled"];
-"92f64732-b166-4765-bb0d-3d36a566005a" [label="AquaMeta\n(ets)"];
-"7b6c5cb6-cd7f-43cb-bf69-37eff4e3200b" [label="AquaMeta\n(assign,unnest)"];
-"9e589fcc-04fa-4834-ba1f-253470672434" [label="HashGroup"];
-"ff24200a-c665-4ca3-baa8-09fd2ca0ae04" [label="BTreeSearch"];
-"c6fc141b-034f-42db-bb33-a2059731e990" [label="InMemoryHashJoin"];
-"bb03494d-e0a9-4898-8b80-64c54da6a20c" [label="InMemorySort"];
-"4acb8f1a-23ab-474b-9571-8ab12f5aef41" [label="InMemoryHashJoin"];
-"19350ade-da75-4a1d-90e7-4f6753ef2732" [label="AquaMeta\n(assign,unnest)"];
-"421e3891-f7b0-4a50-a1d0-5c82099823f2" [label="AquaMeta\n(unnest)"];
-"21db32ee-7d3e-42f5-9541-2145ef2e55e2" [label="InMemoryHashJoin"];
-"99f0eeb6-d9f2-4af1-9b1b-6f0df7870db8" [label="InMemoryHashJoin"];
-"0066c7f5-f720-4098-8908-bebee74a409d" [label="BTreeSearch"];
-"b504c4ff-8226-43c2-b06f-a9ad59e54312" [label="HashGroup"];
-"a14d6687-2c52-41f9-95ed-ab9f4b451180" [label="AquaMeta\n(assign,stream-project)"];
-"f22b2397-d586-4894-8709-99da302fdc56" [label="AquaMeta\n(sink-write)"];
-"785d1650-a0b5-4f63-bfca-fe68d292c294" [label="PreclusteredGroup"];
-"66f6f703-1a20-40b2-a3a3-514412cabb03" [label="HashGroup"];
-"c66e50f0-f068-43fd-833e-32f9b6117f2f" [label="AquaMeta\n(ets)"];
-"1da790c0-ca3c-4833-8280-5c7c2d0ac23c" [label="AquaMeta\n(assign,running-aggregate,assign)"];
-"13342363-c3c6-469c-80b6-356397c95f53" [label="AquaMeta\n(ets)"];
-"769e1d5c-5b5b-4437-8764-a6e0bcf8d210" [label="HashGroup"];
-"da3da2a7-80c7-47a2-9d72-23b7c8f3d669" [label="AquaMeta\n(ets)"];
-"d966ca1f-a412-4b20-96cf-0b8b6c64df9c" [label="InMemoryHashJoin"];
-"baa3f1d6-1425-4180-a1de-2878f16e95d5" [label="AquaMeta\n(unnest)"];
-"6582beec-b6c0-48cc-ab7e-a5f3fc92bfa9" [label="AquaMeta\n(ets)"];
-"da4389d3-57a0-41fa-973b-cfdedca126d4" [label="PreclusteredGroup"];
-"e0d76180-55c0-41db-9d4e-b0b80eed3922" [label="BTreeSearch"];
-"36b24630-2bdf-47e2-ade4-21f95efde5a8" [label="AquaMeta\n(ets)"];
-"b1922618-827e-4276-a89e-5bd257cecd7d" [label="AquaMeta\n(assign,assign,unnest)"];
-"93596e19-b912-4071-94a9-512133274499" [label="InMemorySort"];
-"c49457b9-a4be-48d2-8e82-50820e0ca618" [label="BTreeSearch"];
-"7d6eb230-0efc-42a7-b279-98e0258073e6" [label="AquaMeta\n(assign,assign,unnest)"];
-"098774e6-f5a6-4fa0-b3cc-a195761bd957" [label="InMemorySort"];
-"ac276d4f-0bd6-468e-b314-da000f9141ea" [label="AquaMeta\n(stream-project)"];
-"066a993b-57b5-47ad-8a18-fef27b8e16f4" [label="AquaMeta\n(assign,stream-select)"];
-"31c39bd3-6724-42bc-b15f-9331d434598f" [label="BTreeSearch"];
-"0bdd825d-3c80-4769-95ec-3d8ed0fec67a" [label="HashGroup"];
-"9c797900-e6cf-44ad-b5e3-869e56fd27ba" [label="InMemorySort"];
-"ede16f1d-7795-4cbc-a605-ccfd25b7bb98" [label="BTreeSearch"];
-"9678a828-3e96-4391-be41-8da45721ca3d" [label="AquaMeta\n(assign,running-aggregate,assign)"];
-"92f64732-b166-4765-bb0d-3d36a566005a" -> "31c39bd3-6724-42bc-b15f-9331d434598f" [label="1:1"];
-"7b6c5cb6-cd7f-43cb-bf69-37eff4e3200b" -> "9e589fcc-04fa-4834-ba1f-253470672434" [label="1:1"];
-"9e589fcc-04fa-4834-ba1f-253470672434" -> "0bdd825d-3c80-4769-95ec-3d8ed0fec67a" [label="M:N Hash"];
-"ff24200a-c665-4ca3-baa8-09fd2ca0ae04" -> "99f0eeb6-d9f2-4af1-9b1b-6f0df7870db8" [label="M:N Hash"];
-"c6fc141b-034f-42db-bb33-a2059731e990" -> "066a993b-57b5-47ad-8a18-fef27b8e16f4" [label="1:1"];
-"bb03494d-e0a9-4898-8b80-64c54da6a20c" -> "785d1650-a0b5-4f63-bfca-fe68d292c294" [label="1:1"];
-"4acb8f1a-23ab-474b-9571-8ab12f5aef41" -> "a14d6687-2c52-41f9-95ed-ab9f4b451180" [label="1:1"];
-"19350ade-da75-4a1d-90e7-4f6753ef2732" -> "66f6f703-1a20-40b2-a3a3-514412cabb03" [label="1:1"];
-"421e3891-f7b0-4a50-a1d0-5c82099823f2" -> "c6fc141b-034f-42db-bb33-a2059731e990" [label="M:N Hash"];
-"21db32ee-7d3e-42f5-9541-2145ef2e55e2" -> "098774e6-f5a6-4fa0-b3cc-a195761bd957" [label="M:N Hash"];
-"99f0eeb6-d9f2-4af1-9b1b-6f0df7870db8" -> "ac276d4f-0bd6-468e-b314-da000f9141ea" [label="1:1"];
-"0066c7f5-f720-4098-8908-bebee74a409d" -> "4acb8f1a-23ab-474b-9571-8ab12f5aef41" [label="M:N Hash"];
-"b504c4ff-8226-43c2-b06f-a9ad59e54312" -> "9c797900-e6cf-44ad-b5e3-869e56fd27ba" [label="1:1"];
-"a14d6687-2c52-41f9-95ed-ab9f4b451180" -> "f22b2397-d586-4894-8709-99da302fdc56" [label="M:N Replicate"];
-"785d1650-a0b5-4f63-bfca-fe68d292c294" -> "421e3891-f7b0-4a50-a1d0-5c82099823f2" [label="1:1"];
-"66f6f703-1a20-40b2-a3a3-514412cabb03" -> "b504c4ff-8226-43c2-b06f-a9ad59e54312" [label="M:N Hash"];
-"c66e50f0-f068-43fd-833e-32f9b6117f2f" -> "e0d76180-55c0-41db-9d4e-b0b80eed3922" [label="1:1"];
-"1da790c0-ca3c-4833-8280-5c7c2d0ac23c" -> "d966ca1f-a412-4b20-96cf-0b8b6c64df9c" [label="M:N Hash"];
-"13342363-c3c6-469c-80b6-356397c95f53" -> "ff24200a-c665-4ca3-baa8-09fd2ca0ae04" [label="1:1"];
-"769e1d5c-5b5b-4437-8764-a6e0bcf8d210" -> "99f0eeb6-d9f2-4af1-9b1b-6f0df7870db8" [label="M:N Hash"];
-"da3da2a7-80c7-47a2-9d72-23b7c8f3d669" -> "c49457b9-a4be-48d2-8e82-50820e0ca618" [label="1:1"];
-"d966ca1f-a412-4b20-96cf-0b8b6c64df9c" -> "bb03494d-e0a9-4898-8b80-64c54da6a20c" [label="M:N Hash"];
-"baa3f1d6-1425-4180-a1de-2878f16e95d5" -> "c6fc141b-034f-42db-bb33-a2059731e990" [label="M:N Hash"];
-"6582beec-b6c0-48cc-ab7e-a5f3fc92bfa9" -> "ede16f1d-7795-4cbc-a605-ccfd25b7bb98" [label="1:1"];
-"da4389d3-57a0-41fa-973b-cfdedca126d4" -> "baa3f1d6-1425-4180-a1de-2878f16e95d5" [label="1:1"];
-"e0d76180-55c0-41db-9d4e-b0b80eed3922" -> "19350ade-da75-4a1d-90e7-4f6753ef2732" [label="1:1"];
-"36b24630-2bdf-47e2-ade4-21f95efde5a8" -> "0066c7f5-f720-4098-8908-bebee74a409d" [label="1:1"];
-"b1922618-827e-4276-a89e-5bd257cecd7d" -> "21db32ee-7d3e-42f5-9541-2145ef2e55e2" [label="M:N Hash"];
-"93596e19-b912-4071-94a9-512133274499" -> "9678a828-3e96-4391-be41-8da45721ca3d" [label="M:N Hash Merge"];
-"c49457b9-a4be-48d2-8e82-50820e0ca618" -> "7b6c5cb6-cd7f-43cb-bf69-37eff4e3200b" [label="1:1"];
-"7d6eb230-0efc-42a7-b279-98e0258073e6" -> "d966ca1f-a412-4b20-96cf-0b8b6c64df9c" [label="M:N Hash"];
-"098774e6-f5a6-4fa0-b3cc-a195761bd957" -> "da4389d3-57a0-41fa-973b-cfdedca126d4" [label="1:1"];
-"ac276d4f-0bd6-468e-b314-da000f9141ea" -> "4acb8f1a-23ab-474b-9571-8ab12f5aef41" [label="M:N Hash"];
-"066a993b-57b5-47ad-8a18-fef27b8e16f4" -> "769e1d5c-5b5b-4437-8764-a6e0bcf8d210" [label="M:N Hash"];
-"31c39bd3-6724-42bc-b15f-9331d434598f" -> "b1922618-827e-4276-a89e-5bd257cecd7d" [label="1:1"];
-"0bdd825d-3c80-4769-95ec-3d8ed0fec67a" -> "93596e19-b912-4071-94a9-512133274499" [label="1:1"];
-"9c797900-e6cf-44ad-b5e3-869e56fd27ba" -> "1da790c0-ca3c-4833-8280-5c7c2d0ac23c" [label="M:N Hash Merge"];
-"ede16f1d-7795-4cbc-a605-ccfd25b7bb98" -> "7d6eb230-0efc-42a7-b279-98e0258073e6" [label="1:1"];
-"9678a828-3e96-4391-be41-8da45721ca3d" -> "21db32ee-7d3e-42f5-9541-2145ef2e55e2" [label="M:N Hash"];
-}
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.json b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.json
deleted file mode 100644
index 44d7027..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.json
+++ /dev/null
@@ -1,802 +0,0 @@
-{
- "connectors": [
-  {
-   "connector": {
-    "id": "551aa36c-8048-46b7-8eff-f4bbe1afce83",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:e0d76180-55c0-41db-9d4e-b0b80eed3922",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:19350ade-da75-4a1d-90e7-4f6753ef2732",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "3b0c6d28-b75e-4040-ae5c-0a20a0729d9c",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:c49457b9-a4be-48d2-8e82-50820e0ca618",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:7b6c5cb6-cd7f-43cb-bf69-37eff4e3200b",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "3c6dad81-1d96-41aa-976a-0cdcb9e2071e",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:ac276d4f-0bd6-468e-b314-da000f9141ea",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:4acb8f1a-23ab-474b-9571-8ab12f5aef41",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "8ca6e18f-9e2f-4cf7-a15d-b49da1e18327",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:da3da2a7-80c7-47a2-9d72-23b7c8f3d669",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:c49457b9-a4be-48d2-8e82-50820e0ca618",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "1d3ac011-b83a-4690-b1fe-0dd906706823",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:b1922618-827e-4276-a89e-5bd257cecd7d",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:21db32ee-7d3e-42f5-9541-2145ef2e55e2",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "376d0c4e-a260-4de2-af6f-46cfb7f35736",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:7b6c5cb6-cd7f-43cb-bf69-37eff4e3200b",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:9e589fcc-04fa-4834-ba1f-253470672434",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "a63f8c84-bb1f-4d18-9008-1f5a3d657e33",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:769e1d5c-5b5b-4437-8764-a6e0bcf8d210",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:99f0eeb6-d9f2-4af1-9b1b-6f0df7870db8",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "f99bf8e6-f528-4e14-81a2-029185b19c07",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:b504c4ff-8226-43c2-b06f-a9ad59e54312",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:9c797900-e6cf-44ad-b5e3-869e56fd27ba",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "c20357ab-1ac9-427a-8401-680e0893310e",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:baa3f1d6-1425-4180-a1de-2878f16e95d5",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:c6fc141b-034f-42db-bb33-a2059731e990",
-   "out-operator-port": 1,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "3314f84e-770c-40fe-b4fd-84e9d4a1b645",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:1da790c0-ca3c-4833-8280-5c7c2d0ac23c",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:d966ca1f-a412-4b20-96cf-0b8b6c64df9c",
-   "out-operator-port": 1,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "9cc19566-7513-4025-ab45-d63de159601e",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:19350ade-da75-4a1d-90e7-4f6753ef2732",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:66f6f703-1a20-40b2-a3a3-514412cabb03",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "de442773-23d2-437b-aed1-5871bcd41acb",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:da4389d3-57a0-41fa-973b-cfdedca126d4",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:baa3f1d6-1425-4180-a1de-2878f16e95d5",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "befeab23-9011-43d6-bb2e-16b00b9733d3",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:421e3891-f7b0-4a50-a1d0-5c82099823f2",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:c6fc141b-034f-42db-bb33-a2059731e990",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "d995afde-8485-4c9a-81f8-6d3fae1ae276",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningMergingConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:93596e19-b912-4071-94a9-512133274499",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:9678a828-3e96-4391-be41-8da45721ca3d",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "5d5d91af-30b0-4257-93a3-88ab3b8ea87e",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:31c39bd3-6724-42bc-b15f-9331d434598f",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:b1922618-827e-4276-a89e-5bd257cecd7d",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "6a9de34a-2de7-4943-affd-ae5442c68d02",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNReplicatingConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:a14d6687-2c52-41f9-95ed-ab9f4b451180",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:f22b2397-d586-4894-8709-99da302fdc56",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "5e8289ff-2801-441e-9497-0e57a39bb4a3",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:7d6eb230-0efc-42a7-b279-98e0258073e6",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:d966ca1f-a412-4b20-96cf-0b8b6c64df9c",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "214c15e9-c25f-4d99-a5ff-2cf59cb7f4df",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:36b24630-2bdf-47e2-ade4-21f95efde5a8",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:0066c7f5-f720-4098-8908-bebee74a409d",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "d75a162f-f2c2-4cb3-b603-9010e628e3c9",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:66f6f703-1a20-40b2-a3a3-514412cabb03",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:b504c4ff-8226-43c2-b06f-a9ad59e54312",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "69eab14a-0758-400b-928f-b59b7f3a9aad",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:ff24200a-c665-4ca3-baa8-09fd2ca0ae04",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:99f0eeb6-d9f2-4af1-9b1b-6f0df7870db8",
-   "out-operator-port": 1,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "44e2def1-3cf3-4a5f-8ad8-c5d02427d9c8",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningMergingConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:9c797900-e6cf-44ad-b5e3-869e56fd27ba",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:1da790c0-ca3c-4833-8280-5c7c2d0ac23c",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "41c2e83d-8363-463d-b5fe-88eab1a5ed6a",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:c66e50f0-f068-43fd-833e-32f9b6117f2f",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:e0d76180-55c0-41db-9d4e-b0b80eed3922",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "f8972eb8-065e-4f7e-acc2-48643c56661a",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:9678a828-3e96-4391-be41-8da45721ca3d",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:21db32ee-7d3e-42f5-9541-2145ef2e55e2",
-   "out-operator-port": 1,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "34d4f80f-a18d-4554-8b54-01f262b4dd6f",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:92f64732-b166-4765-bb0d-3d36a566005a",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:31c39bd3-6724-42bc-b15f-9331d434598f",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "590b6750-19b8-4171-9875-616e30ccaf16",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:785d1650-a0b5-4f63-bfca-fe68d292c294",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:421e3891-f7b0-4a50-a1d0-5c82099823f2",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "96c2ddc2-9be2-4279-894f-dcce41f2bf65",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:0bdd825d-3c80-4769-95ec-3d8ed0fec67a",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:93596e19-b912-4071-94a9-512133274499",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "59227da7-cbba-4414-a3e5-b9d20796d743",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:066a993b-57b5-47ad-8a18-fef27b8e16f4",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:769e1d5c-5b5b-4437-8764-a6e0bcf8d210",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "f0105e8e-7916-4abf-aa1a-cd3ab5cdbaea",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:bb03494d-e0a9-4898-8b80-64c54da6a20c",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:785d1650-a0b5-4f63-bfca-fe68d292c294",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "ce0d0b9e-d59a-4097-98f5-44e8af699016",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:6582beec-b6c0-48cc-ab7e-a5f3fc92bfa9",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:ede16f1d-7795-4cbc-a605-ccfd25b7bb98",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "10daf2fc-aa60-4604-a150-9e4d4f42106a",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:9e589fcc-04fa-4834-ba1f-253470672434",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:0bdd825d-3c80-4769-95ec-3d8ed0fec67a",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "be9e9778-a426-4701-b28e-4f9b1f766f11",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:21db32ee-7d3e-42f5-9541-2145ef2e55e2",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:098774e6-f5a6-4fa0-b3cc-a195761bd957",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "cbf6135d-43f8-49b5-82ab-eeeffa5ab984",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:0066c7f5-f720-4098-8908-bebee74a409d",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:4acb8f1a-23ab-474b-9571-8ab12f5aef41",
-   "out-operator-port": 1,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "56c2608f-5435-4307-be85-96e6e63b792a",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:13342363-c3c6-469c-80b6-356397c95f53",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:ff24200a-c665-4ca3-baa8-09fd2ca0ae04",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "2459e6c7-1c76-4d21-968f-d882f512d53b",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:098774e6-f5a6-4fa0-b3cc-a195761bd957",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:da4389d3-57a0-41fa-973b-cfdedca126d4",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "a46e659d-0687-4f77-8948-3e09f72d99c7",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:4acb8f1a-23ab-474b-9571-8ab12f5aef41",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:a14d6687-2c52-41f9-95ed-ab9f4b451180",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "7ce5dc21-e816-4e36-a8ee-29295a6ba454",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:ede16f1d-7795-4cbc-a605-ccfd25b7bb98",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:7d6eb230-0efc-42a7-b279-98e0258073e6",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "6e12e7e0-2fc6-444d-a1f2-16cea0d51eeb",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:99f0eeb6-d9f2-4af1-9b1b-6f0df7870db8",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:ac276d4f-0bd6-468e-b314-da000f9141ea",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "b19ab64b-c38d-490e-85be-d58547582144",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:c6fc141b-034f-42db-bb33-a2059731e990",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:066a993b-57b5-47ad-8a18-fef27b8e16f4",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "b2d466cc-5250-4b8a-963e-bbd36f07380d",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:d966ca1f-a412-4b20-96cf-0b8b6c64df9c",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:bb03494d-e0a9-4898-8b80-64c54da6a20c",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  }
- ],
- "operators": [
-  {
-   "id": "92f64732-b166-4765-bb0d-3d36a566005a",
-   "in-arity": 0,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["ets"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "7b6c5cb6-cd7f-43cb-bf69-37eff4e3200b",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [2] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@6a6779e6]",
-    "unnest 3 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@2f74219d"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "9e589fcc-04fa-4834-ba1f-253470672434",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "ff24200a-c665-4ca3-baa8-09fd2ca0ae04",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "c6fc141b-034f-42db-bb33-a2059731e990",
-   "in-arity": 2,
-   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "bb03494d-e0a9-4898-8b80-64c54da6a20c",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "4acb8f1a-23ab-474b-9571-8ab12f5aef41",
-   "in-arity": 2,
-   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "19350ade-da75-4a1d-90e7-4f6753ef2732",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [2] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@714ae2c1]",
-    "unnest 3 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@6b6d2702"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "421e3891-f7b0-4a50-a1d0-5c82099823f2",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["unnest 5 <- org.apache.asterix.runtime.unnestingfunctions.std.SubsetCollectionDescriptor$1@4b1c2b67"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "21db32ee-7d3e-42f5-9541-2145ef2e55e2",
-   "in-arity": 2,
-   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "99f0eeb6-d9f2-4af1-9b1b-6f0df7870db8",
-   "in-arity": 2,
-   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "0066c7f5-f720-4098-8908-bebee74a409d",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "b504c4ff-8226-43c2-b06f-a9ad59e54312",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "a14d6687-2c52-41f9-95ed-ab9f4b451180",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [4] := [org.apache.asterix.runtime.evaluators.tagged.functions.AbstractRecordConstructorDescriptor$1@26659db7]",
-    "stream-project [4]"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "f22b2397-d586-4894-8709-99da302fdc56",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["sink-write [0] outputFile"],
-   "out-arity": 0,
-   "type": "operator"
-  },
-  {
-   "id": "785d1650-a0b5-4f63-bfca-fe68d292c294",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.group.PreclusteredGroupOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "66f6f703-1a20-40b2-a3a3-514412cabb03",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "c66e50f0-f068-43fd-833e-32f9b6117f2f",
-   "in-arity": 0,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["ets"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "1da790c0-ca3c-4833-8280-5c7c2d0ac23c",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [2] := [ColumnAccess(0)]",
-    "running-aggregate [3] := [org.apache.asterix.runtime.runningaggregates.std.TidRunningAggregateDescriptor$1@59556d12]",
-    "assign [4] := [ConstantEvalFactory true]"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "13342363-c3c6-469c-80b6-356397c95f53",
-   "in-arity": 0,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["ets"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "769e1d5c-5b5b-4437-8764-a6e0bcf8d210",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "da3da2a7-80c7-47a2-9d72-23b7c8f3d669",
-   "in-arity": 0,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["ets"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "d966ca1f-a412-4b20-96cf-0b8b6c64df9c",
-   "in-arity": 2,
-   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "baa3f1d6-1425-4180-a1de-2878f16e95d5",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["unnest 5 <- org.apache.asterix.runtime.unnestingfunctions.std.SubsetCollectionDescriptor$1@776be68f"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "6582beec-b6c0-48cc-ab7e-a5f3fc92bfa9",
-   "in-arity": 0,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["ets"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "da4389d3-57a0-41fa-973b-cfdedca126d4",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.group.PreclusteredGroupOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "e0d76180-55c0-41db-9d4e-b0b80eed3922",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "36b24630-2bdf-47e2-ade4-21f95efde5a8",
-   "in-arity": 0,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["ets"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "b1922618-827e-4276-a89e-5bd257cecd7d",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [2] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@4cedf389]",
-    "assign [3] := [org.apache.asterix.runtime.evaluators.tagged.functions.LenDescriptor$1@1a0fced4]",
-    "unnest 4 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@3d3cdaa"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "93596e19-b912-4071-94a9-512133274499",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "c49457b9-a4be-48d2-8e82-50820e0ca618",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "7d6eb230-0efc-42a7-b279-98e0258073e6",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [2] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@466355dc]",
-    "assign [3] := [org.apache.asterix.runtime.evaluators.tagged.functions.LenDescriptor$1@239a029e]",
-    "unnest 4 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@5421e554"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "098774e6-f5a6-4fa0-b3cc-a195761bd957",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "ac276d4f-0bd6-468e-b314-da000f9141ea",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["stream-project [3, 1]"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "066a993b-57b5-47ad-8a18-fef27b8e16f4",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [12] := [org.apache.asterix.runtime.evaluators.tagged.functions.SimilarityDescriptor$1@7d5718f2]",
-    "stream-select org.apache.asterix.runtime.evaluators.comparisons.ComparisonEvalFactory@6126f827"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "31c39bd3-6724-42bc-b15f-9331d434598f",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "0bdd825d-3c80-4769-95ec-3d8ed0fec67a",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "9c797900-e6cf-44ad-b5e3-869e56fd27ba",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "ede16f1d-7795-4cbc-a605-ccfd25b7bb98",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "9678a828-3e96-4391-be41-8da45721ca3d",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [2] := [ColumnAccess(0)]",
-    "running-aggregate [3] := [org.apache.asterix.runtime.runningaggregates.std.TidRunningAggregateDescriptor$1@456dfa45]",
-    "assign [4] := [ConstantEvalFactory true]"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  }
- ],
- "type": "job"
-}
-
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.png b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.png
deleted file mode 100644
index 32a3e1e..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.png
+++ /dev/null
Binary files differ
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.ps b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.ps
deleted file mode 100644
index 1397046..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.ps
+++ /dev/null
@@ -1,5810 +0,0 @@
-%!PS-Adobe-3.0
-%
-% Licensed to the Apache Software Foundation (ASF) under one
-% or more contributor license agreements.  See the NOTICE file
-% distributed with this work for additional information
-% regarding copyright ownership.  The ASF licenses this file
-% to you under the Apache License, Version 2.0 (the
-% "License"); you may not use this file except in compliance
-% with the License.  You may obtain a copy of the License at
-%
-%   http://www.apache.org/licenses/LICENSE-2.0
-%
-% Unless required by applicable law or agreed to in writing,
-% software distributed under the License is distributed on an
-% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-% KIND, either express or implied.  See the License for the
-% specific language governing permissions and limitations
-% under the License.
-%
-%%Creator: graphviz version 2.26.3 (20100126.1600)
-%%Title: hyracks_job
-%%Pages: (atend)
-%%BoundingBox: (atend)
-%%EndComments
-save
-%%BeginProlog
-/DotDict 200 dict def
-DotDict begin
-
-/setupLatin1 {
-mark
-/EncodingVector 256 array def
- EncodingVector 0
-
-ISOLatin1Encoding 0 255 getinterval putinterval
-EncodingVector 45 /hyphen put
-
-% Set up ISO Latin 1 character encoding
-/starnetISO {
-        dup dup findfont dup length dict begin
-        { 1 index /FID ne { def }{ pop pop } ifelse
-        } forall
-        /Encoding EncodingVector def
-        currentdict end definefont
-} def
-/Times-Roman starnetISO def
-/Times-Italic starnetISO def
-/Times-Bold starnetISO def
-/Times-BoldItalic starnetISO def
-/Helvetica starnetISO def
-/Helvetica-Oblique starnetISO def
-/Helvetica-Bold starnetISO def
-/Helvetica-BoldOblique starnetISO def
-/Courier starnetISO def
-/Courier-Oblique starnetISO def
-/Courier-Bold starnetISO def
-/Courier-BoldOblique starnetISO def
-cleartomark
-} bind def
-
-%%BeginResource: procset graphviz 0 0
-/coord-font-family /Times-Roman def
-/default-font-family /Times-Roman def
-/coordfont coord-font-family findfont 8 scalefont def
-
-/InvScaleFactor 1.0 def
-/set_scale {
-       dup 1 exch div /InvScaleFactor exch def
-       scale
-} bind def
-
-% styles
-/solid { [] 0 setdash } bind def
-/dashed { [9 InvScaleFactor mul dup ] 0 setdash } bind def
-/dotted { [1 InvScaleFactor mul 6 InvScaleFactor mul] 0 setdash } bind def
-/invis {/fill {newpath} def /stroke {newpath} def /show {pop newpath} def} bind def
-/bold { 2 setlinewidth } bind def
-/filled { } bind def
-/unfilled { } bind def
-/rounded { } bind def
-/diagonals { } bind def
-
-% hooks for setting color 
-/nodecolor { sethsbcolor } bind def
-/edgecolor { sethsbcolor } bind def
-/graphcolor { sethsbcolor } bind def
-/nopcolor {pop pop pop} bind def
-
-/beginpage {	% i j npages
-	/npages exch def
-	/j exch def
-	/i exch def
-	/str 10 string def
-	npages 1 gt {
-		gsave
-			coordfont setfont
-			0 0 moveto
-			(\() show i str cvs show (,) show j str cvs show (\)) show
-		grestore
-	} if
-} bind def
-
-/set_font {
-	findfont exch
-	scalefont setfont
-} def
-
-% draw text fitted to its expected width
-/alignedtext {			% width text
-	/text exch def
-	/width exch def
-	gsave
-		width 0 gt {
-			[] 0 setdash
-			text stringwidth pop width exch sub text length div 0 text ashow
-		} if
-	grestore
-} def
-
-/boxprim {				% xcorner ycorner xsize ysize
-		4 2 roll
-		moveto
-		2 copy
-		exch 0 rlineto
-		0 exch rlineto
-		pop neg 0 rlineto
-		closepath
-} bind def
-
-/ellipse_path {
-	/ry exch def
-	/rx exch def
-	/y exch def
-	/x exch def
-	matrix currentmatrix
-	newpath
-	x y translate
-	rx ry scale
-	0 0 1 0 360 arc
-	setmatrix
-} bind def
-
-/endpage { showpage } bind def
-/showpage { } def
-
-/layercolorseq
-	[	% layer color sequence - darkest to lightest
-		[0 0 0]
-		[.2 .8 .8]
-		[.4 .8 .8]
-		[.6 .8 .8]
-		[.8 .8 .8]
-	]
-def
-
-/layerlen layercolorseq length def
-
-/setlayer {/maxlayer exch def /curlayer exch def
-	layercolorseq curlayer 1 sub layerlen mod get
-	aload pop sethsbcolor
-	/nodecolor {nopcolor} def
-	/edgecolor {nopcolor} def
-	/graphcolor {nopcolor} def
-} bind def
-
-/onlayer { curlayer ne {invis} if } def
-
-/onlayers {
-	/myupper exch def
-	/mylower exch def
-	curlayer mylower lt
-	curlayer myupper gt
-	or
-	{invis} if
-} def
-
-/curlayer 0 def
-
-%%EndResource
-%%EndProlog
-%%BeginSetup
-14 default-font-family set_font
-1 setmiterlimit
-% /arrowlength 10 def
-% /arrowwidth 5 def
-
-% make sure pdfmark is harmless for PS-interpreters other than Distiller
-/pdfmark where {pop} {userdict /pdfmark /cleartomark load put} ifelse
-% make '<<' and '>>' safe on PS Level 1 devices
-/languagelevel where {pop languagelevel}{1} ifelse
-2 lt {
-    userdict (<<) cvn ([) cvn load put
-    userdict (>>) cvn ([) cvn load put
-} if
-
-%%EndSetup
-setupLatin1
-%%Page: 1 1
-%%PageBoundingBox: 36 36 781 1476
-%%PageOrientation: Portrait
-0 0 1 beginpage
-gsave
-36 36 745 1440 boxprim clip newpath
-0.825688 0.825688 set_scale 0 rotate 47.6 48.6 translate
-% 92f64732-b166-4765-bb0d-3d36a566005a
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 116 420 moveto
-54 420 lineto
-42 408 lineto
-42 388 lineto
-54 376 lineto
-116 376 lineto
-128 388 lineto
-128 408 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 116 420 moveto
-54 420 lineto
-42 408 lineto
-42 388 lineto
-54 376 lineto
-116 376 lineto
-128 388 lineto
-128 408 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 54 420 moveto
-48 420 42 414 42 408 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 54 420 moveto
-48 420 42 414 42 408 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 42 388 moveto
-42 382 48 376 54 376 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 42 388 moveto
-42 382 48 376 54 376 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 116 376 moveto
-122 376 128 382 128 388 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 116 376 moveto
-122 376 128 382 128 388 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 128 408 moveto
-128 414 122 420 116 420 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 128 408 moveto
-128 414 122 420 116 420 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 116 420 moveto
-54 420 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 54 420 moveto
-48 420 42 414 42 408 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 42 408 moveto
-42 388 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 42 388 moveto
-42 382 48 376 54 376 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 54 376 moveto
-116 376 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 116 376 moveto
-122 376 128 382 128 388 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 128 388 moveto
-128 408 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 128 408 moveto
-128 414 122 420 116 420 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-50 403.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-69 385.4 moveto 32 (\(ets\)) alignedtext
-grestore
-% 31c39bd3-6724-42bc-b15f-9331d434598f
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 124 510 moveto
-46 510 lineto
-34 498 lineto
-34 486 lineto
-46 474 lineto
-124 474 lineto
-136 486 lineto
-136 498 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 124 510 moveto
-46 510 lineto
-34 498 lineto
-34 486 lineto
-46 474 lineto
-124 474 lineto
-136 486 lineto
-136 498 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 46 510 moveto
-40 510 34 504 34 498 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 46 510 moveto
-40 510 34 504 34 498 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 34 486 moveto
-34 480 40 474 46 474 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 34 486 moveto
-34 480 40 474 46 474 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 124 474 moveto
-130 474 136 480 136 486 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 124 474 moveto
-130 474 136 480 136 486 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 136 498 moveto
-136 504 130 510 124 510 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 136 498 moveto
-136 504 130 510 124 510 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 124 510 moveto
-46 510 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 46 510 moveto
-40 510 34 504 34 498 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 34 498 moveto
-34 486 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 34 486 moveto
-34 480 40 474 46 474 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 46 474 moveto
-124 474 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 124 474 moveto
-130 474 136 480 136 486 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 136 486 moveto
-136 498 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 136 498 moveto
-136 504 130 510 124 510 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-41.5 488.4 moveto 87 (BTreeSearch) alignedtext
-grestore
-% 92f64732-b166-4765-bb0d-3d36a566005a->31c39bd3-6724-42bc-b15f-9331d434598f
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 85 420.28 moveto
-85 433.34 85 449.97 85 463.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 81.5 463.97 moveto
-85 473.97 lineto
-88.5 463.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 81.5 463.97 moveto
-85 473.97 lineto
-88.5 463.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-85 443.4 moveto 23 (1:1) alignedtext
-grestore
-% 7b6c5cb6-cd7f-43cb-bf69-37eff4e3200b
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 362 232 moveto
-264 232 lineto
-252 220 lineto
-252 200 lineto
-264 188 lineto
-362 188 lineto
-374 200 lineto
-374 220 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 362 232 moveto
-264 232 lineto
-252 220 lineto
-252 200 lineto
-264 188 lineto
-362 188 lineto
-374 200 lineto
-374 220 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 264 232 moveto
-258 232 252 226 252 220 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 264 232 moveto
-258 232 252 226 252 220 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 252 200 moveto
-252 194 258 188 264 188 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 252 200 moveto
-252 194 258 188 264 188 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 362 188 moveto
-368 188 374 194 374 200 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 362 188 moveto
-368 188 374 194 374 200 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 374 220 moveto
-374 226 368 232 362 232 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 374 220 moveto
-374 226 368 232 362 232 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 362 232 moveto
-264 232 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 264 232 moveto
-258 232 252 226 252 220 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 252 220 moveto
-252 200 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 252 200 moveto
-252 194 258 188 264 188 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 264 188 moveto
-362 188 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 362 188 moveto
-368 188 374 194 374 200 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 374 200 moveto
-374 220 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 374 220 moveto
-374 226 368 232 362 232 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-278 215.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-260 197.4 moveto 106 (\(assign,unnest\)) alignedtext
-grestore
-% 9e589fcc-04fa-4834-ba1f-253470672434
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 348 322 moveto
-278 322 lineto
-266 310 lineto
-266 298 lineto
-278 286 lineto
-348 286 lineto
-360 298 lineto
-360 310 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 348 322 moveto
-278 322 lineto
-266 310 lineto
-266 298 lineto
-278 286 lineto
-348 286 lineto
-360 298 lineto
-360 310 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 278 322 moveto
-272 322 266 316 266 310 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 278 322 moveto
-272 322 266 316 266 310 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 266 298 moveto
-266 292 272 286 278 286 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 266 298 moveto
-266 292 272 286 278 286 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 348 286 moveto
-354 286 360 292 360 298 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 348 286 moveto
-354 286 360 292 360 298 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 360 310 moveto
-360 316 354 322 348 322 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 360 310 moveto
-360 316 354 322 348 322 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 348 322 moveto
-278 322 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 278 322 moveto
-272 322 266 316 266 310 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 266 310 moveto
-266 298 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 266 298 moveto
-266 292 272 286 278 286 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 278 286 moveto
-348 286 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 348 286 moveto
-354 286 360 292 360 298 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 360 298 moveto
-360 310 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 360 310 moveto
-360 316 354 322 348 322 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-274 300.4 moveto 78 (HashGroup) alignedtext
-grestore
-% 7b6c5cb6-cd7f-43cb-bf69-37eff4e3200b->9e589fcc-04fa-4834-ba1f-253470672434
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 313 232.28 moveto
-313 245.34 313 261.97 313 275.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 309.5 275.97 moveto
-313 285.97 lineto
-316.5 275.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 309.5 275.97 moveto
-313 285.97 lineto
-316.5 275.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-313 255.4 moveto 23 (1:1) alignedtext
-grestore
-% 0bdd825d-3c80-4769-95ec-3d8ed0fec67a
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 348 416 moveto
-278 416 lineto
-266 404 lineto
-266 392 lineto
-278 380 lineto
-348 380 lineto
-360 392 lineto
-360 404 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 348 416 moveto
-278 416 lineto
-266 404 lineto
-266 392 lineto
-278 380 lineto
-348 380 lineto
-360 392 lineto
-360 404 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 278 416 moveto
-272 416 266 410 266 404 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 278 416 moveto
-272 416 266 410 266 404 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 266 392 moveto
-266 386 272 380 278 380 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 266 392 moveto
-266 386 272 380 278 380 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 348 380 moveto
-354 380 360 386 360 392 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 348 380 moveto
-354 380 360 386 360 392 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 360 404 moveto
-360 410 354 416 348 416 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 360 404 moveto
-360 410 354 416 348 416 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 348 416 moveto
-278 416 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 278 416 moveto
-272 416 266 410 266 404 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 266 404 moveto
-266 392 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 266 392 moveto
-266 386 272 380 278 380 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 278 380 moveto
-348 380 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 348 380 moveto
-354 380 360 386 360 392 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 360 392 moveto
-360 404 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 360 404 moveto
-360 410 354 416 348 416 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-274 394.4 moveto 78 (HashGroup) alignedtext
-grestore
-% 9e589fcc-04fa-4834-ba1f-253470672434->0bdd825d-3c80-4769-95ec-3d8ed0fec67a
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 313 322.12 moveto
-313 335.65 313 354.38 313 369.85 curveto
-stroke
-0 0 0 edgecolor
-newpath 309.5 369.93 moveto
-313 379.93 lineto
-316.5 369.93 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 309.5 369.93 moveto
-313 379.93 lineto
-316.5 369.93 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-313 345.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% ff24200a-c665-4ca3-baa8-09fd2ca0ae04
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 619 1254 moveto
-541 1254 lineto
-529 1242 lineto
-529 1230 lineto
-541 1218 lineto
-619 1218 lineto
-631 1230 lineto
-631 1242 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 619 1254 moveto
-541 1254 lineto
-529 1242 lineto
-529 1230 lineto
-541 1218 lineto
-619 1218 lineto
-631 1230 lineto
-631 1242 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 541 1254 moveto
-535 1254 529 1248 529 1242 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 541 1254 moveto
-535 1254 529 1248 529 1242 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 529 1230 moveto
-529 1224 535 1218 541 1218 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 529 1230 moveto
-529 1224 535 1218 541 1218 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 619 1218 moveto
-625 1218 631 1224 631 1230 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 619 1218 moveto
-625 1218 631 1224 631 1230 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 631 1242 moveto
-631 1248 625 1254 619 1254 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 631 1242 moveto
-631 1248 625 1254 619 1254 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 619 1254 moveto
-541 1254 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 541 1254 moveto
-535 1254 529 1248 529 1242 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 529 1242 moveto
-529 1230 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 529 1230 moveto
-529 1224 535 1218 541 1218 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 541 1218 moveto
-619 1218 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 619 1218 moveto
-625 1218 631 1224 631 1230 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 631 1230 moveto
-631 1242 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 631 1242 moveto
-631 1248 625 1254 619 1254 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-536.5 1232.4 moveto 87 (BTreeSearch) alignedtext
-grestore
-% 99f0eeb6-d9f2-4af1-9b1b-6f0df7870db8
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 584 1348 moveto
-462 1348 lineto
-450 1336 lineto
-450 1324 lineto
-462 1312 lineto
-584 1312 lineto
-596 1324 lineto
-596 1336 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 584 1348 moveto
-462 1348 lineto
-450 1336 lineto
-450 1324 lineto
-462 1312 lineto
-584 1312 lineto
-596 1324 lineto
-596 1336 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 462 1348 moveto
-456 1348 450 1342 450 1336 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 462 1348 moveto
-456 1348 450 1342 450 1336 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 450 1324 moveto
-450 1318 456 1312 462 1312 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 450 1324 moveto
-450 1318 456 1312 462 1312 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 584 1312 moveto
-590 1312 596 1318 596 1324 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 584 1312 moveto
-590 1312 596 1318 596 1324 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 596 1336 moveto
-596 1342 590 1348 584 1348 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 596 1336 moveto
-596 1342 590 1348 584 1348 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 584 1348 moveto
-462 1348 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 462 1348 moveto
-456 1348 450 1342 450 1336 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 450 1336 moveto
-450 1324 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 450 1324 moveto
-450 1318 456 1312 462 1312 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 462 1312 moveto
-584 1312 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 584 1312 moveto
-590 1312 596 1318 596 1324 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 596 1324 moveto
-596 1336 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 596 1336 moveto
-596 1342 590 1348 584 1348 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-458 1326.4 moveto 130 (InMemoryHashJoin) alignedtext
-grestore
-% ff24200a-c665-4ca3-baa8-09fd2ca0ae04->99f0eeb6-d9f2-4af1-9b1b-6f0df7870db8
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 569.01 1254.12 moveto
-560.57 1268.04 548.79 1287.47 539.26 1303.18 curveto
-stroke
-0 0 0 edgecolor
-newpath 536.15 1301.57 moveto
-533.96 1311.93 lineto
-542.13 1305.2 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 536.15 1301.57 moveto
-533.96 1311.93 lineto
-542.13 1305.2 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-556 1277.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% c6fc141b-034f-42db-bb33-a2059731e990
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 501 1066 moveto
-379 1066 lineto
-367 1054 lineto
-367 1042 lineto
-379 1030 lineto
-501 1030 lineto
-513 1042 lineto
-513 1054 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 501 1066 moveto
-379 1066 lineto
-367 1054 lineto
-367 1042 lineto
-379 1030 lineto
-501 1030 lineto
-513 1042 lineto
-513 1054 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 379 1066 moveto
-373 1066 367 1060 367 1054 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 379 1066 moveto
-373 1066 367 1060 367 1054 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 367 1042 moveto
-367 1036 373 1030 379 1030 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 367 1042 moveto
-367 1036 373 1030 379 1030 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 501 1030 moveto
-507 1030 513 1036 513 1042 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 501 1030 moveto
-507 1030 513 1036 513 1042 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 513 1054 moveto
-513 1060 507 1066 501 1066 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 513 1054 moveto
-513 1060 507 1066 501 1066 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 501 1066 moveto
-379 1066 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 379 1066 moveto
-373 1066 367 1060 367 1054 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 367 1054 moveto
-367 1042 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 367 1042 moveto
-367 1036 373 1030 379 1030 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 379 1030 moveto
-501 1030 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 501 1030 moveto
-507 1030 513 1036 513 1042 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 513 1042 moveto
-513 1054 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 513 1054 moveto
-513 1060 507 1066 501 1066 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-375 1044.4 moveto 130 (InMemoryHashJoin) alignedtext
-grestore
-% 066a993b-57b5-47ad-8a18-fef27b8e16f4
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 511 1164 moveto
-369 1164 lineto
-357 1152 lineto
-357 1132 lineto
-369 1120 lineto
-511 1120 lineto
-523 1132 lineto
-523 1152 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 511 1164 moveto
-369 1164 lineto
-357 1152 lineto
-357 1132 lineto
-369 1120 lineto
-511 1120 lineto
-523 1132 lineto
-523 1152 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 369 1164 moveto
-363 1164 357 1158 357 1152 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 369 1164 moveto
-363 1164 357 1158 357 1152 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 357 1132 moveto
-357 1126 363 1120 369 1120 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 357 1132 moveto
-357 1126 363 1120 369 1120 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 511 1120 moveto
-517 1120 523 1126 523 1132 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 511 1120 moveto
-517 1120 523 1126 523 1132 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 523 1152 moveto
-523 1158 517 1164 511 1164 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 523 1152 moveto
-523 1158 517 1164 511 1164 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 511 1164 moveto
-369 1164 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 369 1164 moveto
-363 1164 357 1158 357 1152 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 357 1152 moveto
-357 1132 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 357 1132 moveto
-357 1126 363 1120 369 1120 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 369 1120 moveto
-511 1120 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 511 1120 moveto
-517 1120 523 1126 523 1132 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 523 1132 moveto
-523 1152 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 523 1152 moveto
-523 1158 517 1164 511 1164 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-405 1147.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-364.5 1129.4 moveto 151 (\(assign,stream-select\)) alignedtext
-grestore
-% c6fc141b-034f-42db-bb33-a2059731e990->066a993b-57b5-47ad-8a18-fef27b8e16f4
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 440 1066.12 moveto
-440 1078.49 440 1095.2 440 1109.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 436.5 1109.96 moveto
-440 1119.96 lineto
-443.5 1109.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 436.5 1109.96 moveto
-440 1119.96 lineto
-443.5 1109.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-440 1089.4 moveto 23 (1:1) alignedtext
-grestore
-% bb03494d-e0a9-4898-8b80-64c54da6a20c
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 561 788 moveto
-471 788 lineto
-459 776 lineto
-459 764 lineto
-471 752 lineto
-561 752 lineto
-573 764 lineto
-573 776 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 561 788 moveto
-471 788 lineto
-459 776 lineto
-459 764 lineto
-471 752 lineto
-561 752 lineto
-573 764 lineto
-573 776 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 471 788 moveto
-465 788 459 782 459 776 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 471 788 moveto
-465 788 459 782 459 776 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 459 764 moveto
-459 758 465 752 471 752 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 459 764 moveto
-459 758 465 752 471 752 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 561 752 moveto
-567 752 573 758 573 764 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 561 752 moveto
-567 752 573 758 573 764 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 573 776 moveto
-573 782 567 788 561 788 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 573 776 moveto
-573 782 567 788 561 788 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 561 788 moveto
-471 788 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 471 788 moveto
-465 788 459 782 459 776 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 459 776 moveto
-459 764 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 459 764 moveto
-459 758 465 752 471 752 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 471 752 moveto
-561 752 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 561 752 moveto
-567 752 573 758 573 764 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 573 764 moveto
-573 776 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 573 776 moveto
-573 782 567 788 561 788 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-466.5 766.4 moveto 99 (InMemorySort) alignedtext
-grestore
-% 785d1650-a0b5-4f63-bfca-fe68d292c294
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 572 878 moveto
-450 878 lineto
-438 866 lineto
-438 854 lineto
-450 842 lineto
-572 842 lineto
-584 854 lineto
-584 866 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 572 878 moveto
-450 878 lineto
-438 866 lineto
-438 854 lineto
-450 842 lineto
-572 842 lineto
-584 854 lineto
-584 866 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 450 878 moveto
-444 878 438 872 438 866 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 450 878 moveto
-444 878 438 872 438 866 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 438 854 moveto
-438 848 444 842 450 842 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 438 854 moveto
-438 848 444 842 450 842 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 572 842 moveto
-578 842 584 848 584 854 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 572 842 moveto
-578 842 584 848 584 854 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 584 866 moveto
-584 872 578 878 572 878 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 584 866 moveto
-584 872 578 878 572 878 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 572 878 moveto
-450 878 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 450 878 moveto
-444 878 438 872 438 866 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 438 866 moveto
-438 854 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 438 854 moveto
-438 848 444 842 450 842 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 450 842 moveto
-572 842 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 572 842 moveto
-578 842 584 848 584 854 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 584 854 moveto
-584 866 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 584 866 moveto
-584 872 578 878 572 878 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-446 856.4 moveto 130 (PreclusteredGroup) alignedtext
-grestore
-% bb03494d-e0a9-4898-8b80-64c54da6a20c->785d1650-a0b5-4f63-bfca-fe68d292c294
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 514.99 788.21 moveto
-514.3 800.66 513.37 817.39 512.58 831.58 curveto
-stroke
-0 0 0 edgecolor
-newpath 509.07 831.64 moveto
-512.01 841.81 lineto
-516.06 832.02 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 509.07 831.64 moveto
-512.01 841.81 lineto
-516.06 832.02 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-513 811.4 moveto 23 (1:1) alignedtext
-grestore
-% 4acb8f1a-23ab-474b-9571-8ab12f5aef41
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 656 1540 moveto
-534 1540 lineto
-522 1528 lineto
-522 1516 lineto
-534 1504 lineto
-656 1504 lineto
-668 1516 lineto
-668 1528 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 656 1540 moveto
-534 1540 lineto
-522 1528 lineto
-522 1516 lineto
-534 1504 lineto
-656 1504 lineto
-668 1516 lineto
-668 1528 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 534 1540 moveto
-528 1540 522 1534 522 1528 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 534 1540 moveto
-528 1540 522 1534 522 1528 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 522 1516 moveto
-522 1510 528 1504 534 1504 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 522 1516 moveto
-522 1510 528 1504 534 1504 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 656 1504 moveto
-662 1504 668 1510 668 1516 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 656 1504 moveto
-662 1504 668 1510 668 1516 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 668 1528 moveto
-668 1534 662 1540 656 1540 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 668 1528 moveto
-668 1534 662 1540 656 1540 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 656 1540 moveto
-534 1540 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 534 1540 moveto
-528 1540 522 1534 522 1528 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 522 1528 moveto
-522 1516 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 522 1516 moveto
-522 1510 528 1504 534 1504 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 534 1504 moveto
-656 1504 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 656 1504 moveto
-662 1504 668 1510 668 1516 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 668 1516 moveto
-668 1528 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 668 1528 moveto
-668 1534 662 1540 656 1540 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-530 1518.4 moveto 130 (InMemoryHashJoin) alignedtext
-grestore
-% a14d6687-2c52-41f9-95ed-ab9f4b451180
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 670 1638 moveto
-520 1638 lineto
-508 1626 lineto
-508 1606 lineto
-520 1594 lineto
-670 1594 lineto
-682 1606 lineto
-682 1626 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 670 1638 moveto
-520 1638 lineto
-508 1626 lineto
-508 1606 lineto
-520 1594 lineto
-670 1594 lineto
-682 1606 lineto
-682 1626 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 520 1638 moveto
-514 1638 508 1632 508 1626 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 520 1638 moveto
-514 1638 508 1632 508 1626 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 508 1606 moveto
-508 1600 514 1594 520 1594 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 508 1606 moveto
-508 1600 514 1594 520 1594 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 670 1594 moveto
-676 1594 682 1600 682 1606 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 670 1594 moveto
-676 1594 682 1600 682 1606 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 682 1626 moveto
-682 1632 676 1638 670 1638 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 682 1626 moveto
-682 1632 676 1638 670 1638 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 670 1638 moveto
-520 1638 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 520 1638 moveto
-514 1638 508 1632 508 1626 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 508 1626 moveto
-508 1606 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 508 1606 moveto
-508 1600 514 1594 520 1594 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 520 1594 moveto
-670 1594 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 670 1594 moveto
-676 1594 682 1600 682 1606 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 682 1606 moveto
-682 1626 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 682 1626 moveto
-682 1632 676 1638 670 1638 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-560 1621.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-515.5 1603.4 moveto 159 (\(assign,stream-project\)) alignedtext
-grestore
-% 4acb8f1a-23ab-474b-9571-8ab12f5aef41->a14d6687-2c52-41f9-95ed-ab9f4b451180
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 595 1540.12 moveto
-595 1552.49 595 1569.2 595 1583.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 591.5 1583.96 moveto
-595 1593.96 lineto
-598.5 1583.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 591.5 1583.96 moveto
-595 1593.96 lineto
-598.5 1583.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-595 1563.4 moveto 23 (1:1) alignedtext
-grestore
-% 19350ade-da75-4a1d-90e7-4f6753ef2732
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 630 232 moveto
-532 232 lineto
-520 220 lineto
-520 200 lineto
-532 188 lineto
-630 188 lineto
-642 200 lineto
-642 220 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 630 232 moveto
-532 232 lineto
-520 220 lineto
-520 200 lineto
-532 188 lineto
-630 188 lineto
-642 200 lineto
-642 220 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 532 232 moveto
-526 232 520 226 520 220 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 532 232 moveto
-526 232 520 226 520 220 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 520 200 moveto
-520 194 526 188 532 188 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 520 200 moveto
-520 194 526 188 532 188 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 630 188 moveto
-636 188 642 194 642 200 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 630 188 moveto
-636 188 642 194 642 200 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 642 220 moveto
-642 226 636 232 630 232 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 642 220 moveto
-642 226 636 232 630 232 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 630 232 moveto
-532 232 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 532 232 moveto
-526 232 520 226 520 220 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 520 220 moveto
-520 200 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 520 200 moveto
-520 194 526 188 532 188 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 532 188 moveto
-630 188 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 630 188 moveto
-636 188 642 194 642 200 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 642 200 moveto
-642 220 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 642 220 moveto
-642 226 636 232 630 232 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-546 215.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-528 197.4 moveto 106 (\(assign,unnest\)) alignedtext
-grestore
-% 66f6f703-1a20-40b2-a3a3-514412cabb03
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 616 322 moveto
-546 322 lineto
-534 310 lineto
-534 298 lineto
-546 286 lineto
-616 286 lineto
-628 298 lineto
-628 310 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 616 322 moveto
-546 322 lineto
-534 310 lineto
-534 298 lineto
-546 286 lineto
-616 286 lineto
-628 298 lineto
-628 310 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 546 322 moveto
-540 322 534 316 534 310 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 546 322 moveto
-540 322 534 316 534 310 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 534 298 moveto
-534 292 540 286 546 286 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 534 298 moveto
-534 292 540 286 546 286 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 616 286 moveto
-622 286 628 292 628 298 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 616 286 moveto
-622 286 628 292 628 298 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 628 310 moveto
-628 316 622 322 616 322 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 628 310 moveto
-628 316 622 322 616 322 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 616 322 moveto
-546 322 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 546 322 moveto
-540 322 534 316 534 310 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 534 310 moveto
-534 298 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 534 298 moveto
-534 292 540 286 546 286 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 546 286 moveto
-616 286 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 616 286 moveto
-622 286 628 292 628 298 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 628 298 moveto
-628 310 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 628 310 moveto
-628 316 622 322 616 322 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-542 300.4 moveto 78 (HashGroup) alignedtext
-grestore
-% 19350ade-da75-4a1d-90e7-4f6753ef2732->66f6f703-1a20-40b2-a3a3-514412cabb03
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 581 232.28 moveto
-581 245.34 581 261.97 581 275.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 577.5 275.97 moveto
-581 285.97 lineto
-584.5 275.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 577.5 275.97 moveto
-581 285.97 lineto
-584.5 275.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-581 255.4 moveto 23 (1:1) alignedtext
-grestore
-% 421e3891-f7b0-4a50-a1d0-5c82099823f2
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 523 976 moveto
-461 976 lineto
-449 964 lineto
-449 944 lineto
-461 932 lineto
-523 932 lineto
-535 944 lineto
-535 964 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 523 976 moveto
-461 976 lineto
-449 964 lineto
-449 944 lineto
-461 932 lineto
-523 932 lineto
-535 944 lineto
-535 964 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 461 976 moveto
-455 976 449 970 449 964 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 461 976 moveto
-455 976 449 970 449 964 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 449 944 moveto
-449 938 455 932 461 932 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 449 944 moveto
-449 938 455 932 461 932 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 523 932 moveto
-529 932 535 938 535 944 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 523 932 moveto
-529 932 535 938 535 944 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 535 964 moveto
-535 970 529 976 523 976 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 535 964 moveto
-535 970 529 976 523 976 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 523 976 moveto
-461 976 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 461 976 moveto
-455 976 449 970 449 964 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 449 964 moveto
-449 944 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 449 944 moveto
-449 938 455 932 461 932 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 461 932 moveto
-523 932 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 523 932 moveto
-529 932 535 938 535 944 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 535 944 moveto
-535 964 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 535 964 moveto
-535 970 529 976 523 976 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-457 959.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-462.5 941.4 moveto 59 (\(unnest\)) alignedtext
-grestore
-% 421e3891-f7b0-4a50-a1d0-5c82099823f2->c6fc141b-034f-42db-bb33-a2059731e990
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 482.2 976.13 moveto
-477.11 987.1 470.6 1000.45 464 1012 curveto
-462.23 1015.09 460.3 1018.28 458.31 1021.41 curveto
-stroke
-0 0 0 edgecolor
-newpath 455.25 1019.71 moveto
-452.71 1029.99 lineto
-461.11 1023.54 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 455.25 1019.71 moveto
-452.71 1029.99 lineto
-461.11 1023.54 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-473 999.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 21db32ee-7d3e-42f5-9541-2145ef2e55e2
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 374 698 moveto
-252 698 lineto
-240 686 lineto
-240 674 lineto
-252 662 lineto
-374 662 lineto
-386 674 lineto
-386 686 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 374 698 moveto
-252 698 lineto
-240 686 lineto
-240 674 lineto
-252 662 lineto
-374 662 lineto
-386 674 lineto
-386 686 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 252 698 moveto
-246 698 240 692 240 686 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 252 698 moveto
-246 698 240 692 240 686 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 240 674 moveto
-240 668 246 662 252 662 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 240 674 moveto
-240 668 246 662 252 662 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 374 662 moveto
-380 662 386 668 386 674 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 374 662 moveto
-380 662 386 668 386 674 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 386 686 moveto
-386 692 380 698 374 698 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 386 686 moveto
-386 692 380 698 374 698 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 374 698 moveto
-252 698 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 252 698 moveto
-246 698 240 692 240 686 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 240 686 moveto
-240 674 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 240 674 moveto
-240 668 246 662 252 662 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 252 662 moveto
-374 662 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 374 662 moveto
-380 662 386 668 386 674 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 386 674 moveto
-386 686 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 386 686 moveto
-386 692 380 698 374 698 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-248 676.4 moveto 130 (InMemoryHashJoin) alignedtext
-grestore
-% 098774e6-f5a6-4fa0-b3cc-a195761bd957
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 385 788 moveto
-295 788 lineto
-283 776 lineto
-283 764 lineto
-295 752 lineto
-385 752 lineto
-397 764 lineto
-397 776 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 385 788 moveto
-295 788 lineto
-283 776 lineto
-283 764 lineto
-295 752 lineto
-385 752 lineto
-397 764 lineto
-397 776 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 295 788 moveto
-289 788 283 782 283 776 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 295 788 moveto
-289 788 283 782 283 776 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 283 764 moveto
-283 758 289 752 295 752 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 283 764 moveto
-283 758 289 752 295 752 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 385 752 moveto
-391 752 397 758 397 764 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 385 752 moveto
-391 752 397 758 397 764 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 397 776 moveto
-397 782 391 788 385 788 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 397 776 moveto
-397 782 391 788 385 788 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 385 788 moveto
-295 788 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 295 788 moveto
-289 788 283 782 283 776 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 283 776 moveto
-283 764 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 283 764 moveto
-283 758 289 752 295 752 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 295 752 moveto
-385 752 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 385 752 moveto
-391 752 397 758 397 764 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 397 764 moveto
-397 776 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 397 776 moveto
-397 782 391 788 385 788 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-290.5 766.4 moveto 99 (InMemorySort) alignedtext
-grestore
-% 21db32ee-7d3e-42f5-9541-2145ef2e55e2->098774e6-f5a6-4fa0-b3cc-a195761bd957
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 318.46 698.21 moveto
-322.23 710.78 327.32 727.72 331.6 742 curveto
-stroke
-0 0 0 edgecolor
-newpath 328.32 743.24 moveto
-334.54 751.81 lineto
-335.02 741.23 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 328.32 743.24 moveto
-334.54 751.81 lineto
-335.02 741.23 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-328 721.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% ac276d4f-0bd6-468e-b314-da000f9141ea
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 576 1450 moveto
-472 1450 lineto
-460 1438 lineto
-460 1418 lineto
-472 1406 lineto
-576 1406 lineto
-588 1418 lineto
-588 1438 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 576 1450 moveto
-472 1450 lineto
-460 1438 lineto
-460 1418 lineto
-472 1406 lineto
-576 1406 lineto
-588 1418 lineto
-588 1438 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 472 1450 moveto
-466 1450 460 1444 460 1438 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 472 1450 moveto
-466 1450 460 1444 460 1438 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 460 1418 moveto
-460 1412 466 1406 472 1406 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 460 1418 moveto
-460 1412 466 1406 472 1406 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 576 1406 moveto
-582 1406 588 1412 588 1418 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 576 1406 moveto
-582 1406 588 1412 588 1418 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 588 1438 moveto
-588 1444 582 1450 576 1450 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 588 1438 moveto
-588 1444 582 1450 576 1450 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 576 1450 moveto
-472 1450 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 472 1450 moveto
-466 1450 460 1444 460 1438 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 460 1438 moveto
-460 1418 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 460 1418 moveto
-460 1412 466 1406 472 1406 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 472 1406 moveto
-576 1406 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 576 1406 moveto
-582 1406 588 1412 588 1418 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 588 1418 moveto
-588 1438 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 588 1438 moveto
-588 1444 582 1450 576 1450 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-489 1433.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-468 1415.4 moveto 112 (\(stream-project\)) alignedtext
-grestore
-% 99f0eeb6-d9f2-4af1-9b1b-6f0df7870db8->ac276d4f-0bd6-468e-b314-da000f9141ea
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 523.19 1348.43 moveto
-523.32 1361.68 523.51 1379.88 523.67 1395.54 curveto
-stroke
-0 0 0 edgecolor
-newpath 520.17 1395.91 moveto
-523.77 1405.88 lineto
-527.17 1395.84 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 520.17 1395.91 moveto
-523.77 1405.88 lineto
-527.17 1395.84 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-523 1375.4 moveto 23 (1:1) alignedtext
-grestore
-% 0066c7f5-f720-4098-8908-bebee74a409d
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 696 1446 moveto
-618 1446 lineto
-606 1434 lineto
-606 1422 lineto
-618 1410 lineto
-696 1410 lineto
-708 1422 lineto
-708 1434 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 696 1446 moveto
-618 1446 lineto
-606 1434 lineto
-606 1422 lineto
-618 1410 lineto
-696 1410 lineto
-708 1422 lineto
-708 1434 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 618 1446 moveto
-612 1446 606 1440 606 1434 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 618 1446 moveto
-612 1446 606 1440 606 1434 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 606 1422 moveto
-606 1416 612 1410 618 1410 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 606 1422 moveto
-606 1416 612 1410 618 1410 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 696 1410 moveto
-702 1410 708 1416 708 1422 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 696 1410 moveto
-702 1410 708 1416 708 1422 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 708 1434 moveto
-708 1440 702 1446 696 1446 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 708 1434 moveto
-708 1440 702 1446 696 1446 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 696 1446 moveto
-618 1446 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 618 1446 moveto
-612 1446 606 1440 606 1434 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 606 1434 moveto
-606 1422 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 606 1422 moveto
-606 1416 612 1410 618 1410 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 618 1410 moveto
-696 1410 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 696 1410 moveto
-702 1410 708 1416 708 1422 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 708 1422 moveto
-708 1434 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 708 1434 moveto
-708 1440 702 1446 696 1446 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-613.5 1424.4 moveto 87 (BTreeSearch) alignedtext
-grestore
-% 0066c7f5-f720-4098-8908-bebee74a409d->4acb8f1a-23ab-474b-9571-8ab12f5aef41
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 645.05 1446.12 moveto
-635.87 1460.04 623.05 1479.47 612.69 1495.18 curveto
-stroke
-0 0 0 edgecolor
-newpath 609.5 1493.66 moveto
-606.92 1503.93 lineto
-615.35 1497.51 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 609.5 1493.66 moveto
-606.92 1503.93 lineto
-615.35 1497.51 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-629 1473.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% b504c4ff-8226-43c2-b06f-a9ad59e54312
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 616 416 moveto
-546 416 lineto
-534 404 lineto
-534 392 lineto
-546 380 lineto
-616 380 lineto
-628 392 lineto
-628 404 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 616 416 moveto
-546 416 lineto
-534 404 lineto
-534 392 lineto
-546 380 lineto
-616 380 lineto
-628 392 lineto
-628 404 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 546 416 moveto
-540 416 534 410 534 404 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 546 416 moveto
-540 416 534 410 534 404 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 534 392 moveto
-534 386 540 380 546 380 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 534 392 moveto
-534 386 540 380 546 380 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 616 380 moveto
-622 380 628 386 628 392 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 616 380 moveto
-622 380 628 386 628 392 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 628 404 moveto
-628 410 622 416 616 416 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 628 404 moveto
-628 410 622 416 616 416 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 616 416 moveto
-546 416 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 546 416 moveto
-540 416 534 410 534 404 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 534 404 moveto
-534 392 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 534 392 moveto
-534 386 540 380 546 380 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 546 380 moveto
-616 380 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 616 380 moveto
-622 380 628 386 628 392 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 628 392 moveto
-628 404 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 628 404 moveto
-628 410 622 416 616 416 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-542 394.4 moveto 78 (HashGroup) alignedtext
-grestore
-% 9c797900-e6cf-44ad-b5e3-869e56fd27ba
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 626 510 moveto
-536 510 lineto
-524 498 lineto
-524 486 lineto
-536 474 lineto
-626 474 lineto
-638 486 lineto
-638 498 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 626 510 moveto
-536 510 lineto
-524 498 lineto
-524 486 lineto
-536 474 lineto
-626 474 lineto
-638 486 lineto
-638 498 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 536 510 moveto
-530 510 524 504 524 498 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 536 510 moveto
-530 510 524 504 524 498 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 524 486 moveto
-524 480 530 474 536 474 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 524 486 moveto
-524 480 530 474 536 474 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 626 474 moveto
-632 474 638 480 638 486 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 626 474 moveto
-632 474 638 480 638 486 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 638 498 moveto
-638 504 632 510 626 510 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 638 498 moveto
-638 504 632 510 626 510 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 626 510 moveto
-536 510 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 536 510 moveto
-530 510 524 504 524 498 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 524 498 moveto
-524 486 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 524 486 moveto
-524 480 530 474 536 474 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 536 474 moveto
-626 474 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 626 474 moveto
-632 474 638 480 638 486 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 638 486 moveto
-638 498 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 638 498 moveto
-638 504 632 510 626 510 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-531.5 488.4 moveto 99 (InMemorySort) alignedtext
-grestore
-% b504c4ff-8226-43c2-b06f-a9ad59e54312->9c797900-e6cf-44ad-b5e3-869e56fd27ba
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 581 416.12 moveto
-581 429.65 581 448.38 581 463.85 curveto
-stroke
-0 0 0 edgecolor
-newpath 577.5 463.93 moveto
-581 473.93 lineto
-584.5 463.93 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 577.5 463.93 moveto
-581 473.93 lineto
-584.5 463.93 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-581 443.4 moveto 23 (1:1) alignedtext
-grestore
-% f22b2397-d586-4894-8709-99da302fdc56
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 631 1736 moveto
-559 1736 lineto
-547 1724 lineto
-547 1704 lineto
-559 1692 lineto
-631 1692 lineto
-643 1704 lineto
-643 1724 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 631 1736 moveto
-559 1736 lineto
-547 1724 lineto
-547 1704 lineto
-559 1692 lineto
-631 1692 lineto
-643 1704 lineto
-643 1724 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 559 1736 moveto
-553 1736 547 1730 547 1724 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 559 1736 moveto
-553 1736 547 1730 547 1724 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 547 1704 moveto
-547 1698 553 1692 559 1692 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 547 1704 moveto
-547 1698 553 1692 559 1692 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 631 1692 moveto
-637 1692 643 1698 643 1704 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 631 1692 moveto
-637 1692 643 1698 643 1704 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 643 1724 moveto
-643 1730 637 1736 631 1736 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 643 1724 moveto
-643 1730 637 1736 631 1736 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 631 1736 moveto
-559 1736 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 559 1736 moveto
-553 1736 547 1730 547 1724 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 547 1724 moveto
-547 1704 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 547 1704 moveto
-547 1698 553 1692 559 1692 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 559 1692 moveto
-631 1692 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 631 1692 moveto
-637 1692 643 1698 643 1704 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 643 1704 moveto
-643 1724 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 643 1724 moveto
-643 1730 637 1736 631 1736 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-560 1719.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-554.5 1701.4 moveto 81 (\(sink-write\)) alignedtext
-grestore
-% a14d6687-2c52-41f9-95ed-ab9f4b451180->f22b2397-d586-4894-8709-99da302fdc56
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 595 1638.24 moveto
-595 1651.02 595 1667.3 595 1681.5 curveto
-stroke
-0 0 0 edgecolor
-newpath 591.5 1681.85 moveto
-595 1691.85 lineto
-598.5 1681.85 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 591.5 1681.85 moveto
-595 1691.85 lineto
-598.5 1681.85 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-595 1661.4 moveto 94 (M:N Replicate) alignedtext
-grestore
-% 785d1650-a0b5-4f63-bfca-fe68d292c294->421e3891-f7b0-4a50-a1d0-5c82099823f2
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 507.34 878.12 moveto
-504.84 890.49 501.46 907.2 498.51 921.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 495.01 921.47 moveto
-496.45 931.96 lineto
-501.87 922.85 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 495.01 921.47 moveto
-496.45 931.96 lineto
-501.87 922.85 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-503 901.4 moveto 23 (1:1) alignedtext
-grestore
-% 66f6f703-1a20-40b2-a3a3-514412cabb03->b504c4ff-8226-43c2-b06f-a9ad59e54312
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 581 322.12 moveto
-581 335.65 581 354.38 581 369.85 curveto
-stroke
-0 0 0 edgecolor
-newpath 577.5 369.93 moveto
-581 379.93 lineto
-584.5 369.93 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 577.5 369.93 moveto
-581 379.93 lineto
-584.5 369.93 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-581 345.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% c66e50f0-f068-43fd-833e-32f9b6117f2f
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 612 44 moveto
-550 44 lineto
-538 32 lineto
-538 12 lineto
-550 0 lineto
-612 0 lineto
-624 12 lineto
-624 32 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 612 44 moveto
-550 44 lineto
-538 32 lineto
-538 12 lineto
-550 0 lineto
-612 0 lineto
-624 12 lineto
-624 32 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 550 44 moveto
-544 44 538 38 538 32 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 550 44 moveto
-544 44 538 38 538 32 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 538 12 moveto
-538 6 544 0 550 0 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 538 12 moveto
-538 6 544 0 550 0 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 612 0 moveto
-618 0 624 6 624 12 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 612 0 moveto
-618 0 624 6 624 12 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 624 32 moveto
-624 38 618 44 612 44 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 624 32 moveto
-624 38 618 44 612 44 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 612 44 moveto
-550 44 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 550 44 moveto
-544 44 538 38 538 32 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 538 32 moveto
-538 12 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 538 12 moveto
-538 6 544 0 550 0 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 550 0 moveto
-612 0 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 612 0 moveto
-618 0 624 6 624 12 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 624 12 moveto
-624 32 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 624 32 moveto
-624 38 618 44 612 44 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-546 27.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-565 9.4 moveto 32 (\(ets\)) alignedtext
-grestore
-% e0d76180-55c0-41db-9d4e-b0b80eed3922
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 620 134 moveto
-542 134 lineto
-530 122 lineto
-530 110 lineto
-542 98 lineto
-620 98 lineto
-632 110 lineto
-632 122 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 620 134 moveto
-542 134 lineto
-530 122 lineto
-530 110 lineto
-542 98 lineto
-620 98 lineto
-632 110 lineto
-632 122 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 542 134 moveto
-536 134 530 128 530 122 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 542 134 moveto
-536 134 530 128 530 122 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 530 110 moveto
-530 104 536 98 542 98 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 530 110 moveto
-530 104 536 98 542 98 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 620 98 moveto
-626 98 632 104 632 110 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 620 98 moveto
-626 98 632 104 632 110 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 632 122 moveto
-632 128 626 134 620 134 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 632 122 moveto
-632 128 626 134 620 134 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 620 134 moveto
-542 134 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 542 134 moveto
-536 134 530 128 530 122 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 530 122 moveto
-530 110 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 530 110 moveto
-530 104 536 98 542 98 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 542 98 moveto
-620 98 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 620 98 moveto
-626 98 632 104 632 110 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 632 110 moveto
-632 122 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 632 122 moveto
-632 128 626 134 620 134 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-537.5 112.4 moveto 87 (BTreeSearch) alignedtext
-grestore
-% c66e50f0-f068-43fd-833e-32f9b6117f2f->e0d76180-55c0-41db-9d4e-b0b80eed3922
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 581 44.28 moveto
-581 57.34 581 73.97 581 87.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 577.5 87.97 moveto
-581 97.97 lineto
-584.5 87.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 577.5 87.97 moveto
-581 97.97 lineto
-584.5 87.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-581 67.4 moveto 23 (1:1) alignedtext
-grestore
-% 1da790c0-ca3c-4833-8280-5c7c2d0ac23c
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 694 608 moveto
-468 608 lineto
-456 596 lineto
-456 576 lineto
-468 564 lineto
-694 564 lineto
-706 576 lineto
-706 596 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 694 608 moveto
-468 608 lineto
-456 596 lineto
-456 576 lineto
-468 564 lineto
-694 564 lineto
-706 576 lineto
-706 596 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 468 608 moveto
-462 608 456 602 456 596 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 468 608 moveto
-462 608 456 602 456 596 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 456 576 moveto
-456 570 462 564 468 564 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 456 576 moveto
-456 570 462 564 468 564 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 694 564 moveto
-700 564 706 570 706 576 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 694 564 moveto
-700 564 706 570 706 576 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 706 596 moveto
-706 602 700 608 694 608 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 706 596 moveto
-706 602 700 608 694 608 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 694 608 moveto
-468 608 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 468 608 moveto
-462 608 456 602 456 596 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 456 596 moveto
-456 576 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 456 576 moveto
-456 570 462 564 468 564 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 468 564 moveto
-694 564 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 694 564 moveto
-700 564 706 570 706 576 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 706 576 moveto
-706 596 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 706 596 moveto
-706 602 700 608 694 608 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-546 591.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-463.5 573.4 moveto 235 (\(assign,running-aggregate,assign\)) alignedtext
-grestore
-% d966ca1f-a412-4b20-96cf-0b8b6c64df9c
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 642 698 moveto
-520 698 lineto
-508 686 lineto
-508 674 lineto
-520 662 lineto
-642 662 lineto
-654 674 lineto
-654 686 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 642 698 moveto
-520 698 lineto
-508 686 lineto
-508 674 lineto
-520 662 lineto
-642 662 lineto
-654 674 lineto
-654 686 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 520 698 moveto
-514 698 508 692 508 686 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 520 698 moveto
-514 698 508 692 508 686 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 508 674 moveto
-508 668 514 662 520 662 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 508 674 moveto
-508 668 514 662 520 662 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 642 662 moveto
-648 662 654 668 654 674 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 642 662 moveto
-648 662 654 668 654 674 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 654 686 moveto
-654 692 648 698 642 698 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 654 686 moveto
-654 692 648 698 642 698 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 642 698 moveto
-520 698 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 520 698 moveto
-514 698 508 692 508 686 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 508 686 moveto
-508 674 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 508 674 moveto
-508 668 514 662 520 662 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 520 662 moveto
-642 662 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 642 662 moveto
-648 662 654 668 654 674 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 654 674 moveto
-654 686 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 654 686 moveto
-654 692 648 698 642 698 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-516 676.4 moveto 130 (InMemoryHashJoin) alignedtext
-grestore
-% 1da790c0-ca3c-4833-8280-5c7c2d0ac23c->d966ca1f-a412-4b20-96cf-0b8b6c64df9c
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 581 608.28 moveto
-581 621.34 581 637.97 581 651.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 577.5 651.97 moveto
-581 661.97 lineto
-584.5 651.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 577.5 651.97 moveto
-581 661.97 lineto
-584.5 651.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-581 631.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 13342363-c3c6-469c-80b6-356397c95f53
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 615 1164 moveto
-553 1164 lineto
-541 1152 lineto
-541 1132 lineto
-553 1120 lineto
-615 1120 lineto
-627 1132 lineto
-627 1152 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 615 1164 moveto
-553 1164 lineto
-541 1152 lineto
-541 1132 lineto
-553 1120 lineto
-615 1120 lineto
-627 1132 lineto
-627 1152 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 553 1164 moveto
-547 1164 541 1158 541 1152 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 553 1164 moveto
-547 1164 541 1158 541 1152 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 541 1132 moveto
-541 1126 547 1120 553 1120 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 541 1132 moveto
-541 1126 547 1120 553 1120 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 615 1120 moveto
-621 1120 627 1126 627 1132 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 615 1120 moveto
-621 1120 627 1126 627 1132 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 627 1152 moveto
-627 1158 621 1164 615 1164 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 627 1152 moveto
-627 1158 621 1164 615 1164 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 615 1164 moveto
-553 1164 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 553 1164 moveto
-547 1164 541 1158 541 1152 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 541 1152 moveto
-541 1132 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 541 1132 moveto
-541 1126 547 1120 553 1120 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 553 1120 moveto
-615 1120 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 615 1120 moveto
-621 1120 627 1126 627 1132 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 627 1132 moveto
-627 1152 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 627 1152 moveto
-627 1158 621 1164 615 1164 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-549 1147.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-568 1129.4 moveto 32 (\(ets\)) alignedtext
-grestore
-% 13342363-c3c6-469c-80b6-356397c95f53->ff24200a-c665-4ca3-baa8-09fd2ca0ae04
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 583.05 1164.28 moveto
-582.5 1177.34 581.79 1193.97 581.19 1207.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 577.7 1207.84 moveto
-580.77 1217.97 lineto
-584.69 1208.13 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 577.7 1207.84 moveto
-580.77 1217.97 lineto
-584.69 1208.13 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-582 1187.4 moveto 23 (1:1) alignedtext
-grestore
-% 769e1d5c-5b5b-4437-8764-a6e0bcf8d210
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 496 1254 moveto
-426 1254 lineto
-414 1242 lineto
-414 1230 lineto
-426 1218 lineto
-496 1218 lineto
-508 1230 lineto
-508 1242 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 496 1254 moveto
-426 1254 lineto
-414 1242 lineto
-414 1230 lineto
-426 1218 lineto
-496 1218 lineto
-508 1230 lineto
-508 1242 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 426 1254 moveto
-420 1254 414 1248 414 1242 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 426 1254 moveto
-420 1254 414 1248 414 1242 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 414 1230 moveto
-414 1224 420 1218 426 1218 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 414 1230 moveto
-414 1224 420 1218 426 1218 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 496 1218 moveto
-502 1218 508 1224 508 1230 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 496 1218 moveto
-502 1218 508 1224 508 1230 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 508 1242 moveto
-508 1248 502 1254 496 1254 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 508 1242 moveto
-508 1248 502 1254 496 1254 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 496 1254 moveto
-426 1254 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 426 1254 moveto
-420 1254 414 1248 414 1242 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 414 1242 moveto
-414 1230 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 414 1230 moveto
-414 1224 420 1218 426 1218 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 426 1218 moveto
-496 1218 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 496 1218 moveto
-502 1218 508 1224 508 1230 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 508 1230 moveto
-508 1242 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 508 1242 moveto
-508 1248 502 1254 496 1254 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-422 1232.4 moveto 78 (HashGroup) alignedtext
-grestore
-% 769e1d5c-5b5b-4437-8764-a6e0bcf8d210->99f0eeb6-d9f2-4af1-9b1b-6f0df7870db8
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 463.71 1254.09 moveto
-465.98 1265.13 470.02 1279.14 477 1290 curveto
-480.46 1295.37 484.84 1300.44 489.52 1305.04 curveto
-stroke
-0 0 0 edgecolor
-newpath 487.28 1307.73 moveto
-497.04 1311.87 lineto
-491.99 1302.55 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 487.28 1307.73 moveto
-497.04 1311.87 lineto
-491.99 1302.55 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-477 1277.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% da3da2a7-80c7-47a2-9d72-23b7c8f3d669
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 344 44 moveto
-282 44 lineto
-270 32 lineto
-270 12 lineto
-282 0 lineto
-344 0 lineto
-356 12 lineto
-356 32 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 344 44 moveto
-282 44 lineto
-270 32 lineto
-270 12 lineto
-282 0 lineto
-344 0 lineto
-356 12 lineto
-356 32 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 282 44 moveto
-276 44 270 38 270 32 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 282 44 moveto
-276 44 270 38 270 32 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 270 12 moveto
-270 6 276 0 282 0 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 270 12 moveto
-270 6 276 0 282 0 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 344 0 moveto
-350 0 356 6 356 12 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 344 0 moveto
-350 0 356 6 356 12 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 356 32 moveto
-356 38 350 44 344 44 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 356 32 moveto
-356 38 350 44 344 44 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 344 44 moveto
-282 44 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 282 44 moveto
-276 44 270 38 270 32 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 270 32 moveto
-270 12 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 270 12 moveto
-270 6 276 0 282 0 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 282 0 moveto
-344 0 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 344 0 moveto
-350 0 356 6 356 12 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 356 12 moveto
-356 32 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 356 32 moveto
-356 38 350 44 344 44 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-278 27.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-297 9.4 moveto 32 (\(ets\)) alignedtext
-grestore
-% c49457b9-a4be-48d2-8e82-50820e0ca618
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 352 134 moveto
-274 134 lineto
-262 122 lineto
-262 110 lineto
-274 98 lineto
-352 98 lineto
-364 110 lineto
-364 122 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 352 134 moveto
-274 134 lineto
-262 122 lineto
-262 110 lineto
-274 98 lineto
-352 98 lineto
-364 110 lineto
-364 122 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 274 134 moveto
-268 134 262 128 262 122 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 274 134 moveto
-268 134 262 128 262 122 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 262 110 moveto
-262 104 268 98 274 98 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 262 110 moveto
-262 104 268 98 274 98 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 352 98 moveto
-358 98 364 104 364 110 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 352 98 moveto
-358 98 364 104 364 110 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 364 122 moveto
-364 128 358 134 352 134 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 364 122 moveto
-364 128 358 134 352 134 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 352 134 moveto
-274 134 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 274 134 moveto
-268 134 262 128 262 122 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 262 122 moveto
-262 110 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 262 110 moveto
-262 104 268 98 274 98 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 274 98 moveto
-352 98 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 352 98 moveto
-358 98 364 104 364 110 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 364 110 moveto
-364 122 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 364 122 moveto
-364 128 358 134 352 134 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-269.5 112.4 moveto 87 (BTreeSearch) alignedtext
-grestore
-% da3da2a7-80c7-47a2-9d72-23b7c8f3d669->c49457b9-a4be-48d2-8e82-50820e0ca618
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 313 44.28 moveto
-313 57.34 313 73.97 313 87.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 309.5 87.97 moveto
-313 97.97 lineto
-316.5 87.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 309.5 87.97 moveto
-313 97.97 lineto
-316.5 87.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-313 67.4 moveto 23 (1:1) alignedtext
-grestore
-% d966ca1f-a412-4b20-96cf-0b8b6c64df9c->bb03494d-e0a9-4898-8b80-64c54da6a20c
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 567.85 698.21 moveto
-558.42 711.27 545.58 729.05 535.03 743.65 curveto
-stroke
-0 0 0 edgecolor
-newpath 532.15 741.66 moveto
-529.13 751.81 lineto
-537.83 745.76 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 532.15 741.66 moveto
-529.13 751.81 lineto
-537.83 745.76 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-554 721.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% baa3f1d6-1425-4180-a1de-2878f16e95d5
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 415 976 moveto
-353 976 lineto
-341 964 lineto
-341 944 lineto
-353 932 lineto
-415 932 lineto
-427 944 lineto
-427 964 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 415 976 moveto
-353 976 lineto
-341 964 lineto
-341 944 lineto
-353 932 lineto
-415 932 lineto
-427 944 lineto
-427 964 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 353 976 moveto
-347 976 341 970 341 964 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 353 976 moveto
-347 976 341 970 341 964 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 341 944 moveto
-341 938 347 932 353 932 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 341 944 moveto
-341 938 347 932 353 932 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 415 932 moveto
-421 932 427 938 427 944 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 415 932 moveto
-421 932 427 938 427 944 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 427 964 moveto
-427 970 421 976 415 976 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 427 964 moveto
-427 970 421 976 415 976 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 415 976 moveto
-353 976 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 353 976 moveto
-347 976 341 970 341 964 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 341 964 moveto
-341 944 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 341 944 moveto
-341 938 347 932 353 932 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 353 932 moveto
-415 932 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 415 932 moveto
-421 932 427 938 427 944 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 427 944 moveto
-427 964 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 427 964 moveto
-427 970 421 976 415 976 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-349 959.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-354.5 941.4 moveto 59 (\(unnest\)) alignedtext
-grestore
-% baa3f1d6-1425-4180-a1de-2878f16e95d5->c6fc141b-034f-42db-bb33-a2059731e990
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 383.6 976.25 moveto
-384.31 987.64 386.66 1001.31 393 1012 curveto
-395.37 1015.99 398.36 1019.68 401.68 1023.07 curveto
-stroke
-0 0 0 edgecolor
-newpath 399.59 1025.9 moveto
-409.36 1029.99 lineto
-404.27 1020.7 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 399.59 1025.9 moveto
-409.36 1029.99 lineto
-404.27 1020.7 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-393 999.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 6582beec-b6c0-48cc-ab7e-a5f3fc92bfa9
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 840 420 moveto
-778 420 lineto
-766 408 lineto
-766 388 lineto
-778 376 lineto
-840 376 lineto
-852 388 lineto
-852 408 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 840 420 moveto
-778 420 lineto
-766 408 lineto
-766 388 lineto
-778 376 lineto
-840 376 lineto
-852 388 lineto
-852 408 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 778 420 moveto
-772 420 766 414 766 408 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 778 420 moveto
-772 420 766 414 766 408 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 766 388 moveto
-766 382 772 376 778 376 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 766 388 moveto
-766 382 772 376 778 376 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 840 376 moveto
-846 376 852 382 852 388 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 840 376 moveto
-846 376 852 382 852 388 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 852 408 moveto
-852 414 846 420 840 420 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 852 408 moveto
-852 414 846 420 840 420 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 840 420 moveto
-778 420 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 778 420 moveto
-772 420 766 414 766 408 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 766 408 moveto
-766 388 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 766 388 moveto
-766 382 772 376 778 376 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 778 376 moveto
-840 376 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 840 376 moveto
-846 376 852 382 852 388 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 852 388 moveto
-852 408 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 852 408 moveto
-852 414 846 420 840 420 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-774 403.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-793 385.4 moveto 32 (\(ets\)) alignedtext
-grestore
-% ede16f1d-7795-4cbc-a605-ccfd25b7bb98
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 848 510 moveto
-770 510 lineto
-758 498 lineto
-758 486 lineto
-770 474 lineto
-848 474 lineto
-860 486 lineto
-860 498 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 848 510 moveto
-770 510 lineto
-758 498 lineto
-758 486 lineto
-770 474 lineto
-848 474 lineto
-860 486 lineto
-860 498 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 770 510 moveto
-764 510 758 504 758 498 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 770 510 moveto
-764 510 758 504 758 498 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 758 486 moveto
-758 480 764 474 770 474 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 758 486 moveto
-758 480 764 474 770 474 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 848 474 moveto
-854 474 860 480 860 486 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 848 474 moveto
-854 474 860 480 860 486 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 860 498 moveto
-860 504 854 510 848 510 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 860 498 moveto
-860 504 854 510 848 510 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 848 510 moveto
-770 510 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 770 510 moveto
-764 510 758 504 758 498 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 758 498 moveto
-758 486 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 758 486 moveto
-758 480 764 474 770 474 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 770 474 moveto
-848 474 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 848 474 moveto
-854 474 860 480 860 486 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 860 486 moveto
-860 498 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 860 498 moveto
-860 504 854 510 848 510 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-765.5 488.4 moveto 87 (BTreeSearch) alignedtext
-grestore
-% 6582beec-b6c0-48cc-ab7e-a5f3fc92bfa9->ede16f1d-7795-4cbc-a605-ccfd25b7bb98
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 809 420.28 moveto
-809 433.34 809 449.97 809 463.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 805.5 463.97 moveto
-809 473.97 lineto
-812.5 463.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 805.5 463.97 moveto
-809 473.97 lineto
-812.5 463.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-809 443.4 moveto 23 (1:1) alignedtext
-grestore
-% da4389d3-57a0-41fa-973b-cfdedca126d4
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 408 878 moveto
-286 878 lineto
-274 866 lineto
-274 854 lineto
-286 842 lineto
-408 842 lineto
-420 854 lineto
-420 866 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 408 878 moveto
-286 878 lineto
-274 866 lineto
-274 854 lineto
-286 842 lineto
-408 842 lineto
-420 854 lineto
-420 866 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 286 878 moveto
-280 878 274 872 274 866 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 286 878 moveto
-280 878 274 872 274 866 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 274 854 moveto
-274 848 280 842 286 842 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 274 854 moveto
-274 848 280 842 286 842 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 408 842 moveto
-414 842 420 848 420 854 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 408 842 moveto
-414 842 420 848 420 854 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 420 866 moveto
-420 872 414 878 408 878 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 420 866 moveto
-420 872 414 878 408 878 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 408 878 moveto
-286 878 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 286 878 moveto
-280 878 274 872 274 866 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 274 866 moveto
-274 854 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 274 854 moveto
-274 848 280 842 286 842 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 286 842 moveto
-408 842 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 408 842 moveto
-414 842 420 848 420 854 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 420 854 moveto
-420 866 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 420 866 moveto
-420 872 414 878 408 878 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-282 856.4 moveto 130 (PreclusteredGroup) alignedtext
-grestore
-% da4389d3-57a0-41fa-973b-cfdedca126d4->baa3f1d6-1425-4180-a1de-2878f16e95d5
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 354.13 878.12 moveto
-359.1 890.73 365.84 907.86 371.66 922.65 curveto
-stroke
-0 0 0 edgecolor
-newpath 368.41 923.94 moveto
-375.33 931.96 lineto
-374.92 921.37 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 368.41 923.94 moveto
-375.33 931.96 lineto
-374.92 921.37 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-367 901.4 moveto 23 (1:1) alignedtext
-grestore
-% e0d76180-55c0-41db-9d4e-b0b80eed3922->19350ade-da75-4a1d-90e7-4f6753ef2732
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 581 134.12 moveto
-581 146.49 581 163.2 581 177.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 577.5 177.96 moveto
-581 187.96 lineto
-584.5 177.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 577.5 177.96 moveto
-581 187.96 lineto
-584.5 177.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-581 157.4 moveto 23 (1:1) alignedtext
-grestore
-% 36b24630-2bdf-47e2-ade4-21f95efde5a8
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 688 1352 moveto
-626 1352 lineto
-614 1340 lineto
-614 1320 lineto
-626 1308 lineto
-688 1308 lineto
-700 1320 lineto
-700 1340 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 688 1352 moveto
-626 1352 lineto
-614 1340 lineto
-614 1320 lineto
-626 1308 lineto
-688 1308 lineto
-700 1320 lineto
-700 1340 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 626 1352 moveto
-620 1352 614 1346 614 1340 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 626 1352 moveto
-620 1352 614 1346 614 1340 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 614 1320 moveto
-614 1314 620 1308 626 1308 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 614 1320 moveto
-614 1314 620 1308 626 1308 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 688 1308 moveto
-694 1308 700 1314 700 1320 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 688 1308 moveto
-694 1308 700 1314 700 1320 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 700 1340 moveto
-700 1346 694 1352 688 1352 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 700 1340 moveto
-700 1346 694 1352 688 1352 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 688 1352 moveto
-626 1352 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 626 1352 moveto
-620 1352 614 1346 614 1340 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 614 1340 moveto
-614 1320 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 614 1320 moveto
-614 1314 620 1308 626 1308 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 626 1308 moveto
-688 1308 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 688 1308 moveto
-694 1308 700 1314 700 1320 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 700 1320 moveto
-700 1340 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 700 1340 moveto
-700 1346 694 1352 688 1352 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-622 1335.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-641 1317.4 moveto 32 (\(ets\)) alignedtext
-grestore
-% 36b24630-2bdf-47e2-ade4-21f95efde5a8->0066c7f5-f720-4098-8908-bebee74a409d
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 657 1352.24 moveto
-657 1366.23 657 1384.43 657 1399.49 curveto
-stroke
-0 0 0 edgecolor
-newpath 653.5 1399.79 moveto
-657 1409.79 lineto
-660.5 1399.79 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 653.5 1399.79 moveto
-657 1409.79 lineto
-660.5 1399.79 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-657 1375.4 moveto 23 (1:1) alignedtext
-grestore
-% b1922618-827e-4276-a89e-5bd257cecd7d
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 158 608 moveto
-12 608 lineto
-0 596 lineto
-0 576 lineto
-12 564 lineto
-158 564 lineto
-170 576 lineto
-170 596 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 158 608 moveto
-12 608 lineto
-0 596 lineto
-0 576 lineto
-12 564 lineto
-158 564 lineto
-170 576 lineto
-170 596 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 12 608 moveto
-6 608 0 602 0 596 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 12 608 moveto
-6 608 0 602 0 596 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 0 576 moveto
-0 570 6 564 12 564 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 0 576 moveto
-0 570 6 564 12 564 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 158 564 moveto
-164 564 170 570 170 576 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 158 564 moveto
-164 564 170 570 170 576 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 170 596 moveto
-170 602 164 608 158 608 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 170 596 moveto
-170 602 164 608 158 608 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 158 608 moveto
-12 608 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 12 608 moveto
-6 608 0 602 0 596 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 0 596 moveto
-0 576 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 0 576 moveto
-0 570 6 564 12 564 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 12 564 moveto
-158 564 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 158 564 moveto
-164 564 170 570 170 576 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 170 576 moveto
-170 596 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 170 596 moveto
-170 602 164 608 158 608 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-50 591.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-8 573.4 moveto 154 (\(assign,assign,unnest\)) alignedtext
-grestore
-% b1922618-827e-4276-a89e-5bd257cecd7d->21db32ee-7d3e-42f5-9541-2145ef2e55e2
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 138.46 608.04 moveto
-174.94 623.08 223.09 642.93 259.57 657.97 curveto
-stroke
-0 0 0 edgecolor
-newpath 258.48 661.31 moveto
-269.06 661.88 lineto
-261.15 654.84 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 258.48 661.31 moveto
-269.06 661.88 lineto
-261.15 654.84 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-219 631.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 93596e19-b912-4071-94a9-512133274499
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 358 510 moveto
-268 510 lineto
-256 498 lineto
-256 486 lineto
-268 474 lineto
-358 474 lineto
-370 486 lineto
-370 498 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 358 510 moveto
-268 510 lineto
-256 498 lineto
-256 486 lineto
-268 474 lineto
-358 474 lineto
-370 486 lineto
-370 498 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 268 510 moveto
-262 510 256 504 256 498 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 268 510 moveto
-262 510 256 504 256 498 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 256 486 moveto
-256 480 262 474 268 474 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 256 486 moveto
-256 480 262 474 268 474 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 358 474 moveto
-364 474 370 480 370 486 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 358 474 moveto
-364 474 370 480 370 486 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 370 498 moveto
-370 504 364 510 358 510 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 370 498 moveto
-370 504 364 510 358 510 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 358 510 moveto
-268 510 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 268 510 moveto
-262 510 256 504 256 498 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 256 498 moveto
-256 486 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 256 486 moveto
-256 480 262 474 268 474 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 268 474 moveto
-358 474 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 358 474 moveto
-364 474 370 480 370 486 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 370 486 moveto
-370 498 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 370 498 moveto
-370 504 364 510 358 510 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-263.5 488.4 moveto 99 (InMemorySort) alignedtext
-grestore
-% 9678a828-3e96-4391-be41-8da45721ca3d
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 426 608 moveto
-200 608 lineto
-188 596 lineto
-188 576 lineto
-200 564 lineto
-426 564 lineto
-438 576 lineto
-438 596 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 426 608 moveto
-200 608 lineto
-188 596 lineto
-188 576 lineto
-200 564 lineto
-426 564 lineto
-438 576 lineto
-438 596 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 200 608 moveto
-194 608 188 602 188 596 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 200 608 moveto
-194 608 188 602 188 596 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 188 576 moveto
-188 570 194 564 200 564 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 188 576 moveto
-188 570 194 564 200 564 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 426 564 moveto
-432 564 438 570 438 576 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 426 564 moveto
-432 564 438 570 438 576 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 438 596 moveto
-438 602 432 608 426 608 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 438 596 moveto
-438 602 432 608 426 608 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 426 608 moveto
-200 608 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 200 608 moveto
-194 608 188 602 188 596 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 188 596 moveto
-188 576 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 188 576 moveto
-188 570 194 564 200 564 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 200 564 moveto
-426 564 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 426 564 moveto
-432 564 438 570 438 576 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 438 576 moveto
-438 596 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 438 596 moveto
-438 602 432 608 426 608 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-278 591.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-195.5 573.4 moveto 235 (\(assign,running-aggregate,assign\)) alignedtext
-grestore
-% 93596e19-b912-4071-94a9-512133274499->9678a828-3e96-4391-be41-8da45721ca3d
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 313 510.12 moveto
-313 522.49 313 539.2 313 553.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 309.5 553.96 moveto
-313 563.96 lineto
-316.5 553.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 309.5 553.96 moveto
-313 563.96 lineto
-316.5 553.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-313 533.4 moveto 114 (M:N Hash Merge) alignedtext
-grestore
-% c49457b9-a4be-48d2-8e82-50820e0ca618->7b6c5cb6-cd7f-43cb-bf69-37eff4e3200b
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 313 134.12 moveto
-313 146.49 313 163.2 313 177.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 309.5 177.96 moveto
-313 187.96 lineto
-316.5 177.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 309.5 177.96 moveto
-313 187.96 lineto
-316.5 177.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-313 157.4 moveto 23 (1:1) alignedtext
-grestore
-% 7d6eb230-0efc-42a7-b279-98e0258073e6
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 882 608 moveto
-736 608 lineto
-724 596 lineto
-724 576 lineto
-736 564 lineto
-882 564 lineto
-894 576 lineto
-894 596 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 882 608 moveto
-736 608 lineto
-724 596 lineto
-724 576 lineto
-736 564 lineto
-882 564 lineto
-894 576 lineto
-894 596 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 736 608 moveto
-730 608 724 602 724 596 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 736 608 moveto
-730 608 724 602 724 596 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 724 576 moveto
-724 570 730 564 736 564 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 724 576 moveto
-724 570 730 564 736 564 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 882 564 moveto
-888 564 894 570 894 576 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 882 564 moveto
-888 564 894 570 894 576 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 894 596 moveto
-894 602 888 608 882 608 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 894 596 moveto
-894 602 888 608 882 608 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 882 608 moveto
-736 608 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 736 608 moveto
-730 608 724 602 724 596 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 724 596 moveto
-724 576 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 724 576 moveto
-724 570 730 564 736 564 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 736 564 moveto
-882 564 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 882 564 moveto
-888 564 894 570 894 576 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 894 576 moveto
-894 596 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 894 596 moveto
-894 602 888 608 882 608 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-774 591.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-732 573.4 moveto 154 (\(assign,assign,unnest\)) alignedtext
-grestore
-% 7d6eb230-0efc-42a7-b279-98e0258073e6->d966ca1f-a412-4b20-96cf-0b8b6c64df9c
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 755.54 608.04 moveto
-719.06 623.08 670.91 642.93 634.43 657.97 curveto
-stroke
-0 0 0 edgecolor
-newpath 632.85 654.84 moveto
-624.94 661.88 lineto
-635.52 661.31 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 632.85 654.84 moveto
-624.94 661.88 lineto
-635.52 661.31 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-708 631.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 098774e6-f5a6-4fa0-b3cc-a195761bd957->da4389d3-57a0-41fa-973b-cfdedca126d4
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 341.42 788.21 moveto
-342.38 800.66 343.69 817.39 344.79 831.58 curveto
-stroke
-0 0 0 edgecolor
-newpath 341.32 832.12 moveto
-345.59 841.81 lineto
-348.3 831.57 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 341.32 832.12 moveto
-345.59 841.81 lineto
-348.3 831.57 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-344 811.4 moveto 23 (1:1) alignedtext
-grestore
-% ac276d4f-0bd6-468e-b314-da000f9141ea->4acb8f1a-23ab-474b-9571-8ab12f5aef41
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 530.56 1450.05 moveto
-534.67 1461.51 540.76 1475.32 549 1486 curveto
-552.01 1489.91 555.55 1493.63 559.29 1497.1 curveto
-stroke
-0 0 0 edgecolor
-newpath 557.3 1500 moveto
-567.17 1503.84 lineto
-561.85 1494.68 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 557.3 1500 moveto
-567.17 1503.84 lineto
-561.85 1494.68 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-549 1473.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 066a993b-57b5-47ad-8a18-fef27b8e16f4->769e1d5c-5b5b-4437-8764-a6e0bcf8d210
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 444.98 1164.28 moveto
-447.9 1177.34 451.61 1193.97 454.73 1207.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 451.38 1208.98 moveto
-456.97 1217.97 lineto
-458.21 1207.45 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 451.38 1208.98 moveto
-456.97 1217.97 lineto
-458.21 1207.45 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-452 1187.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 31c39bd3-6724-42bc-b15f-9331d434598f->b1922618-827e-4276-a89e-5bd257cecd7d
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 85 510.12 moveto
-85 522.49 85 539.2 85 553.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 81.5 553.96 moveto
-85 563.96 lineto
-88.5 553.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 81.5 553.96 moveto
-85 563.96 lineto
-88.5 553.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-85 533.4 moveto 23 (1:1) alignedtext
-grestore
-% 0bdd825d-3c80-4769-95ec-3d8ed0fec67a->93596e19-b912-4071-94a9-512133274499
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 313 416.12 moveto
-313 429.65 313 448.38 313 463.85 curveto
-stroke
-0 0 0 edgecolor
-newpath 309.5 463.93 moveto
-313 473.93 lineto
-316.5 463.93 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 309.5 463.93 moveto
-313 473.93 lineto
-316.5 463.93 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-313 443.4 moveto 23 (1:1) alignedtext
-grestore
-% 9c797900-e6cf-44ad-b5e3-869e56fd27ba->1da790c0-ca3c-4833-8280-5c7c2d0ac23c
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 581 510.12 moveto
-581 522.49 581 539.2 581 553.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 577.5 553.96 moveto
-581 563.96 lineto
-584.5 553.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 577.5 553.96 moveto
-581 563.96 lineto
-584.5 553.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-581 533.4 moveto 114 (M:N Hash Merge) alignedtext
-grestore
-% ede16f1d-7795-4cbc-a605-ccfd25b7bb98->7d6eb230-0efc-42a7-b279-98e0258073e6
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 809 510.12 moveto
-809 522.49 809 539.2 809 553.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 805.5 553.96 moveto
-809 563.96 lineto
-812.5 553.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 805.5 553.96 moveto
-809 563.96 lineto
-812.5 553.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-809 533.4 moveto 23 (1:1) alignedtext
-grestore
-% 9678a828-3e96-4391-be41-8da45721ca3d->21db32ee-7d3e-42f5-9541-2145ef2e55e2
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 313 608.28 moveto
-313 621.34 313 637.97 313 651.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 309.5 651.97 moveto
-313 661.97 lineto
-316.5 651.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 309.5 651.97 moveto
-313 661.97 lineto
-316.5 651.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-313 631.4 moveto 67 (M:N Hash) alignedtext
-grestore
-endpage
-showpage
-grestore
-%%PageTrailer
-%%EndPage: 1
-%%Trailer
-%%Pages: 1
-%%BoundingBox: 36 36 781 1476
-end
-restore
-%%EOF
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.dot b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.dot
deleted file mode 100644
index 0c71ffa..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.dot
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-digraph hyracks_job {
-size = "20,20";
-rankdir = "BT";
-node [shape = box, color = black, fillcolor = lightblue2, style = "rounded,filled"];
-"939559d4-4753-42ca-a96b-5a4d867521e4" [label="AquaMeta\n(ets)"];
-"97f7b483-5810-4f62-a3f2-8dc108f211bf" [label="InMemorySort"];
-"bd489957-baec-4872-9b64-6ce7ecc36ed1" [label="AquaMeta\n(stream-project)"];
-"2c7f5446-ca70-424e-b72b-dcbfba13c5fc" [label="AquaMeta\n(assign,unnest)"];
-"8e7bd09e-3fe2-4022-b493-64320be10f22" [label="AquaMeta\n(ets)"];
-"61e21faf-53be-44c7-a39b-d621a19b3dc6" [label="AquaMeta\n(ets)"];
-"c29fedec-a107-4d03-822b-5f08d44fbfc2" [label="AquaMeta\n(assign,assign,unnest)"];
-"dde20475-0341-40cd-8d87-47019d4af7e7" [label="AquaMeta\n(sink-write)"];
-"83b6ee56-1fba-4df7-bd13-89de2edfc4dc" [label="InMemoryHashJoin"];
-"019d92ce-5cb6-4ed4-a55b-5088b1298356" [label="InMemoryHashJoin"];
-"6cc231d4-a25c-4301-98f9-3a9dd548a635" [label="BTreeSearch"];
-"470b4218-4ff6-4699-b05d-d5624f70c346" [label="AquaMeta\n(ets)"];
-"fe17ac32-aa06-4273-bfeb-6ad12004146d" [label="HashGroup"];
-"ce6dab26-9823-4e74-9834-914ab6798874" [label="PreclusteredGroup"];
-"cf5387c0-3490-4c50-b47e-ac20c5e961a7" [label="InMemoryHashJoin"];
-"86cf6620-ce7a-447d-82ac-32d71720d008" [label="PreclusteredGroup"];
-"84042597-2ad3-41fd-95be-7c7a8c9ba6e7" [label="BTreeSearch"];
-"f0024d8c-b182-4c84-9642-562b7f873cb1" [label="InMemorySort"];
-"3796886b-044c-4bfd-b682-9c3a2df05f31" [label="AquaMeta\n(ets)"];
-"649b70fe-e549-4f38-b248-1868bf691b87" [label="InMemorySort"];
-"a80baf03-e23a-4e51-828a-b9ec8620767b" [label="HashGroup"];
-"34bea0d2-8c02-46af-a281-d359e73e8459" [label="AquaMeta\n(assign,stream-project)"];
-"800cab7e-8228-4c85-b19a-39cb844893b7" [label="InMemorySort"];
-"094cb8b2-df6d-4f73-a8f5-00a6ce14d59b" [label="InMemoryHashJoin"];
-"17c0bf1d-edab-423b-a932-23d1c3111b0e" [label="AquaMeta\n(ets)"];
-"11496054-b3b3-4730-b43a-7130c474ef1f" [label="AquaMeta\n(assign,stream-select)"];
-"fe400283-741d-4b35-bc79-9e430715f3fb" [label="AquaMeta\n(assign,running-aggregate,assign)"];
-"73e52bad-0cff-4d55-b95b-176b16f7f464" [label="HashGroup"];
-"f323df6e-1caa-4cb2-9c2c-903df08ee288" [label="BTreeSearch"];
-"899fc36b-024c-402f-a155-a218dc3358ee" [label="AquaMeta\n(assign,running-aggregate,assign)"];
-"b07bbb40-a41c-4d00-994b-f5fa5d3eca34" [label="InMemoryHashJoin"];
-"ad75356e-262b-468d-ad27-5ead6cfa49b3" [label="HashGroup"];
-"40fc40ba-d7e5-44a2-a9a6-88642a2e2f79" [label="BTreeSearch"];
-"6a50b453-2460-4ee8-8fc4-9855ecb54862" [label="AquaMeta\n(assign,assign,unnest)"];
-"5f398745-a0da-4a93-8654-add2e550003c" [label="BTreeSearch"];
-"55442d10-e749-4178-99e7-c29d40c980d1" [label="HashGroup"];
-"162900ff-b4a6-4d0c-b9c2-6595f9d11e4e" [label="AquaMeta\n(assign,unnest)"];
-"67d4cc31-c6fb-48d3-8ca3-af44628f68ca" [label="AquaMeta\n(assign,unnest)"];
-"7e45e056-61c7-47a0-a5d0-5e145b48b64b" [label="BTreeSearch"];
-"4c0306ed-84f7-4dd8-987c-a800d925505a" [label="AquaMeta\n(assign,unnest)"];
-"939559d4-4753-42ca-a96b-5a4d867521e4" -> "84042597-2ad3-41fd-95be-7c7a8c9ba6e7" [label="1:1"];
-"97f7b483-5810-4f62-a3f2-8dc108f211bf" -> "fe400283-741d-4b35-bc79-9e430715f3fb" [label="M:N Hash Merge"];
-"bd489957-baec-4872-9b64-6ce7ecc36ed1" -> "cf5387c0-3490-4c50-b47e-ac20c5e961a7" [label="M:N Hash"];
-"2c7f5446-ca70-424e-b72b-dcbfba13c5fc" -> "094cb8b2-df6d-4f73-a8f5-00a6ce14d59b" [label="M:N Hash"];
-"8e7bd09e-3fe2-4022-b493-64320be10f22" -> "6cc231d4-a25c-4301-98f9-3a9dd548a635" [label="1:1"];
-"61e21faf-53be-44c7-a39b-d621a19b3dc6" -> "f323df6e-1caa-4cb2-9c2c-903df08ee288" [label="1:1"];
-"c29fedec-a107-4d03-822b-5f08d44fbfc2" -> "b07bbb40-a41c-4d00-994b-f5fa5d3eca34" [label="M:N Hash"];
-"83b6ee56-1fba-4df7-bd13-89de2edfc4dc" -> "f0024d8c-b182-4c84-9642-562b7f873cb1" [label="M:N Hash"];
-"019d92ce-5cb6-4ed4-a55b-5088b1298356" -> "bd489957-baec-4872-9b64-6ce7ecc36ed1" [label="1:1"];
-"6cc231d4-a25c-4301-98f9-3a9dd548a635" -> "c29fedec-a107-4d03-822b-5f08d44fbfc2" [label="1:1"];
-"470b4218-4ff6-4699-b05d-d5624f70c346" -> "5f398745-a0da-4a93-8654-add2e550003c" [label="1:1"];
-"fe17ac32-aa06-4273-bfeb-6ad12004146d" -> "97f7b483-5810-4f62-a3f2-8dc108f211bf" [label="1:1"];
-"ce6dab26-9823-4e74-9834-914ab6798874" -> "2c7f5446-ca70-424e-b72b-dcbfba13c5fc" [label="1:1"];
-"cf5387c0-3490-4c50-b47e-ac20c5e961a7" -> "34bea0d2-8c02-46af-a281-d359e73e8459" [label="1:1"];
-"86cf6620-ce7a-447d-82ac-32d71720d008" -> "162900ff-b4a6-4d0c-b9c2-6595f9d11e4e" [label="1:1"];
-"84042597-2ad3-41fd-95be-7c7a8c9ba6e7" -> "cf5387c0-3490-4c50-b47e-ac20c5e961a7" [label="M:N Hash"];
-"f0024d8c-b182-4c84-9642-562b7f873cb1" -> "ce6dab26-9823-4e74-9834-914ab6798874" [label="1:1"];
-"3796886b-044c-4bfd-b682-9c3a2df05f31" -> "40fc40ba-d7e5-44a2-a9a6-88642a2e2f79" [label="1:1"];
-"649b70fe-e549-4f38-b248-1868bf691b87" -> "899fc36b-024c-402f-a155-a218dc3358ee" [label="M:N Hash Merge"];
-"a80baf03-e23a-4e51-828a-b9ec8620767b" -> "ad75356e-262b-468d-ad27-5ead6cfa49b3" [label="M:N Hash"];
-"34bea0d2-8c02-46af-a281-d359e73e8459" -> "dde20475-0341-40cd-8d87-47019d4af7e7" [label="M:N Replicate"];
-"800cab7e-8228-4c85-b19a-39cb844893b7" -> "86cf6620-ce7a-447d-82ac-32d71720d008" [label="1:1"];
-"094cb8b2-df6d-4f73-a8f5-00a6ce14d59b" -> "11496054-b3b3-4730-b43a-7130c474ef1f" [label="1:1"];
-"17c0bf1d-edab-423b-a932-23d1c3111b0e" -> "7e45e056-61c7-47a0-a5d0-5e145b48b64b" [label="1:1"];
-"11496054-b3b3-4730-b43a-7130c474ef1f" -> "55442d10-e749-4178-99e7-c29d40c980d1" [label="M:N Hash"];
-"fe400283-741d-4b35-bc79-9e430715f3fb" -> "b07bbb40-a41c-4d00-994b-f5fa5d3eca34" [label="M:N Hash"];
-"73e52bad-0cff-4d55-b95b-176b16f7f464" -> "fe17ac32-aa06-4273-bfeb-6ad12004146d" [label="M:N Hash"];
-"f323df6e-1caa-4cb2-9c2c-903df08ee288" -> "67d4cc31-c6fb-48d3-8ca3-af44628f68ca" [label="1:1"];
-"899fc36b-024c-402f-a155-a218dc3358ee" -> "83b6ee56-1fba-4df7-bd13-89de2edfc4dc" [label="M:N Hash"];
-"b07bbb40-a41c-4d00-994b-f5fa5d3eca34" -> "800cab7e-8228-4c85-b19a-39cb844893b7" [label="M:N Hash"];
-"ad75356e-262b-468d-ad27-5ead6cfa49b3" -> "649b70fe-e549-4f38-b248-1868bf691b87" [label="1:1"];
-"40fc40ba-d7e5-44a2-a9a6-88642a2e2f79" -> "019d92ce-5cb6-4ed4-a55b-5088b1298356" [label="M:N Hash"];
-"6a50b453-2460-4ee8-8fc4-9855ecb54862" -> "83b6ee56-1fba-4df7-bd13-89de2edfc4dc" [label="M:N Hash"];
-"5f398745-a0da-4a93-8654-add2e550003c" -> "4c0306ed-84f7-4dd8-987c-a800d925505a" [label="1:1"];
-"55442d10-e749-4178-99e7-c29d40c980d1" -> "019d92ce-5cb6-4ed4-a55b-5088b1298356" [label="M:N Hash"];
-"162900ff-b4a6-4d0c-b9c2-6595f9d11e4e" -> "094cb8b2-df6d-4f73-a8f5-00a6ce14d59b" [label="M:N Hash"];
-"67d4cc31-c6fb-48d3-8ca3-af44628f68ca" -> "a80baf03-e23a-4e51-828a-b9ec8620767b" [label="1:1"];
-"7e45e056-61c7-47a0-a5d0-5e145b48b64b" -> "6a50b453-2460-4ee8-8fc4-9855ecb54862" [label="1:1"];
-"4c0306ed-84f7-4dd8-987c-a800d925505a" -> "73e52bad-0cff-4d55-b95b-176b16f7f464" [label="1:1"];
-}
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.json b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.json
deleted file mode 100644
index 6db2b99..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.json
+++ /dev/null
@@ -1,808 +0,0 @@
-{
- "connectors": [
-  {
-   "connector": {
-    "id": "9e451fd1-ca4d-44e7-9c01-5fd0bc520dfa",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:b07bbb40-a41c-4d00-994b-f5fa5d3eca34",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:800cab7e-8228-4c85-b19a-39cb844893b7",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "d506b416-5ef6-4e79-ad8b-97d870b2e7fd",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:67d4cc31-c6fb-48d3-8ca3-af44628f68ca",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:a80baf03-e23a-4e51-828a-b9ec8620767b",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "0283040e-2cb1-48ce-8a12-3fd02e02a867",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:ce6dab26-9823-4e74-9834-914ab6798874",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:2c7f5446-ca70-424e-b72b-dcbfba13c5fc",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "d3c6f04b-30b0-4eca-8666-d926559d2242",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:83b6ee56-1fba-4df7-bd13-89de2edfc4dc",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:f0024d8c-b182-4c84-9642-562b7f873cb1",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "27771271-9fd0-4e54-b864-ec0241e06350",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:40fc40ba-d7e5-44a2-a9a6-88642a2e2f79",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:019d92ce-5cb6-4ed4-a55b-5088b1298356",
-   "out-operator-port": 1,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "798874c1-f95e-4534-8944-fb04dd5c5d9d",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:61e21faf-53be-44c7-a39b-d621a19b3dc6",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:f323df6e-1caa-4cb2-9c2c-903df08ee288",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "dd64cb43-3d38-488c-90df-6703049dcbed",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:86cf6620-ce7a-447d-82ac-32d71720d008",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:162900ff-b4a6-4d0c-b9c2-6595f9d11e4e",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "b4eab7c7-58a5-4908-b117-f6a455cf28df",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:899fc36b-024c-402f-a155-a218dc3358ee",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:83b6ee56-1fba-4df7-bd13-89de2edfc4dc",
-   "out-operator-port": 1,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "92abc733-323e-4fc4-a0d3-574f1a2380b9",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:f0024d8c-b182-4c84-9642-562b7f873cb1",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:ce6dab26-9823-4e74-9834-914ab6798874",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "a442c8f4-dbe3-4549-8116-fabf2133cb37",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:939559d4-4753-42ca-a96b-5a4d867521e4",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:84042597-2ad3-41fd-95be-7c7a8c9ba6e7",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "7561fed7-fe79-4f41-a0c7-fe3038cd4df8",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningMergingConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:649b70fe-e549-4f38-b248-1868bf691b87",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:899fc36b-024c-402f-a155-a218dc3358ee",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "436185ad-9c58-43d3-b654-d4279a41d3ca",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:11496054-b3b3-4730-b43a-7130c474ef1f",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:55442d10-e749-4178-99e7-c29d40c980d1",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "5fcce470-62bb-4415-b970-feb258ceb126",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:2c7f5446-ca70-424e-b72b-dcbfba13c5fc",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:094cb8b2-df6d-4f73-a8f5-00a6ce14d59b",
-   "out-operator-port": 1,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "f07cdaf4-448b-452d-8340-16c2836e950a",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:a80baf03-e23a-4e51-828a-b9ec8620767b",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:ad75356e-262b-468d-ad27-5ead6cfa49b3",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "aeab0d67-4610-4190-a116-a0d592bfbc76",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:bd489957-baec-4872-9b64-6ce7ecc36ed1",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:cf5387c0-3490-4c50-b47e-ac20c5e961a7",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "6681661c-aa41-4fe3-8c05-4e77910babc3",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:7e45e056-61c7-47a0-a5d0-5e145b48b64b",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:6a50b453-2460-4ee8-8fc4-9855ecb54862",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "83d3048b-5b1e-4835-aaa0-ab6f9bca2cac",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:55442d10-e749-4178-99e7-c29d40c980d1",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:019d92ce-5cb6-4ed4-a55b-5088b1298356",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "43aabbac-532e-4bf5-88c1-adf115c4e5ef",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:6cc231d4-a25c-4301-98f9-3a9dd548a635",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:c29fedec-a107-4d03-822b-5f08d44fbfc2",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "2c5b8681-b3d6-43e4-9a43-b662626231ff",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:019d92ce-5cb6-4ed4-a55b-5088b1298356",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:bd489957-baec-4872-9b64-6ce7ecc36ed1",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "448a4dcf-989b-455a-b8db-37fd73633a08",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:84042597-2ad3-41fd-95be-7c7a8c9ba6e7",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:cf5387c0-3490-4c50-b47e-ac20c5e961a7",
-   "out-operator-port": 1,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "08d1bec0-36f2-42d5-a8c7-1d07f993dfe0",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:162900ff-b4a6-4d0c-b9c2-6595f9d11e4e",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:094cb8b2-df6d-4f73-a8f5-00a6ce14d59b",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "0bddc12e-bcbb-4993-8d32-b657505305fc",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:6a50b453-2460-4ee8-8fc4-9855ecb54862",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:83b6ee56-1fba-4df7-bd13-89de2edfc4dc",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "e066c3c9-3a65-46ae-ab78-417c872d8482",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:094cb8b2-df6d-4f73-a8f5-00a6ce14d59b",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:11496054-b3b3-4730-b43a-7130c474ef1f",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "63433aaf-1046-48ca-8bce-ddb9e645aaaf",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:73e52bad-0cff-4d55-b95b-176b16f7f464",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:fe17ac32-aa06-4273-bfeb-6ad12004146d",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "3194b91e-6df6-47c2-86f9-e933849a1d51",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:4c0306ed-84f7-4dd8-987c-a800d925505a",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:73e52bad-0cff-4d55-b95b-176b16f7f464",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "2d0cbb34-5d09-4924-b7d7-d754578d369b",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNReplicatingConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:34bea0d2-8c02-46af-a281-d359e73e8459",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:dde20475-0341-40cd-8d87-47019d4af7e7",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "061b01cf-dd3d-4e4a-b4d1-2e55430b7eff",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:fe17ac32-aa06-4273-bfeb-6ad12004146d",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:97f7b483-5810-4f62-a3f2-8dc108f211bf",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "c74fdcf7-75b1-469f-aa4f-bdeec91ea356",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:470b4218-4ff6-4699-b05d-d5624f70c346",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:5f398745-a0da-4a93-8654-add2e550003c",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "8742990b-c6b3-43f5-84e4-22df1a61d7c6",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:800cab7e-8228-4c85-b19a-39cb844893b7",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:86cf6620-ce7a-447d-82ac-32d71720d008",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "6d59eadb-3286-49f0-80d6-d7ad9d4247a3",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:ad75356e-262b-468d-ad27-5ead6cfa49b3",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:649b70fe-e549-4f38-b248-1868bf691b87",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "b400c160-9fca-4151-a5a1-2387da980702",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:f323df6e-1caa-4cb2-9c2c-903df08ee288",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:67d4cc31-c6fb-48d3-8ca3-af44628f68ca",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "807b4c5d-ac3f-49e2-a65a-e58348346e49",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:fe400283-741d-4b35-bc79-9e430715f3fb",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:b07bbb40-a41c-4d00-994b-f5fa5d3eca34",
-   "out-operator-port": 1,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "6555a4da-7164-40c7-9c11-ce6bb098e1bd",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:cf5387c0-3490-4c50-b47e-ac20c5e961a7",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:34bea0d2-8c02-46af-a281-d359e73e8459",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "90ee0791-9c0e-47e8-832d-8344d8f4c36f",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:3796886b-044c-4bfd-b682-9c3a2df05f31",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:40fc40ba-d7e5-44a2-a9a6-88642a2e2f79",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "0c93505b-ac0f-4485-98dd-ad1310c8a8af",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:8e7bd09e-3fe2-4022-b493-64320be10f22",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:6cc231d4-a25c-4301-98f9-3a9dd548a635",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "dfac2841-28bd-4d2c-be58-60e800885ecb",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:5f398745-a0da-4a93-8654-add2e550003c",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:4c0306ed-84f7-4dd8-987c-a800d925505a",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "58da74ca-aa5a-4d1c-95a1-46a17239430b",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:c29fedec-a107-4d03-822b-5f08d44fbfc2",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:b07bbb40-a41c-4d00-994b-f5fa5d3eca34",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "b58210fa-978c-434f-8417-12fba92a25a9",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningMergingConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:97f7b483-5810-4f62-a3f2-8dc108f211bf",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:fe400283-741d-4b35-bc79-9e430715f3fb",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  },
-  {
-   "connector": {
-    "id": "b7081523-098e-47bd-8b86-27d8d7c4c199",
-    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
-    "type": "connector"
-   },
-   "in-operator-id": "ODID:17c0bf1d-edab-423b-a932-23d1c3111b0e",
-   "in-operator-port": 0,
-   "out-operator-id": "ODID:7e45e056-61c7-47a0-a5d0-5e145b48b64b",
-   "out-operator-port": 0,
-   "type": "connector-info"
-  }
- ],
- "operators": [
-  {
-   "id": "939559d4-4753-42ca-a96b-5a4d867521e4",
-   "in-arity": 0,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["ets"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "97f7b483-5810-4f62-a3f2-8dc108f211bf",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "bd489957-baec-4872-9b64-6ce7ecc36ed1",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["stream-project [1, 3]"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "2c7f5446-ca70-424e-b72b-dcbfba13c5fc",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [4] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@3a747fa2]",
-    "unnest 5 <- org.apache.asterix.runtime.unnestingfunctions.std.SubsetCollectionDescriptor$1@366782a9"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "8e7bd09e-3fe2-4022-b493-64320be10f22",
-   "in-arity": 0,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["ets"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "61e21faf-53be-44c7-a39b-d621a19b3dc6",
-   "in-arity": 0,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["ets"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "c29fedec-a107-4d03-822b-5f08d44fbfc2",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [2, 3] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@45b34126, org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@7b7a4989]",
-    "assign [4] := [org.apache.asterix.runtime.evaluators.tagged.functions.LenDescriptor$1@197200b4]",
-    "unnest 5 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@b8c3679"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "dde20475-0341-40cd-8d87-47019d4af7e7",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["sink-write [0] outputFile"],
-   "out-arity": 0,
-   "type": "operator"
-  },
-  {
-   "id": "83b6ee56-1fba-4df7-bd13-89de2edfc4dc",
-   "in-arity": 2,
-   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "019d92ce-5cb6-4ed4-a55b-5088b1298356",
-   "in-arity": 2,
-   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "6cc231d4-a25c-4301-98f9-3a9dd548a635",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "470b4218-4ff6-4699-b05d-d5624f70c346",
-   "in-arity": 0,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["ets"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "fe17ac32-aa06-4273-bfeb-6ad12004146d",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "ce6dab26-9823-4e74-9834-914ab6798874",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.group.PreclusteredGroupOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "cf5387c0-3490-4c50-b47e-ac20c5e961a7",
-   "in-arity": 2,
-   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "86cf6620-ce7a-447d-82ac-32d71720d008",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.group.PreclusteredGroupOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "84042597-2ad3-41fd-95be-7c7a8c9ba6e7",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "f0024d8c-b182-4c84-9642-562b7f873cb1",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "3796886b-044c-4bfd-b682-9c3a2df05f31",
-   "in-arity": 0,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["ets"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "649b70fe-e549-4f38-b248-1868bf691b87",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "a80baf03-e23a-4e51-828a-b9ec8620767b",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "34bea0d2-8c02-46af-a281-d359e73e8459",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [4] := [org.apache.asterix.runtime.evaluators.tagged.functions.AbstractRecordConstructorDescriptor$1@224c47db]",
-    "stream-project [4]"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "800cab7e-8228-4c85-b19a-39cb844893b7",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "094cb8b2-df6d-4f73-a8f5-00a6ce14d59b",
-   "in-arity": 2,
-   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "17c0bf1d-edab-423b-a932-23d1c3111b0e",
-   "in-arity": 0,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["ets"],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "11496054-b3b3-4730-b43a-7130c474ef1f",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [12] := [org.apache.asterix.runtime.evaluators.tagged.functions.SimilarityDescriptor$1@3e018c74]",
-    "stream-select org.apache.asterix.runtime.evaluators.comparisons.ComparisonEvalFactory@57ac3379"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "fe400283-741d-4b35-bc79-9e430715f3fb",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [2] := [ColumnAccess(0)]",
-    "running-aggregate [3] := [org.apache.asterix.runtime.runningaggregates.std.TidRunningAggregateDescriptor$1@6a6779e6]",
-    "assign [4] := [ConstantEvalFactory true]"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "73e52bad-0cff-4d55-b95b-176b16f7f464",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "f323df6e-1caa-4cb2-9c2c-903df08ee288",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "899fc36b-024c-402f-a155-a218dc3358ee",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [2] := [ColumnAccess(0)]",
-    "running-aggregate [3] := [org.apache.asterix.runtime.runningaggregates.std.TidRunningAggregateDescriptor$1@2f74219d]",
-    "assign [4] := [ConstantEvalFactory true]"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "b07bbb40-a41c-4d00-994b-f5fa5d3eca34",
-   "in-arity": 2,
-   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "ad75356e-262b-468d-ad27-5ead6cfa49b3",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "40fc40ba-d7e5-44a2-a9a6-88642a2e2f79",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "6a50b453-2460-4ee8-8fc4-9855ecb54862",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [2, 3] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@714ae2c1, org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@6b6d2702]",
-    "assign [4] := [org.apache.asterix.runtime.evaluators.tagged.functions.LenDescriptor$1@4b1c2b67]",
-    "unnest 5 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@26659db7"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "5f398745-a0da-4a93-8654-add2e550003c",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "55442d10-e749-4178-99e7-c29d40c980d1",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "162900ff-b4a6-4d0c-b9c2-6595f9d11e4e",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [4] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@59556d12]",
-    "unnest 5 <- org.apache.asterix.runtime.unnestingfunctions.std.SubsetCollectionDescriptor$1@776be68f"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "67d4cc31-c6fb-48d3-8ca3-af44628f68ca",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [2] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@4cedf389]",
-    "unnest 3 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@1a0fced4"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "7e45e056-61c7-47a0-a5d0-5e145b48b64b",
-   "in-arity": 1,
-   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
-   "out-arity": 1,
-   "type": "operator"
-  },
-  {
-   "id": "4c0306ed-84f7-4dd8-987c-a800d925505a",
-   "in-arity": 1,
-   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": [
-    "assign [2] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@3d3cdaa]",
-    "unnest 3 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@466355dc"
-   ],
-   "out-arity": 1,
-   "type": "operator"
-  }
- ],
- "type": "job"
-}
-
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.png b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.png
deleted file mode 100644
index 35427bf..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.png
+++ /dev/null
Binary files differ
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.ps b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.ps
deleted file mode 100644
index d2b9a3c..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.ps
+++ /dev/null
@@ -1,5809 +0,0 @@
-%!PS-Adobe-3.0
-%
-% Licensed to the Apache Software Foundation (ASF) under one
-% or more contributor license agreements.  See the NOTICE file
-% distributed with this work for additional information
-% regarding copyright ownership.  The ASF licenses this file
-% to you under the Apache License, Version 2.0 (the
-% "License"); you may not use this file except in compliance
-% with the License.  You may obtain a copy of the License at
-%
-%   http://www.apache.org/licenses/LICENSE-2.0
-%
-% Unless required by applicable law or agreed to in writing,
-% software distributed under the License is distributed on an
-% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-% KIND, either express or implied.  See the License for the
-% specific language governing permissions and limitations
-% under the License.
-%
-%%Creator: graphviz version 2.26.3 (20100126.1600)
-%%Title: hyracks_job
-%%Pages: (atend)
-%%BoundingBox: (atend)
-%%EndComments
-save
-%%BeginProlog
-/DotDict 200 dict def
-DotDict begin
-
-/setupLatin1 {
-mark
-/EncodingVector 256 array def
- EncodingVector 0
-
-ISOLatin1Encoding 0 255 getinterval putinterval
-EncodingVector 45 /hyphen put
-
-% Set up ISO Latin 1 character encoding
-/starnetISO {
-        dup dup findfont dup length dict begin
-        { 1 index /FID ne { def }{ pop pop } ifelse
-        } forall
-        /Encoding EncodingVector def
-        currentdict end definefont
-} def
-/Times-Roman starnetISO def
-/Times-Italic starnetISO def
-/Times-Bold starnetISO def
-/Times-BoldItalic starnetISO def
-/Helvetica starnetISO def
-/Helvetica-Oblique starnetISO def
-/Helvetica-Bold starnetISO def
-/Helvetica-BoldOblique starnetISO def
-/Courier starnetISO def
-/Courier-Oblique starnetISO def
-/Courier-Bold starnetISO def
-/Courier-BoldOblique starnetISO def
-cleartomark
-} bind def
-
-%%BeginResource: procset graphviz 0 0
-/coord-font-family /Times-Roman def
-/default-font-family /Times-Roman def
-/coordfont coord-font-family findfont 8 scalefont def
-
-/InvScaleFactor 1.0 def
-/set_scale {
-       dup 1 exch div /InvScaleFactor exch def
-       scale
-} bind def
-
-% styles
-/solid { [] 0 setdash } bind def
-/dashed { [9 InvScaleFactor mul dup ] 0 setdash } bind def
-/dotted { [1 InvScaleFactor mul 6 InvScaleFactor mul] 0 setdash } bind def
-/invis {/fill {newpath} def /stroke {newpath} def /show {pop newpath} def} bind def
-/bold { 2 setlinewidth } bind def
-/filled { } bind def
-/unfilled { } bind def
-/rounded { } bind def
-/diagonals { } bind def
-
-% hooks for setting color 
-/nodecolor { sethsbcolor } bind def
-/edgecolor { sethsbcolor } bind def
-/graphcolor { sethsbcolor } bind def
-/nopcolor {pop pop pop} bind def
-
-/beginpage {	% i j npages
-	/npages exch def
-	/j exch def
-	/i exch def
-	/str 10 string def
-	npages 1 gt {
-		gsave
-			coordfont setfont
-			0 0 moveto
-			(\() show i str cvs show (,) show j str cvs show (\)) show
-		grestore
-	} if
-} bind def
-
-/set_font {
-	findfont exch
-	scalefont setfont
-} def
-
-% draw text fitted to its expected width
-/alignedtext {			% width text
-	/text exch def
-	/width exch def
-	gsave
-		width 0 gt {
-			[] 0 setdash
-			text stringwidth pop width exch sub text length div 0 text ashow
-		} if
-	grestore
-} def
-
-/boxprim {				% xcorner ycorner xsize ysize
-		4 2 roll
-		moveto
-		2 copy
-		exch 0 rlineto
-		0 exch rlineto
-		pop neg 0 rlineto
-		closepath
-} bind def
-
-/ellipse_path {
-	/ry exch def
-	/rx exch def
-	/y exch def
-	/x exch def
-	matrix currentmatrix
-	newpath
-	x y translate
-	rx ry scale
-	0 0 1 0 360 arc
-	setmatrix
-} bind def
-
-/endpage { showpage } bind def
-/showpage { } def
-
-/layercolorseq
-	[	% layer color sequence - darkest to lightest
-		[0 0 0]
-		[.2 .8 .8]
-		[.4 .8 .8]
-		[.6 .8 .8]
-		[.8 .8 .8]
-	]
-def
-
-/layerlen layercolorseq length def
-
-/setlayer {/maxlayer exch def /curlayer exch def
-	layercolorseq curlayer 1 sub layerlen mod get
-	aload pop sethsbcolor
-	/nodecolor {nopcolor} def
-	/edgecolor {nopcolor} def
-	/graphcolor {nopcolor} def
-} bind def
-
-/onlayer { curlayer ne {invis} if } def
-
-/onlayers {
-	/myupper exch def
-	/mylower exch def
-	curlayer mylower lt
-	curlayer myupper gt
-	or
-	{invis} if
-} def
-
-/curlayer 0 def
-
-%%EndResource
-%%EndProlog
-%%BeginSetup
-14 default-font-family set_font
-1 setmiterlimit
-% /arrowlength 10 def
-% /arrowwidth 5 def
-
-% make sure pdfmark is harmless for PS-interpreters other than Distiller
-/pdfmark where {pop} {userdict /pdfmark /cleartomark load put} ifelse
-% make '<<' and '>>' safe on PS Level 1 devices
-/languagelevel where {pop languagelevel}{1} ifelse
-2 lt {
-    userdict (<<) cvn ([) cvn load put
-    userdict (>>) cvn ([) cvn load put
-} if
-
-%%EndSetup
-setupLatin1
-%%Page: 1 1
-%%PageBoundingBox: 36 36 781 1476
-%%PageOrientation: Portrait
-0 0 1 beginpage
-gsave
-36 36 745 1440 boxprim clip newpath
-0.825688 0.825688 set_scale 0 rotate 47.6 48.6 translate
-% 939559d4-4753-42ca-a96b-5a4d867521e4
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 275 1352 moveto
-213 1352 lineto
-201 1340 lineto
-201 1320 lineto
-213 1308 lineto
-275 1308 lineto
-287 1320 lineto
-287 1340 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 275 1352 moveto
-213 1352 lineto
-201 1340 lineto
-201 1320 lineto
-213 1308 lineto
-275 1308 lineto
-287 1320 lineto
-287 1340 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 213 1352 moveto
-207 1352 201 1346 201 1340 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 213 1352 moveto
-207 1352 201 1346 201 1340 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 201 1320 moveto
-201 1314 207 1308 213 1308 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 201 1320 moveto
-201 1314 207 1308 213 1308 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 275 1308 moveto
-281 1308 287 1314 287 1320 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 275 1308 moveto
-281 1308 287 1314 287 1320 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 287 1340 moveto
-287 1346 281 1352 275 1352 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 287 1340 moveto
-287 1346 281 1352 275 1352 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 275 1352 moveto
-213 1352 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 213 1352 moveto
-207 1352 201 1346 201 1340 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 201 1340 moveto
-201 1320 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 201 1320 moveto
-201 1314 207 1308 213 1308 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 213 1308 moveto
-275 1308 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 275 1308 moveto
-281 1308 287 1314 287 1320 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 287 1320 moveto
-287 1340 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 287 1340 moveto
-287 1346 281 1352 275 1352 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-209 1335.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-228 1317.4 moveto 32 (\(ets\)) alignedtext
-grestore
-% 84042597-2ad3-41fd-95be-7c7a8c9ba6e7
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 283 1446 moveto
-205 1446 lineto
-193 1434 lineto
-193 1422 lineto
-205 1410 lineto
-283 1410 lineto
-295 1422 lineto
-295 1434 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 283 1446 moveto
-205 1446 lineto
-193 1434 lineto
-193 1422 lineto
-205 1410 lineto
-283 1410 lineto
-295 1422 lineto
-295 1434 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 205 1446 moveto
-199 1446 193 1440 193 1434 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 205 1446 moveto
-199 1446 193 1440 193 1434 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 193 1422 moveto
-193 1416 199 1410 205 1410 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 193 1422 moveto
-193 1416 199 1410 205 1410 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 283 1410 moveto
-289 1410 295 1416 295 1422 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 283 1410 moveto
-289 1410 295 1416 295 1422 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 295 1434 moveto
-295 1440 289 1446 283 1446 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 295 1434 moveto
-295 1440 289 1446 283 1446 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 283 1446 moveto
-205 1446 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 205 1446 moveto
-199 1446 193 1440 193 1434 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 193 1434 moveto
-193 1422 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 193 1422 moveto
-193 1416 199 1410 205 1410 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 205 1410 moveto
-283 1410 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 283 1410 moveto
-289 1410 295 1416 295 1422 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 295 1422 moveto
-295 1434 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 295 1434 moveto
-295 1440 289 1446 283 1446 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-200.5 1424.4 moveto 87 (BTreeSearch) alignedtext
-grestore
-% 939559d4-4753-42ca-a96b-5a4d867521e4->84042597-2ad3-41fd-95be-7c7a8c9ba6e7
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 244 1352.24 moveto
-244 1366.23 244 1384.43 244 1399.49 curveto
-stroke
-0 0 0 edgecolor
-newpath 240.5 1399.79 moveto
-244 1409.79 lineto
-247.5 1399.79 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 240.5 1399.79 moveto
-244 1409.79 lineto
-247.5 1399.79 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-244 1375.4 moveto 23 (1:1) alignedtext
-grestore
-% 97f7b483-5810-4f62-a3f2-8dc108f211bf
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 814 510 moveto
-724 510 lineto
-712 498 lineto
-712 486 lineto
-724 474 lineto
-814 474 lineto
-826 486 lineto
-826 498 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 814 510 moveto
-724 510 lineto
-712 498 lineto
-712 486 lineto
-724 474 lineto
-814 474 lineto
-826 486 lineto
-826 498 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 724 510 moveto
-718 510 712 504 712 498 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 724 510 moveto
-718 510 712 504 712 498 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 712 486 moveto
-712 480 718 474 724 474 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 712 486 moveto
-712 480 718 474 724 474 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 814 474 moveto
-820 474 826 480 826 486 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 814 474 moveto
-820 474 826 480 826 486 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 826 498 moveto
-826 504 820 510 814 510 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 826 498 moveto
-826 504 820 510 814 510 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 814 510 moveto
-724 510 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 724 510 moveto
-718 510 712 504 712 498 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 712 498 moveto
-712 486 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 712 486 moveto
-712 480 718 474 724 474 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 724 474 moveto
-814 474 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 814 474 moveto
-820 474 826 480 826 486 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 826 486 moveto
-826 498 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 826 498 moveto
-826 504 820 510 814 510 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-719.5 488.4 moveto 99 (InMemorySort) alignedtext
-grestore
-% fe400283-741d-4b35-bc79-9e430715f3fb
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 882 608 moveto
-656 608 lineto
-644 596 lineto
-644 576 lineto
-656 564 lineto
-882 564 lineto
-894 576 lineto
-894 596 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 882 608 moveto
-656 608 lineto
-644 596 lineto
-644 576 lineto
-656 564 lineto
-882 564 lineto
-894 576 lineto
-894 596 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 656 608 moveto
-650 608 644 602 644 596 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 656 608 moveto
-650 608 644 602 644 596 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 644 576 moveto
-644 570 650 564 656 564 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 644 576 moveto
-644 570 650 564 656 564 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 882 564 moveto
-888 564 894 570 894 576 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 882 564 moveto
-888 564 894 570 894 576 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 894 596 moveto
-894 602 888 608 882 608 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 894 596 moveto
-894 602 888 608 882 608 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 882 608 moveto
-656 608 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 656 608 moveto
-650 608 644 602 644 596 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 644 596 moveto
-644 576 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 644 576 moveto
-644 570 650 564 656 564 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 656 564 moveto
-882 564 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 882 564 moveto
-888 564 894 570 894 576 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 894 576 moveto
-894 596 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 894 596 moveto
-894 602 888 608 882 608 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-734 591.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-651.5 573.4 moveto 235 (\(assign,running-aggregate,assign\)) alignedtext
-grestore
-% 97f7b483-5810-4f62-a3f2-8dc108f211bf->fe400283-741d-4b35-bc79-9e430715f3fb
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 769 510.12 moveto
-769 522.49 769 539.2 769 553.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 765.5 553.96 moveto
-769 563.96 lineto
-772.5 553.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 765.5 553.96 moveto
-769 563.96 lineto
-772.5 553.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-769 533.4 moveto 114 (M:N Hash Merge) alignedtext
-grestore
-% bd489957-baec-4872-9b64-6ce7ecc36ed1
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 429 1450 moveto
-325 1450 lineto
-313 1438 lineto
-313 1418 lineto
-325 1406 lineto
-429 1406 lineto
-441 1418 lineto
-441 1438 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 429 1450 moveto
-325 1450 lineto
-313 1438 lineto
-313 1418 lineto
-325 1406 lineto
-429 1406 lineto
-441 1418 lineto
-441 1438 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 325 1450 moveto
-319 1450 313 1444 313 1438 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 325 1450 moveto
-319 1450 313 1444 313 1438 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 313 1418 moveto
-313 1412 319 1406 325 1406 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 313 1418 moveto
-313 1412 319 1406 325 1406 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 429 1406 moveto
-435 1406 441 1412 441 1418 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 429 1406 moveto
-435 1406 441 1412 441 1418 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 441 1438 moveto
-441 1444 435 1450 429 1450 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 441 1438 moveto
-441 1444 435 1450 429 1450 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 429 1450 moveto
-325 1450 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 325 1450 moveto
-319 1450 313 1444 313 1438 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 313 1438 moveto
-313 1418 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 313 1418 moveto
-313 1412 319 1406 325 1406 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 325 1406 moveto
-429 1406 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 429 1406 moveto
-435 1406 441 1412 441 1418 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 441 1418 moveto
-441 1438 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 441 1438 moveto
-441 1444 435 1450 429 1450 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-342 1433.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-321 1415.4 moveto 112 (\(stream-project\)) alignedtext
-grestore
-% cf5387c0-3490-4c50-b47e-ac20c5e961a7
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 376 1540 moveto
-254 1540 lineto
-242 1528 lineto
-242 1516 lineto
-254 1504 lineto
-376 1504 lineto
-388 1516 lineto
-388 1528 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 376 1540 moveto
-254 1540 lineto
-242 1528 lineto
-242 1516 lineto
-254 1504 lineto
-376 1504 lineto
-388 1516 lineto
-388 1528 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 254 1540 moveto
-248 1540 242 1534 242 1528 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 254 1540 moveto
-248 1540 242 1534 242 1528 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 242 1516 moveto
-242 1510 248 1504 254 1504 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 242 1516 moveto
-242 1510 248 1504 254 1504 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 376 1504 moveto
-382 1504 388 1510 388 1516 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 376 1504 moveto
-382 1504 388 1510 388 1516 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 388 1528 moveto
-388 1534 382 1540 376 1540 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 388 1528 moveto
-388 1534 382 1540 376 1540 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 376 1540 moveto
-254 1540 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 254 1540 moveto
-248 1540 242 1534 242 1528 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 242 1528 moveto
-242 1516 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 242 1516 moveto
-242 1510 248 1504 254 1504 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 254 1504 moveto
-376 1504 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 376 1504 moveto
-382 1504 388 1510 388 1516 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 388 1516 moveto
-388 1528 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 388 1528 moveto
-388 1534 382 1540 376 1540 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-250 1518.4 moveto 130 (InMemoryHashJoin) alignedtext
-grestore
-% bd489957-baec-4872-9b64-6ce7ecc36ed1->cf5387c0-3490-4c50-b47e-ac20c5e961a7
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 362.31 1450.28 moveto
-353.35 1463.85 341.86 1481.28 332.44 1495.56 curveto
-stroke
-0 0 0 edgecolor
-newpath 329.47 1493.7 moveto
-326.89 1503.97 lineto
-335.32 1497.55 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 329.47 1493.7 moveto
-326.89 1503.97 lineto
-335.32 1497.55 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-350 1473.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 2c7f5446-ca70-424e-b72b-dcbfba13c5fc
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 425 976 moveto
-327 976 lineto
-315 964 lineto
-315 944 lineto
-327 932 lineto
-425 932 lineto
-437 944 lineto
-437 964 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 425 976 moveto
-327 976 lineto
-315 964 lineto
-315 944 lineto
-327 932 lineto
-425 932 lineto
-437 944 lineto
-437 964 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 327 976 moveto
-321 976 315 970 315 964 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 327 976 moveto
-321 976 315 970 315 964 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 315 944 moveto
-315 938 321 932 327 932 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 315 944 moveto
-315 938 321 932 327 932 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 425 932 moveto
-431 932 437 938 437 944 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 425 932 moveto
-431 932 437 938 437 944 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 437 964 moveto
-437 970 431 976 425 976 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 437 964 moveto
-437 970 431 976 425 976 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 425 976 moveto
-327 976 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 327 976 moveto
-321 976 315 970 315 964 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 315 964 moveto
-315 944 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 315 944 moveto
-315 938 321 932 327 932 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 327 932 moveto
-425 932 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 425 932 moveto
-431 932 437 938 437 944 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 437 944 moveto
-437 964 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 437 964 moveto
-437 970 431 976 425 976 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-341 959.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-323 941.4 moveto 106 (\(assign,unnest\)) alignedtext
-grestore
-% 094cb8b2-df6d-4f73-a8f5-00a6ce14d59b
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 513 1066 moveto
-391 1066 lineto
-379 1054 lineto
-379 1042 lineto
-391 1030 lineto
-513 1030 lineto
-525 1042 lineto
-525 1054 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 513 1066 moveto
-391 1066 lineto
-379 1054 lineto
-379 1042 lineto
-391 1030 lineto
-513 1030 lineto
-525 1042 lineto
-525 1054 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 391 1066 moveto
-385 1066 379 1060 379 1054 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 391 1066 moveto
-385 1066 379 1060 379 1054 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 379 1042 moveto
-379 1036 385 1030 391 1030 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 379 1042 moveto
-379 1036 385 1030 391 1030 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 513 1030 moveto
-519 1030 525 1036 525 1042 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 513 1030 moveto
-519 1030 525 1036 525 1042 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 525 1054 moveto
-525 1060 519 1066 513 1066 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 525 1054 moveto
-525 1060 519 1066 513 1066 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 513 1066 moveto
-391 1066 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 391 1066 moveto
-385 1066 379 1060 379 1054 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 379 1054 moveto
-379 1042 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 379 1042 moveto
-379 1036 385 1030 391 1030 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 391 1030 moveto
-513 1030 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 513 1030 moveto
-519 1030 525 1036 525 1042 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 525 1042 moveto
-525 1054 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 525 1054 moveto
-525 1060 519 1066 513 1066 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-387 1044.4 moveto 130 (InMemoryHashJoin) alignedtext
-grestore
-% 2c7f5446-ca70-424e-b72b-dcbfba13c5fc->094cb8b2-df6d-4f73-a8f5-00a6ce14d59b
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 385.74 976.18 moveto
-391.33 987.54 399.02 1001.22 408 1012 curveto
-411.15 1015.78 414.74 1019.46 418.49 1022.92 curveto
-stroke
-0 0 0 edgecolor
-newpath 416.45 1025.79 moveto
-426.29 1029.71 lineto
-421.04 1020.51 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 416.45 1025.79 moveto
-426.29 1029.71 lineto
-421.04 1020.51 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-408 999.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 8e7bd09e-3fe2-4022-b493-64320be10f22
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 572 420 moveto
-510 420 lineto
-498 408 lineto
-498 388 lineto
-510 376 lineto
-572 376 lineto
-584 388 lineto
-584 408 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 572 420 moveto
-510 420 lineto
-498 408 lineto
-498 388 lineto
-510 376 lineto
-572 376 lineto
-584 388 lineto
-584 408 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 510 420 moveto
-504 420 498 414 498 408 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 510 420 moveto
-504 420 498 414 498 408 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 498 388 moveto
-498 382 504 376 510 376 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 498 388 moveto
-498 382 504 376 510 376 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 572 376 moveto
-578 376 584 382 584 388 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 572 376 moveto
-578 376 584 382 584 388 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 584 408 moveto
-584 414 578 420 572 420 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 584 408 moveto
-584 414 578 420 572 420 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 572 420 moveto
-510 420 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 510 420 moveto
-504 420 498 414 498 408 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 498 408 moveto
-498 388 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 498 388 moveto
-498 382 504 376 510 376 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 510 376 moveto
-572 376 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 572 376 moveto
-578 376 584 382 584 388 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 584 388 moveto
-584 408 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 584 408 moveto
-584 414 578 420 572 420 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-506 403.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-525 385.4 moveto 32 (\(ets\)) alignedtext
-grestore
-% 6cc231d4-a25c-4301-98f9-3a9dd548a635
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 580 510 moveto
-502 510 lineto
-490 498 lineto
-490 486 lineto
-502 474 lineto
-580 474 lineto
-592 486 lineto
-592 498 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 580 510 moveto
-502 510 lineto
-490 498 lineto
-490 486 lineto
-502 474 lineto
-580 474 lineto
-592 486 lineto
-592 498 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 502 510 moveto
-496 510 490 504 490 498 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 502 510 moveto
-496 510 490 504 490 498 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 490 486 moveto
-490 480 496 474 502 474 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 490 486 moveto
-490 480 496 474 502 474 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 580 474 moveto
-586 474 592 480 592 486 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 580 474 moveto
-586 474 592 480 592 486 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 592 498 moveto
-592 504 586 510 580 510 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 592 498 moveto
-592 504 586 510 580 510 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 580 510 moveto
-502 510 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 502 510 moveto
-496 510 490 504 490 498 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 490 498 moveto
-490 486 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 490 486 moveto
-490 480 496 474 502 474 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 502 474 moveto
-580 474 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 580 474 moveto
-586 474 592 480 592 486 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 592 486 moveto
-592 498 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 592 498 moveto
-592 504 586 510 580 510 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-497.5 488.4 moveto 87 (BTreeSearch) alignedtext
-grestore
-% 8e7bd09e-3fe2-4022-b493-64320be10f22->6cc231d4-a25c-4301-98f9-3a9dd548a635
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 541 420.28 moveto
-541 433.34 541 449.97 541 463.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 537.5 463.97 moveto
-541 473.97 lineto
-544.5 463.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 537.5 463.97 moveto
-541 473.97 lineto
-544.5 463.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-541 443.4 moveto 23 (1:1) alignedtext
-grestore
-% 61e21faf-53be-44c7-a39b-d621a19b3dc6
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 156 44 moveto
-94 44 lineto
-82 32 lineto
-82 12 lineto
-94 0 lineto
-156 0 lineto
-168 12 lineto
-168 32 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 156 44 moveto
-94 44 lineto
-82 32 lineto
-82 12 lineto
-94 0 lineto
-156 0 lineto
-168 12 lineto
-168 32 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 94 44 moveto
-88 44 82 38 82 32 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 94 44 moveto
-88 44 82 38 82 32 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 82 12 moveto
-82 6 88 0 94 0 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 82 12 moveto
-82 6 88 0 94 0 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 156 0 moveto
-162 0 168 6 168 12 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 156 0 moveto
-162 0 168 6 168 12 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 168 32 moveto
-168 38 162 44 156 44 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 168 32 moveto
-168 38 162 44 156 44 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 156 44 moveto
-94 44 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 94 44 moveto
-88 44 82 38 82 32 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 82 32 moveto
-82 12 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 82 12 moveto
-82 6 88 0 94 0 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 94 0 moveto
-156 0 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 156 0 moveto
-162 0 168 6 168 12 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 168 12 moveto
-168 32 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 168 32 moveto
-168 38 162 44 156 44 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-90 27.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-109 9.4 moveto 32 (\(ets\)) alignedtext
-grestore
-% f323df6e-1caa-4cb2-9c2c-903df08ee288
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 164 134 moveto
-86 134 lineto
-74 122 lineto
-74 110 lineto
-86 98 lineto
-164 98 lineto
-176 110 lineto
-176 122 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 164 134 moveto
-86 134 lineto
-74 122 lineto
-74 110 lineto
-86 98 lineto
-164 98 lineto
-176 110 lineto
-176 122 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 86 134 moveto
-80 134 74 128 74 122 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 86 134 moveto
-80 134 74 128 74 122 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 74 110 moveto
-74 104 80 98 86 98 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 74 110 moveto
-74 104 80 98 86 98 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 164 98 moveto
-170 98 176 104 176 110 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 164 98 moveto
-170 98 176 104 176 110 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 176 122 moveto
-176 128 170 134 164 134 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 176 122 moveto
-176 128 170 134 164 134 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 164 134 moveto
-86 134 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 86 134 moveto
-80 134 74 128 74 122 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 74 122 moveto
-74 110 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 74 110 moveto
-74 104 80 98 86 98 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 86 98 moveto
-164 98 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 164 98 moveto
-170 98 176 104 176 110 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 176 110 moveto
-176 122 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 176 122 moveto
-176 128 170 134 164 134 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-81.5 112.4 moveto 87 (BTreeSearch) alignedtext
-grestore
-% 61e21faf-53be-44c7-a39b-d621a19b3dc6->f323df6e-1caa-4cb2-9c2c-903df08ee288
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 125 44.28 moveto
-125 57.34 125 73.97 125 87.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 121.5 87.97 moveto
-125 97.97 lineto
-128.5 87.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 121.5 87.97 moveto
-125 97.97 lineto
-128.5 87.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-125 67.4 moveto 23 (1:1) alignedtext
-grestore
-% c29fedec-a107-4d03-822b-5f08d44fbfc2
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 614 608 moveto
-468 608 lineto
-456 596 lineto
-456 576 lineto
-468 564 lineto
-614 564 lineto
-626 576 lineto
-626 596 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 614 608 moveto
-468 608 lineto
-456 596 lineto
-456 576 lineto
-468 564 lineto
-614 564 lineto
-626 576 lineto
-626 596 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 468 608 moveto
-462 608 456 602 456 596 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 468 608 moveto
-462 608 456 602 456 596 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 456 576 moveto
-456 570 462 564 468 564 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 456 576 moveto
-456 570 462 564 468 564 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 614 564 moveto
-620 564 626 570 626 576 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 614 564 moveto
-620 564 626 570 626 576 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 626 596 moveto
-626 602 620 608 614 608 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 626 596 moveto
-626 602 620 608 614 608 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 614 608 moveto
-468 608 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 468 608 moveto
-462 608 456 602 456 596 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 456 596 moveto
-456 576 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 456 576 moveto
-456 570 462 564 468 564 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 468 564 moveto
-614 564 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 614 564 moveto
-620 564 626 570 626 576 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 626 576 moveto
-626 596 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 626 596 moveto
-626 602 620 608 614 608 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-506 591.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-464 573.4 moveto 154 (\(assign,assign,unnest\)) alignedtext
-grestore
-% b07bbb40-a41c-4d00-994b-f5fa5d3eca34
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 602 698 moveto
-480 698 lineto
-468 686 lineto
-468 674 lineto
-480 662 lineto
-602 662 lineto
-614 674 lineto
-614 686 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 602 698 moveto
-480 698 lineto
-468 686 lineto
-468 674 lineto
-480 662 lineto
-602 662 lineto
-614 674 lineto
-614 686 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 480 698 moveto
-474 698 468 692 468 686 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 480 698 moveto
-474 698 468 692 468 686 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 468 674 moveto
-468 668 474 662 480 662 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 468 674 moveto
-468 668 474 662 480 662 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 602 662 moveto
-608 662 614 668 614 674 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 602 662 moveto
-608 662 614 668 614 674 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 614 686 moveto
-614 692 608 698 602 698 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 614 686 moveto
-614 692 608 698 602 698 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 602 698 moveto
-480 698 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 480 698 moveto
-474 698 468 692 468 686 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 468 686 moveto
-468 674 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 468 674 moveto
-468 668 474 662 480 662 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 480 662 moveto
-602 662 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 602 662 moveto
-608 662 614 668 614 674 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 614 674 moveto
-614 686 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 614 686 moveto
-614 692 608 698 602 698 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-476 676.4 moveto 130 (InMemoryHashJoin) alignedtext
-grestore
-% c29fedec-a107-4d03-822b-5f08d44fbfc2->b07bbb40-a41c-4d00-994b-f5fa5d3eca34
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 541 608.28 moveto
-541 621.34 541 637.97 541 651.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 537.5 651.97 moveto
-541 661.97 lineto
-544.5 651.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 537.5 651.97 moveto
-541 661.97 lineto
-544.5 651.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-541 631.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% dde20475-0341-40cd-8d87-47019d4af7e7
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 351 1736 moveto
-279 1736 lineto
-267 1724 lineto
-267 1704 lineto
-279 1692 lineto
-351 1692 lineto
-363 1704 lineto
-363 1724 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 351 1736 moveto
-279 1736 lineto
-267 1724 lineto
-267 1704 lineto
-279 1692 lineto
-351 1692 lineto
-363 1704 lineto
-363 1724 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 279 1736 moveto
-273 1736 267 1730 267 1724 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 279 1736 moveto
-273 1736 267 1730 267 1724 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 267 1704 moveto
-267 1698 273 1692 279 1692 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 267 1704 moveto
-267 1698 273 1692 279 1692 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 351 1692 moveto
-357 1692 363 1698 363 1704 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 351 1692 moveto
-357 1692 363 1698 363 1704 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 363 1724 moveto
-363 1730 357 1736 351 1736 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 363 1724 moveto
-363 1730 357 1736 351 1736 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 351 1736 moveto
-279 1736 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 279 1736 moveto
-273 1736 267 1730 267 1724 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 267 1724 moveto
-267 1704 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 267 1704 moveto
-267 1698 273 1692 279 1692 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 279 1692 moveto
-351 1692 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 351 1692 moveto
-357 1692 363 1698 363 1704 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 363 1704 moveto
-363 1724 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 363 1724 moveto
-363 1730 357 1736 351 1736 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-280 1719.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-274.5 1701.4 moveto 81 (\(sink-write\)) alignedtext
-grestore
-% 83b6ee56-1fba-4df7-bd13-89de2edfc4dc
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 414 698 moveto
-292 698 lineto
-280 686 lineto
-280 674 lineto
-292 662 lineto
-414 662 lineto
-426 674 lineto
-426 686 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 414 698 moveto
-292 698 lineto
-280 686 lineto
-280 674 lineto
-292 662 lineto
-414 662 lineto
-426 674 lineto
-426 686 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 292 698 moveto
-286 698 280 692 280 686 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 292 698 moveto
-286 698 280 692 280 686 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 280 674 moveto
-280 668 286 662 292 662 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 280 674 moveto
-280 668 286 662 292 662 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 414 662 moveto
-420 662 426 668 426 674 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 414 662 moveto
-420 662 426 668 426 674 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 426 686 moveto
-426 692 420 698 414 698 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 426 686 moveto
-426 692 420 698 414 698 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 414 698 moveto
-292 698 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 292 698 moveto
-286 698 280 692 280 686 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 280 686 moveto
-280 674 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 280 674 moveto
-280 668 286 662 292 662 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 292 662 moveto
-414 662 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 414 662 moveto
-420 662 426 668 426 674 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 426 674 moveto
-426 686 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 426 686 moveto
-426 692 420 698 414 698 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-288 676.4 moveto 130 (InMemoryHashJoin) alignedtext
-grestore
-% f0024d8c-b182-4c84-9642-562b7f873cb1
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 405 788 moveto
-315 788 lineto
-303 776 lineto
-303 764 lineto
-315 752 lineto
-405 752 lineto
-417 764 lineto
-417 776 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 405 788 moveto
-315 788 lineto
-303 776 lineto
-303 764 lineto
-315 752 lineto
-405 752 lineto
-417 764 lineto
-417 776 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 315 788 moveto
-309 788 303 782 303 776 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 315 788 moveto
-309 788 303 782 303 776 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 303 764 moveto
-303 758 309 752 315 752 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 303 764 moveto
-303 758 309 752 315 752 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 405 752 moveto
-411 752 417 758 417 764 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 405 752 moveto
-411 752 417 758 417 764 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 417 776 moveto
-417 782 411 788 405 788 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 417 776 moveto
-417 782 411 788 405 788 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 405 788 moveto
-315 788 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 315 788 moveto
-309 788 303 782 303 776 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 303 776 moveto
-303 764 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 303 764 moveto
-303 758 309 752 315 752 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 315 752 moveto
-405 752 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 405 752 moveto
-411 752 417 758 417 764 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 417 764 moveto
-417 776 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 417 776 moveto
-417 782 411 788 405 788 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-310.5 766.4 moveto 99 (InMemorySort) alignedtext
-grestore
-% 83b6ee56-1fba-4df7-bd13-89de2edfc4dc->f0024d8c-b182-4c84-9642-562b7f873cb1
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 354.42 698.21 moveto
-355.38 710.66 356.69 727.39 357.79 741.58 curveto
-stroke
-0 0 0 edgecolor
-newpath 354.32 742.12 moveto
-358.59 751.81 lineto
-361.3 741.57 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 354.32 742.12 moveto
-358.59 751.81 lineto
-361.3 741.57 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-358 721.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 019d92ce-5cb6-4ed4-a55b-5088b1298356
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 439 1348 moveto
-317 1348 lineto
-305 1336 lineto
-305 1324 lineto
-317 1312 lineto
-439 1312 lineto
-451 1324 lineto
-451 1336 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 439 1348 moveto
-317 1348 lineto
-305 1336 lineto
-305 1324 lineto
-317 1312 lineto
-439 1312 lineto
-451 1324 lineto
-451 1336 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 317 1348 moveto
-311 1348 305 1342 305 1336 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 317 1348 moveto
-311 1348 305 1342 305 1336 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 305 1324 moveto
-305 1318 311 1312 317 1312 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 305 1324 moveto
-305 1318 311 1312 317 1312 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 439 1312 moveto
-445 1312 451 1318 451 1324 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 439 1312 moveto
-445 1312 451 1318 451 1324 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 451 1336 moveto
-451 1342 445 1348 439 1348 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 451 1336 moveto
-451 1342 445 1348 439 1348 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 439 1348 moveto
-317 1348 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 317 1348 moveto
-311 1348 305 1342 305 1336 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 305 1336 moveto
-305 1324 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 305 1324 moveto
-305 1318 311 1312 317 1312 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 317 1312 moveto
-439 1312 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 439 1312 moveto
-445 1312 451 1318 451 1324 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 451 1324 moveto
-451 1336 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 451 1336 moveto
-451 1342 445 1348 439 1348 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-313 1326.4 moveto 130 (InMemoryHashJoin) alignedtext
-grestore
-% 019d92ce-5cb6-4ed4-a55b-5088b1298356->bd489957-baec-4872-9b64-6ce7ecc36ed1
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 377.81 1348.43 moveto
-377.68 1361.68 377.49 1379.88 377.33 1395.54 curveto
-stroke
-0 0 0 edgecolor
-newpath 373.83 1395.84 moveto
-377.23 1405.88 lineto
-380.83 1395.91 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 373.83 1395.84 moveto
-377.23 1405.88 lineto
-380.83 1395.91 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-378 1375.4 moveto 23 (1:1) alignedtext
-grestore
-% 6cc231d4-a25c-4301-98f9-3a9dd548a635->c29fedec-a107-4d03-822b-5f08d44fbfc2
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 541 510.12 moveto
-541 522.49 541 539.2 541 553.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 537.5 553.96 moveto
-541 563.96 lineto
-544.5 553.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 537.5 553.96 moveto
-541 563.96 lineto
-544.5 553.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-541 533.4 moveto 23 (1:1) alignedtext
-grestore
-% 470b4218-4ff6-4699-b05d-d5624f70c346
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 800 44 moveto
-738 44 lineto
-726 32 lineto
-726 12 lineto
-738 0 lineto
-800 0 lineto
-812 12 lineto
-812 32 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 800 44 moveto
-738 44 lineto
-726 32 lineto
-726 12 lineto
-738 0 lineto
-800 0 lineto
-812 12 lineto
-812 32 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 738 44 moveto
-732 44 726 38 726 32 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 738 44 moveto
-732 44 726 38 726 32 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 726 12 moveto
-726 6 732 0 738 0 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 726 12 moveto
-726 6 732 0 738 0 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 800 0 moveto
-806 0 812 6 812 12 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 800 0 moveto
-806 0 812 6 812 12 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 812 32 moveto
-812 38 806 44 800 44 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 812 32 moveto
-812 38 806 44 800 44 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 800 44 moveto
-738 44 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 738 44 moveto
-732 44 726 38 726 32 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 726 32 moveto
-726 12 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 726 12 moveto
-726 6 732 0 738 0 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 738 0 moveto
-800 0 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 800 0 moveto
-806 0 812 6 812 12 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 812 12 moveto
-812 32 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 812 32 moveto
-812 38 806 44 800 44 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-734 27.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-753 9.4 moveto 32 (\(ets\)) alignedtext
-grestore
-% 5f398745-a0da-4a93-8654-add2e550003c
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 808 134 moveto
-730 134 lineto
-718 122 lineto
-718 110 lineto
-730 98 lineto
-808 98 lineto
-820 110 lineto
-820 122 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 808 134 moveto
-730 134 lineto
-718 122 lineto
-718 110 lineto
-730 98 lineto
-808 98 lineto
-820 110 lineto
-820 122 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 730 134 moveto
-724 134 718 128 718 122 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 730 134 moveto
-724 134 718 128 718 122 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 718 110 moveto
-718 104 724 98 730 98 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 718 110 moveto
-718 104 724 98 730 98 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 808 98 moveto
-814 98 820 104 820 110 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 808 98 moveto
-814 98 820 104 820 110 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 820 122 moveto
-820 128 814 134 808 134 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 820 122 moveto
-820 128 814 134 808 134 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 808 134 moveto
-730 134 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 730 134 moveto
-724 134 718 128 718 122 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 718 122 moveto
-718 110 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 718 110 moveto
-718 104 724 98 730 98 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 730 98 moveto
-808 98 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 808 98 moveto
-814 98 820 104 820 110 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 820 110 moveto
-820 122 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 820 122 moveto
-820 128 814 134 808 134 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-725.5 112.4 moveto 87 (BTreeSearch) alignedtext
-grestore
-% 470b4218-4ff6-4699-b05d-d5624f70c346->5f398745-a0da-4a93-8654-add2e550003c
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 769 44.28 moveto
-769 57.34 769 73.97 769 87.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 765.5 87.97 moveto
-769 97.97 lineto
-772.5 87.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 765.5 87.97 moveto
-769 97.97 lineto
-772.5 87.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-769 67.4 moveto 23 (1:1) alignedtext
-grestore
-% fe17ac32-aa06-4273-bfeb-6ad12004146d
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 804 416 moveto
-734 416 lineto
-722 404 lineto
-722 392 lineto
-734 380 lineto
-804 380 lineto
-816 392 lineto
-816 404 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 804 416 moveto
-734 416 lineto
-722 404 lineto
-722 392 lineto
-734 380 lineto
-804 380 lineto
-816 392 lineto
-816 404 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 734 416 moveto
-728 416 722 410 722 404 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 734 416 moveto
-728 416 722 410 722 404 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 722 392 moveto
-722 386 728 380 734 380 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 722 392 moveto
-722 386 728 380 734 380 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 804 380 moveto
-810 380 816 386 816 392 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 804 380 moveto
-810 380 816 386 816 392 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 816 404 moveto
-816 410 810 416 804 416 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 816 404 moveto
-816 410 810 416 804 416 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 804 416 moveto
-734 416 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 734 416 moveto
-728 416 722 410 722 404 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 722 404 moveto
-722 392 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 722 392 moveto
-722 386 728 380 734 380 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 734 380 moveto
-804 380 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 804 380 moveto
-810 380 816 386 816 392 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 816 392 moveto
-816 404 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 816 404 moveto
-816 410 810 416 804 416 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-730 394.4 moveto 78 (HashGroup) alignedtext
-grestore
-% fe17ac32-aa06-4273-bfeb-6ad12004146d->97f7b483-5810-4f62-a3f2-8dc108f211bf
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 769 416.12 moveto
-769 429.65 769 448.38 769 463.85 curveto
-stroke
-0 0 0 edgecolor
-newpath 765.5 463.93 moveto
-769 473.93 lineto
-772.5 463.93 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 765.5 463.93 moveto
-769 473.93 lineto
-772.5 463.93 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-769 443.4 moveto 23 (1:1) alignedtext
-grestore
-% ce6dab26-9823-4e74-9834-914ab6798874
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 422 878 moveto
-300 878 lineto
-288 866 lineto
-288 854 lineto
-300 842 lineto
-422 842 lineto
-434 854 lineto
-434 866 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 422 878 moveto
-300 878 lineto
-288 866 lineto
-288 854 lineto
-300 842 lineto
-422 842 lineto
-434 854 lineto
-434 866 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 300 878 moveto
-294 878 288 872 288 866 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 300 878 moveto
-294 878 288 872 288 866 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 288 854 moveto
-288 848 294 842 300 842 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 288 854 moveto
-288 848 294 842 300 842 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 422 842 moveto
-428 842 434 848 434 854 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 422 842 moveto
-428 842 434 848 434 854 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 434 866 moveto
-434 872 428 878 422 878 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 434 866 moveto
-434 872 428 878 422 878 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 422 878 moveto
-300 878 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 300 878 moveto
-294 878 288 872 288 866 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 288 866 moveto
-288 854 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 288 854 moveto
-288 848 294 842 300 842 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 300 842 moveto
-422 842 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 422 842 moveto
-428 842 434 848 434 854 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 434 854 moveto
-434 866 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 434 866 moveto
-434 872 428 878 422 878 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-296 856.4 moveto 130 (PreclusteredGroup) alignedtext
-grestore
-% ce6dab26-9823-4e74-9834-914ab6798874->2c7f5446-ca70-424e-b72b-dcbfba13c5fc
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 363.89 878.12 moveto
-365.87 890.49 368.53 907.2 370.86 921.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 367.45 922.64 moveto
-372.48 931.96 lineto
-374.36 921.53 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 367.45 922.64 moveto
-372.48 931.96 lineto
-374.36 921.53 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-370 901.4 moveto 23 (1:1) alignedtext
-grestore
-% 34bea0d2-8c02-46af-a281-d359e73e8459
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 390 1638 moveto
-240 1638 lineto
-228 1626 lineto
-228 1606 lineto
-240 1594 lineto
-390 1594 lineto
-402 1606 lineto
-402 1626 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 390 1638 moveto
-240 1638 lineto
-228 1626 lineto
-228 1606 lineto
-240 1594 lineto
-390 1594 lineto
-402 1606 lineto
-402 1626 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 240 1638 moveto
-234 1638 228 1632 228 1626 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 240 1638 moveto
-234 1638 228 1632 228 1626 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 228 1606 moveto
-228 1600 234 1594 240 1594 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 228 1606 moveto
-228 1600 234 1594 240 1594 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 390 1594 moveto
-396 1594 402 1600 402 1606 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 390 1594 moveto
-396 1594 402 1600 402 1606 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 402 1626 moveto
-402 1632 396 1638 390 1638 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 402 1626 moveto
-402 1632 396 1638 390 1638 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 390 1638 moveto
-240 1638 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 240 1638 moveto
-234 1638 228 1632 228 1626 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 228 1626 moveto
-228 1606 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 228 1606 moveto
-228 1600 234 1594 240 1594 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 240 1594 moveto
-390 1594 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 390 1594 moveto
-396 1594 402 1600 402 1606 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 402 1606 moveto
-402 1626 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 402 1626 moveto
-402 1632 396 1638 390 1638 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-280 1621.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-235.5 1603.4 moveto 159 (\(assign,stream-project\)) alignedtext
-grestore
-% cf5387c0-3490-4c50-b47e-ac20c5e961a7->34bea0d2-8c02-46af-a281-d359e73e8459
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 315 1540.12 moveto
-315 1552.49 315 1569.2 315 1583.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 311.5 1583.96 moveto
-315 1593.96 lineto
-318.5 1583.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 311.5 1583.96 moveto
-315 1593.96 lineto
-318.5 1583.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-315 1563.4 moveto 23 (1:1) alignedtext
-grestore
-% 86cf6620-ce7a-447d-82ac-32d71720d008
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 586 878 moveto
-464 878 lineto
-452 866 lineto
-452 854 lineto
-464 842 lineto
-586 842 lineto
-598 854 lineto
-598 866 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 586 878 moveto
-464 878 lineto
-452 866 lineto
-452 854 lineto
-464 842 lineto
-586 842 lineto
-598 854 lineto
-598 866 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 464 878 moveto
-458 878 452 872 452 866 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 464 878 moveto
-458 878 452 872 452 866 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 452 854 moveto
-452 848 458 842 464 842 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 452 854 moveto
-452 848 458 842 464 842 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 586 842 moveto
-592 842 598 848 598 854 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 586 842 moveto
-592 842 598 848 598 854 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 598 866 moveto
-598 872 592 878 586 878 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 598 866 moveto
-598 872 592 878 586 878 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 586 878 moveto
-464 878 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 464 878 moveto
-458 878 452 872 452 866 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 452 866 moveto
-452 854 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 452 854 moveto
-452 848 458 842 464 842 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 464 842 moveto
-586 842 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 586 842 moveto
-592 842 598 848 598 854 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 598 854 moveto
-598 866 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 598 866 moveto
-598 872 592 878 586 878 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-460 856.4 moveto 130 (PreclusteredGroup) alignedtext
-grestore
-% 162900ff-b4a6-4d0c-b9c2-6595f9d11e4e
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 566 976 moveto
-468 976 lineto
-456 964 lineto
-456 944 lineto
-468 932 lineto
-566 932 lineto
-578 944 lineto
-578 964 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 566 976 moveto
-468 976 lineto
-456 964 lineto
-456 944 lineto
-468 932 lineto
-566 932 lineto
-578 944 lineto
-578 964 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 468 976 moveto
-462 976 456 970 456 964 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 468 976 moveto
-462 976 456 970 456 964 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 456 944 moveto
-456 938 462 932 468 932 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 456 944 moveto
-456 938 462 932 468 932 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 566 932 moveto
-572 932 578 938 578 944 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 566 932 moveto
-572 932 578 938 578 944 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 578 964 moveto
-578 970 572 976 566 976 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 578 964 moveto
-578 970 572 976 566 976 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 566 976 moveto
-468 976 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 468 976 moveto
-462 976 456 970 456 964 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 456 964 moveto
-456 944 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 456 944 moveto
-456 938 462 932 468 932 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 468 932 moveto
-566 932 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 566 932 moveto
-572 932 578 938 578 944 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 578 944 moveto
-578 964 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 578 964 moveto
-578 970 572 976 566 976 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-482 959.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-464 941.4 moveto 106 (\(assign,unnest\)) alignedtext
-grestore
-% 86cf6620-ce7a-447d-82ac-32d71720d008->162900ff-b4a6-4d0c-b9c2-6595f9d11e4e
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 523.46 878.12 moveto
-522.41 890.49 520.98 907.2 519.74 921.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 516.24 921.7 moveto
-518.88 931.96 lineto
-523.21 922.29 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 516.24 921.7 moveto
-518.88 931.96 lineto
-523.21 922.29 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-522 901.4 moveto 23 (1:1) alignedtext
-grestore
-% 84042597-2ad3-41fd-95be-7c7a8c9ba6e7->cf5387c0-3490-4c50-b47e-ac20c5e961a7
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 249.63 1446.2 moveto
-253.95 1458.28 260.75 1474.05 270 1486 curveto
-272.98 1489.85 276.46 1493.54 280.13 1496.99 curveto
-stroke
-0 0 0 edgecolor
-newpath 278.01 1499.78 moveto
-287.85 1503.71 lineto
-282.6 1494.5 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 278.01 1499.78 moveto
-287.85 1503.71 lineto
-282.6 1494.5 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-270 1473.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% f0024d8c-b182-4c84-9642-562b7f873cb1->ce6dab26-9823-4e74-9834-914ab6798874
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 360.2 788.21 moveto
-360.34 800.66 360.53 817.39 360.68 831.58 curveto
-stroke
-0 0 0 edgecolor
-newpath 357.19 831.85 moveto
-360.8 841.81 lineto
-364.19 831.78 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 357.19 831.85 moveto
-360.8 841.81 lineto
-364.19 831.78 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-361 811.4 moveto 23 (1:1) alignedtext
-grestore
-% 3796886b-044c-4bfd-b682-9c3a2df05f31
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 339 1164 moveto
-277 1164 lineto
-265 1152 lineto
-265 1132 lineto
-277 1120 lineto
-339 1120 lineto
-351 1132 lineto
-351 1152 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 339 1164 moveto
-277 1164 lineto
-265 1152 lineto
-265 1132 lineto
-277 1120 lineto
-339 1120 lineto
-351 1132 lineto
-351 1152 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 277 1164 moveto
-271 1164 265 1158 265 1152 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 277 1164 moveto
-271 1164 265 1158 265 1152 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 265 1132 moveto
-265 1126 271 1120 277 1120 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 265 1132 moveto
-265 1126 271 1120 277 1120 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 339 1120 moveto
-345 1120 351 1126 351 1132 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 339 1120 moveto
-345 1120 351 1126 351 1132 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 351 1152 moveto
-351 1158 345 1164 339 1164 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 351 1152 moveto
-351 1158 345 1164 339 1164 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 339 1164 moveto
-277 1164 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 277 1164 moveto
-271 1164 265 1158 265 1152 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 265 1152 moveto
-265 1132 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 265 1132 moveto
-265 1126 271 1120 277 1120 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 277 1120 moveto
-339 1120 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 339 1120 moveto
-345 1120 351 1126 351 1132 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 351 1132 moveto
-351 1152 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 351 1152 moveto
-351 1158 345 1164 339 1164 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-273 1147.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-292 1129.4 moveto 32 (\(ets\)) alignedtext
-grestore
-% 40fc40ba-d7e5-44a2-a9a6-88642a2e2f79
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 354 1254 moveto
-276 1254 lineto
-264 1242 lineto
-264 1230 lineto
-276 1218 lineto
-354 1218 lineto
-366 1230 lineto
-366 1242 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 354 1254 moveto
-276 1254 lineto
-264 1242 lineto
-264 1230 lineto
-276 1218 lineto
-354 1218 lineto
-366 1230 lineto
-366 1242 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 276 1254 moveto
-270 1254 264 1248 264 1242 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 276 1254 moveto
-270 1254 264 1248 264 1242 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 264 1230 moveto
-264 1224 270 1218 276 1218 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 264 1230 moveto
-264 1224 270 1218 276 1218 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 354 1218 moveto
-360 1218 366 1224 366 1230 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 354 1218 moveto
-360 1218 366 1224 366 1230 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 366 1242 moveto
-366 1248 360 1254 354 1254 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 366 1242 moveto
-366 1248 360 1254 354 1254 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 354 1254 moveto
-276 1254 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 276 1254 moveto
-270 1254 264 1248 264 1242 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 264 1242 moveto
-264 1230 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 264 1230 moveto
-264 1224 270 1218 276 1218 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 276 1218 moveto
-354 1218 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 354 1218 moveto
-360 1218 366 1224 366 1230 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 366 1230 moveto
-366 1242 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 366 1242 moveto
-366 1248 360 1254 354 1254 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-271.5 1232.4 moveto 87 (BTreeSearch) alignedtext
-grestore
-% 3796886b-044c-4bfd-b682-9c3a2df05f31->40fc40ba-d7e5-44a2-a9a6-88642a2e2f79
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 309.66 1164.28 moveto
-310.63 1177.34 311.87 1193.97 312.91 1207.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 309.42 1208.26 moveto
-313.66 1217.97 lineto
-316.41 1207.74 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 309.42 1208.26 moveto
-313.66 1217.97 lineto
-316.41 1207.74 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-313 1187.4 moveto 23 (1:1) alignedtext
-grestore
-% 649b70fe-e549-4f38-b248-1868bf691b87
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 170 510 moveto
-80 510 lineto
-68 498 lineto
-68 486 lineto
-80 474 lineto
-170 474 lineto
-182 486 lineto
-182 498 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 170 510 moveto
-80 510 lineto
-68 498 lineto
-68 486 lineto
-80 474 lineto
-170 474 lineto
-182 486 lineto
-182 498 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 80 510 moveto
-74 510 68 504 68 498 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 80 510 moveto
-74 510 68 504 68 498 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 68 486 moveto
-68 480 74 474 80 474 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 68 486 moveto
-68 480 74 474 80 474 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 170 474 moveto
-176 474 182 480 182 486 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 170 474 moveto
-176 474 182 480 182 486 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 182 498 moveto
-182 504 176 510 170 510 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 182 498 moveto
-182 504 176 510 170 510 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 170 510 moveto
-80 510 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 80 510 moveto
-74 510 68 504 68 498 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 68 498 moveto
-68 486 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 68 486 moveto
-68 480 74 474 80 474 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 80 474 moveto
-170 474 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 170 474 moveto
-176 474 182 480 182 486 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 182 486 moveto
-182 498 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 182 498 moveto
-182 504 176 510 170 510 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-75.5 488.4 moveto 99 (InMemorySort) alignedtext
-grestore
-% 899fc36b-024c-402f-a155-a218dc3358ee
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 238 608 moveto
-12 608 lineto
-0 596 lineto
-0 576 lineto
-12 564 lineto
-238 564 lineto
-250 576 lineto
-250 596 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 238 608 moveto
-12 608 lineto
-0 596 lineto
-0 576 lineto
-12 564 lineto
-238 564 lineto
-250 576 lineto
-250 596 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 12 608 moveto
-6 608 0 602 0 596 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 12 608 moveto
-6 608 0 602 0 596 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 0 576 moveto
-0 570 6 564 12 564 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 0 576 moveto
-0 570 6 564 12 564 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 238 564 moveto
-244 564 250 570 250 576 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 238 564 moveto
-244 564 250 570 250 576 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 250 596 moveto
-250 602 244 608 238 608 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 250 596 moveto
-250 602 244 608 238 608 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 238 608 moveto
-12 608 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 12 608 moveto
-6 608 0 602 0 596 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 0 596 moveto
-0 576 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 0 576 moveto
-0 570 6 564 12 564 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 12 564 moveto
-238 564 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 238 564 moveto
-244 564 250 570 250 576 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 250 576 moveto
-250 596 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 250 596 moveto
-250 602 244 608 238 608 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-90 591.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-7.5 573.4 moveto 235 (\(assign,running-aggregate,assign\)) alignedtext
-grestore
-% 649b70fe-e549-4f38-b248-1868bf691b87->899fc36b-024c-402f-a155-a218dc3358ee
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 125 510.12 moveto
-125 522.49 125 539.2 125 553.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 121.5 553.96 moveto
-125 563.96 lineto
-128.5 553.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 121.5 553.96 moveto
-125 563.96 lineto
-128.5 553.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-125 533.4 moveto 114 (M:N Hash Merge) alignedtext
-grestore
-% a80baf03-e23a-4e51-828a-b9ec8620767b
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 160 322 moveto
-90 322 lineto
-78 310 lineto
-78 298 lineto
-90 286 lineto
-160 286 lineto
-172 298 lineto
-172 310 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 160 322 moveto
-90 322 lineto
-78 310 lineto
-78 298 lineto
-90 286 lineto
-160 286 lineto
-172 298 lineto
-172 310 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 90 322 moveto
-84 322 78 316 78 310 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 90 322 moveto
-84 322 78 316 78 310 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 78 298 moveto
-78 292 84 286 90 286 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 78 298 moveto
-78 292 84 286 90 286 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 160 286 moveto
-166 286 172 292 172 298 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 160 286 moveto
-166 286 172 292 172 298 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 172 310 moveto
-172 316 166 322 160 322 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 172 310 moveto
-172 316 166 322 160 322 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 160 322 moveto
-90 322 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 90 322 moveto
-84 322 78 316 78 310 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 78 310 moveto
-78 298 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 78 298 moveto
-78 292 84 286 90 286 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 90 286 moveto
-160 286 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 160 286 moveto
-166 286 172 292 172 298 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 172 298 moveto
-172 310 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 172 310 moveto
-172 316 166 322 160 322 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-86 300.4 moveto 78 (HashGroup) alignedtext
-grestore
-% ad75356e-262b-468d-ad27-5ead6cfa49b3
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 160 416 moveto
-90 416 lineto
-78 404 lineto
-78 392 lineto
-90 380 lineto
-160 380 lineto
-172 392 lineto
-172 404 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 160 416 moveto
-90 416 lineto
-78 404 lineto
-78 392 lineto
-90 380 lineto
-160 380 lineto
-172 392 lineto
-172 404 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 90 416 moveto
-84 416 78 410 78 404 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 90 416 moveto
-84 416 78 410 78 404 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 78 392 moveto
-78 386 84 380 90 380 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 78 392 moveto
-78 386 84 380 90 380 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 160 380 moveto
-166 380 172 386 172 392 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 160 380 moveto
-166 380 172 386 172 392 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 172 404 moveto
-172 410 166 416 160 416 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 172 404 moveto
-172 410 166 416 160 416 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 160 416 moveto
-90 416 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 90 416 moveto
-84 416 78 410 78 404 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 78 404 moveto
-78 392 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 78 392 moveto
-78 386 84 380 90 380 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 90 380 moveto
-160 380 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 160 380 moveto
-166 380 172 386 172 392 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 172 392 moveto
-172 404 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 172 404 moveto
-172 410 166 416 160 416 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-86 394.4 moveto 78 (HashGroup) alignedtext
-grestore
-% a80baf03-e23a-4e51-828a-b9ec8620767b->ad75356e-262b-468d-ad27-5ead6cfa49b3
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 125 322.12 moveto
-125 335.65 125 354.38 125 369.85 curveto
-stroke
-0 0 0 edgecolor
-newpath 121.5 369.93 moveto
-125 379.93 lineto
-128.5 369.93 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 121.5 369.93 moveto
-125 379.93 lineto
-128.5 369.93 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-125 345.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 34bea0d2-8c02-46af-a281-d359e73e8459->dde20475-0341-40cd-8d87-47019d4af7e7
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 315 1638.24 moveto
-315 1651.02 315 1667.3 315 1681.5 curveto
-stroke
-0 0 0 edgecolor
-newpath 311.5 1681.85 moveto
-315 1691.85 lineto
-318.5 1681.85 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 311.5 1681.85 moveto
-315 1691.85 lineto
-318.5 1681.85 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-315 1661.4 moveto 94 (M:N Replicate) alignedtext
-grestore
-% 800cab7e-8228-4c85-b19a-39cb844893b7
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 571 788 moveto
-481 788 lineto
-469 776 lineto
-469 764 lineto
-481 752 lineto
-571 752 lineto
-583 764 lineto
-583 776 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 571 788 moveto
-481 788 lineto
-469 776 lineto
-469 764 lineto
-481 752 lineto
-571 752 lineto
-583 764 lineto
-583 776 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 481 788 moveto
-475 788 469 782 469 776 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 481 788 moveto
-475 788 469 782 469 776 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 469 764 moveto
-469 758 475 752 481 752 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 469 764 moveto
-469 758 475 752 481 752 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 571 752 moveto
-577 752 583 758 583 764 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 571 752 moveto
-577 752 583 758 583 764 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 583 776 moveto
-583 782 577 788 571 788 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 583 776 moveto
-583 782 577 788 571 788 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 571 788 moveto
-481 788 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 481 788 moveto
-475 788 469 782 469 776 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 469 776 moveto
-469 764 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 469 764 moveto
-469 758 475 752 481 752 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 481 752 moveto
-571 752 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 571 752 moveto
-577 752 583 758 583 764 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 583 764 moveto
-583 776 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 583 776 moveto
-583 782 577 788 571 788 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-476.5 766.4 moveto 99 (InMemorySort) alignedtext
-grestore
-% 800cab7e-8228-4c85-b19a-39cb844893b7->86cf6620-ce7a-447d-82ac-32d71720d008
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 525.8 788.21 moveto
-525.66 800.66 525.47 817.39 525.32 831.58 curveto
-stroke
-0 0 0 edgecolor
-newpath 521.81 831.78 moveto
-525.2 841.81 lineto
-528.81 831.85 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 521.81 831.78 moveto
-525.2 841.81 lineto
-528.81 831.85 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-526 811.4 moveto 23 (1:1) alignedtext
-grestore
-% 11496054-b3b3-4730-b43a-7130c474ef1f
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 523 1164 moveto
-381 1164 lineto
-369 1152 lineto
-369 1132 lineto
-381 1120 lineto
-523 1120 lineto
-535 1132 lineto
-535 1152 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 523 1164 moveto
-381 1164 lineto
-369 1152 lineto
-369 1132 lineto
-381 1120 lineto
-523 1120 lineto
-535 1132 lineto
-535 1152 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 381 1164 moveto
-375 1164 369 1158 369 1152 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 381 1164 moveto
-375 1164 369 1158 369 1152 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 369 1132 moveto
-369 1126 375 1120 381 1120 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 369 1132 moveto
-369 1126 375 1120 381 1120 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 523 1120 moveto
-529 1120 535 1126 535 1132 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 523 1120 moveto
-529 1120 535 1126 535 1132 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 535 1152 moveto
-535 1158 529 1164 523 1164 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 535 1152 moveto
-535 1158 529 1164 523 1164 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 523 1164 moveto
-381 1164 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 381 1164 moveto
-375 1164 369 1158 369 1152 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 369 1152 moveto
-369 1132 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 369 1132 moveto
-369 1126 375 1120 381 1120 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 381 1120 moveto
-523 1120 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 523 1120 moveto
-529 1120 535 1126 535 1132 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 535 1132 moveto
-535 1152 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 535 1152 moveto
-535 1158 529 1164 523 1164 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-417 1147.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-376.5 1129.4 moveto 151 (\(assign,stream-select\)) alignedtext
-grestore
-% 094cb8b2-df6d-4f73-a8f5-00a6ce14d59b->11496054-b3b3-4730-b43a-7130c474ef1f
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 452 1066.12 moveto
-452 1078.49 452 1095.2 452 1109.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 448.5 1109.96 moveto
-452 1119.96 lineto
-455.5 1109.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 448.5 1109.96 moveto
-452 1119.96 lineto
-455.5 1109.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-452 1089.4 moveto 23 (1:1) alignedtext
-grestore
-% 17c0bf1d-edab-423b-a932-23d1c3111b0e
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 384 420 moveto
-322 420 lineto
-310 408 lineto
-310 388 lineto
-322 376 lineto
-384 376 lineto
-396 388 lineto
-396 408 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 384 420 moveto
-322 420 lineto
-310 408 lineto
-310 388 lineto
-322 376 lineto
-384 376 lineto
-396 388 lineto
-396 408 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 322 420 moveto
-316 420 310 414 310 408 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 322 420 moveto
-316 420 310 414 310 408 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 310 388 moveto
-310 382 316 376 322 376 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 310 388 moveto
-310 382 316 376 322 376 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 384 376 moveto
-390 376 396 382 396 388 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 384 376 moveto
-390 376 396 382 396 388 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 396 408 moveto
-396 414 390 420 384 420 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 396 408 moveto
-396 414 390 420 384 420 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 384 420 moveto
-322 420 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 322 420 moveto
-316 420 310 414 310 408 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 310 408 moveto
-310 388 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 310 388 moveto
-310 382 316 376 322 376 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 322 376 moveto
-384 376 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 384 376 moveto
-390 376 396 382 396 388 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 396 388 moveto
-396 408 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 396 408 moveto
-396 414 390 420 384 420 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-318 403.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-337 385.4 moveto 32 (\(ets\)) alignedtext
-grestore
-% 7e45e056-61c7-47a0-a5d0-5e145b48b64b
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 392 510 moveto
-314 510 lineto
-302 498 lineto
-302 486 lineto
-314 474 lineto
-392 474 lineto
-404 486 lineto
-404 498 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 392 510 moveto
-314 510 lineto
-302 498 lineto
-302 486 lineto
-314 474 lineto
-392 474 lineto
-404 486 lineto
-404 498 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 314 510 moveto
-308 510 302 504 302 498 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 314 510 moveto
-308 510 302 504 302 498 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 302 486 moveto
-302 480 308 474 314 474 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 302 486 moveto
-302 480 308 474 314 474 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 392 474 moveto
-398 474 404 480 404 486 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 392 474 moveto
-398 474 404 480 404 486 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 404 498 moveto
-404 504 398 510 392 510 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 404 498 moveto
-404 504 398 510 392 510 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 392 510 moveto
-314 510 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 314 510 moveto
-308 510 302 504 302 498 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 302 498 moveto
-302 486 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 302 486 moveto
-302 480 308 474 314 474 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 314 474 moveto
-392 474 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 392 474 moveto
-398 474 404 480 404 486 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 404 486 moveto
-404 498 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 404 498 moveto
-404 504 398 510 392 510 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-309.5 488.4 moveto 87 (BTreeSearch) alignedtext
-grestore
-% 17c0bf1d-edab-423b-a932-23d1c3111b0e->7e45e056-61c7-47a0-a5d0-5e145b48b64b
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 353 420.28 moveto
-353 433.34 353 449.97 353 463.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 349.5 463.97 moveto
-353 473.97 lineto
-356.5 463.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 349.5 463.97 moveto
-353 473.97 lineto
-356.5 463.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-353 443.4 moveto 23 (1:1) alignedtext
-grestore
-% 55442d10-e749-4178-99e7-c29d40c980d1
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 469 1254 moveto
-399 1254 lineto
-387 1242 lineto
-387 1230 lineto
-399 1218 lineto
-469 1218 lineto
-481 1230 lineto
-481 1242 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 469 1254 moveto
-399 1254 lineto
-387 1242 lineto
-387 1230 lineto
-399 1218 lineto
-469 1218 lineto
-481 1230 lineto
-481 1242 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 399 1254 moveto
-393 1254 387 1248 387 1242 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 399 1254 moveto
-393 1254 387 1248 387 1242 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 387 1230 moveto
-387 1224 393 1218 399 1218 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 387 1230 moveto
-387 1224 393 1218 399 1218 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 469 1218 moveto
-475 1218 481 1224 481 1230 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 469 1218 moveto
-475 1218 481 1224 481 1230 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 481 1242 moveto
-481 1248 475 1254 469 1254 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 481 1242 moveto
-481 1248 475 1254 469 1254 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 469 1254 moveto
-399 1254 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 399 1254 moveto
-393 1254 387 1248 387 1242 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 387 1242 moveto
-387 1230 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 387 1230 moveto
-387 1224 393 1218 399 1218 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 399 1218 moveto
-469 1218 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 469 1218 moveto
-475 1218 481 1224 481 1230 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 481 1230 moveto
-481 1242 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 481 1242 moveto
-481 1248 475 1254 469 1254 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-395 1232.4 moveto 78 (HashGroup) alignedtext
-grestore
-% 11496054-b3b3-4730-b43a-7130c474ef1f->55442d10-e749-4178-99e7-c29d40c980d1
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 447.73 1164.28 moveto
-445.23 1177.34 442.05 1193.97 439.38 1207.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 435.89 1207.5 moveto
-437.45 1217.97 lineto
-442.77 1208.81 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 435.89 1207.5 moveto
-437.45 1217.97 lineto
-442.77 1208.81 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-445 1187.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% fe400283-741d-4b35-bc79-9e430715f3fb->b07bbb40-a41c-4d00-994b-f5fa5d3eca34
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 715.54 608.04 moveto
-679.06 623.08 630.91 642.93 594.43 657.97 curveto
-stroke
-0 0 0 edgecolor
-newpath 592.85 654.84 moveto
-584.94 661.88 lineto
-595.52 661.31 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 592.85 654.84 moveto
-584.94 661.88 lineto
-595.52 661.31 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-668 631.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 73e52bad-0cff-4d55-b95b-176b16f7f464
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 804 322 moveto
-734 322 lineto
-722 310 lineto
-722 298 lineto
-734 286 lineto
-804 286 lineto
-816 298 lineto
-816 310 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 804 322 moveto
-734 322 lineto
-722 310 lineto
-722 298 lineto
-734 286 lineto
-804 286 lineto
-816 298 lineto
-816 310 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 734 322 moveto
-728 322 722 316 722 310 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 734 322 moveto
-728 322 722 316 722 310 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 722 298 moveto
-722 292 728 286 734 286 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 722 298 moveto
-722 292 728 286 734 286 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 804 286 moveto
-810 286 816 292 816 298 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 804 286 moveto
-810 286 816 292 816 298 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 816 310 moveto
-816 316 810 322 804 322 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 816 310 moveto
-816 316 810 322 804 322 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 804 322 moveto
-734 322 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 734 322 moveto
-728 322 722 316 722 310 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 722 310 moveto
-722 298 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 722 298 moveto
-722 292 728 286 734 286 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 734 286 moveto
-804 286 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 804 286 moveto
-810 286 816 292 816 298 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 816 298 moveto
-816 310 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 816 310 moveto
-816 316 810 322 804 322 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-730 300.4 moveto 78 (HashGroup) alignedtext
-grestore
-% 73e52bad-0cff-4d55-b95b-176b16f7f464->fe17ac32-aa06-4273-bfeb-6ad12004146d
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 769 322.12 moveto
-769 335.65 769 354.38 769 369.85 curveto
-stroke
-0 0 0 edgecolor
-newpath 765.5 369.93 moveto
-769 379.93 lineto
-772.5 369.93 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 765.5 369.93 moveto
-769 379.93 lineto
-772.5 369.93 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-769 345.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 67d4cc31-c6fb-48d3-8ca3-af44628f68ca
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 174 232 moveto
-76 232 lineto
-64 220 lineto
-64 200 lineto
-76 188 lineto
-174 188 lineto
-186 200 lineto
-186 220 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 174 232 moveto
-76 232 lineto
-64 220 lineto
-64 200 lineto
-76 188 lineto
-174 188 lineto
-186 200 lineto
-186 220 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 76 232 moveto
-70 232 64 226 64 220 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 76 232 moveto
-70 232 64 226 64 220 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 64 200 moveto
-64 194 70 188 76 188 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 64 200 moveto
-64 194 70 188 76 188 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 174 188 moveto
-180 188 186 194 186 200 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 174 188 moveto
-180 188 186 194 186 200 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 186 220 moveto
-186 226 180 232 174 232 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 186 220 moveto
-186 226 180 232 174 232 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 174 232 moveto
-76 232 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 76 232 moveto
-70 232 64 226 64 220 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 64 220 moveto
-64 200 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 64 200 moveto
-64 194 70 188 76 188 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 76 188 moveto
-174 188 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 174 188 moveto
-180 188 186 194 186 200 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 186 200 moveto
-186 220 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 186 220 moveto
-186 226 180 232 174 232 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-90 215.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-72 197.4 moveto 106 (\(assign,unnest\)) alignedtext
-grestore
-% f323df6e-1caa-4cb2-9c2c-903df08ee288->67d4cc31-c6fb-48d3-8ca3-af44628f68ca
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 125 134.12 moveto
-125 146.49 125 163.2 125 177.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 121.5 177.96 moveto
-125 187.96 lineto
-128.5 177.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 121.5 177.96 moveto
-125 187.96 lineto
-128.5 177.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-125 157.4 moveto 23 (1:1) alignedtext
-grestore
-% 899fc36b-024c-402f-a155-a218dc3358ee->83b6ee56-1fba-4df7-bd13-89de2edfc4dc
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 178.46 608.04 moveto
-214.94 623.08 263.09 642.93 299.57 657.97 curveto
-stroke
-0 0 0 edgecolor
-newpath 298.48 661.31 moveto
-309.06 661.88 lineto
-301.15 654.84 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 298.48 661.31 moveto
-309.06 661.88 lineto
-301.15 654.84 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-260 631.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% b07bbb40-a41c-4d00-994b-f5fa5d3eca34->800cab7e-8228-4c85-b19a-39cb844893b7
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 537.96 698.21 moveto
-535.89 710.66 533.1 727.39 530.74 741.58 curveto
-stroke
-0 0 0 edgecolor
-newpath 527.22 741.37 moveto
-529.03 751.81 lineto
-534.13 742.53 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 527.22 741.37 moveto
-529.03 751.81 lineto
-534.13 742.53 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-535 721.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% ad75356e-262b-468d-ad27-5ead6cfa49b3->649b70fe-e549-4f38-b248-1868bf691b87
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 125 416.12 moveto
-125 429.65 125 448.38 125 463.85 curveto
-stroke
-0 0 0 edgecolor
-newpath 121.5 463.93 moveto
-125 473.93 lineto
-128.5 463.93 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 121.5 463.93 moveto
-125 473.93 lineto
-128.5 463.93 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-125 443.4 moveto 23 (1:1) alignedtext
-grestore
-% 40fc40ba-d7e5-44a2-a9a6-88642a2e2f79->019d92ce-5cb6-4ed4-a55b-5088b1298356
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 318.1 1254.1 moveto
-320.59 1265.13 324.89 1279.15 332 1290 curveto
-335.5 1295.34 339.91 1300.39 344.6 1304.99 curveto
-stroke
-0 0 0 edgecolor
-newpath 342.37 1307.68 moveto
-352.12 1311.81 lineto
-347.07 1302.5 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 342.37 1307.68 moveto
-352.12 1311.81 lineto
-347.07 1302.5 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-332 1277.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 6a50b453-2460-4ee8-8fc4-9855ecb54862
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 426 608 moveto
-280 608 lineto
-268 596 lineto
-268 576 lineto
-280 564 lineto
-426 564 lineto
-438 576 lineto
-438 596 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 426 608 moveto
-280 608 lineto
-268 596 lineto
-268 576 lineto
-280 564 lineto
-426 564 lineto
-438 576 lineto
-438 596 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 280 608 moveto
-274 608 268 602 268 596 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 280 608 moveto
-274 608 268 602 268 596 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 268 576 moveto
-268 570 274 564 280 564 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 268 576 moveto
-268 570 274 564 280 564 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 426 564 moveto
-432 564 438 570 438 576 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 426 564 moveto
-432 564 438 570 438 576 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 438 596 moveto
-438 602 432 608 426 608 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 438 596 moveto
-438 602 432 608 426 608 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 426 608 moveto
-280 608 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 280 608 moveto
-274 608 268 602 268 596 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 268 596 moveto
-268 576 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 268 576 moveto
-268 570 274 564 280 564 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 280 564 moveto
-426 564 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 426 564 moveto
-432 564 438 570 438 576 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 438 576 moveto
-438 596 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 438 596 moveto
-438 602 432 608 426 608 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-318 591.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-276 573.4 moveto 154 (\(assign,assign,unnest\)) alignedtext
-grestore
-% 6a50b453-2460-4ee8-8fc4-9855ecb54862->83b6ee56-1fba-4df7-bd13-89de2edfc4dc
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 353 608.28 moveto
-353 621.34 353 637.97 353 651.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 349.5 651.97 moveto
-353 661.97 lineto
-356.5 651.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 349.5 651.97 moveto
-353 661.97 lineto
-356.5 651.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-353 631.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 4c0306ed-84f7-4dd8-987c-a800d925505a
-gsave
-0.54118 0.25098 0.93333 nodecolor
-newpath 818 232 moveto
-720 232 lineto
-708 220 lineto
-708 200 lineto
-720 188 lineto
-818 188 lineto
-830 200 lineto
-830 220 lineto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 818 232 moveto
-720 232 lineto
-708 220 lineto
-708 200 lineto
-720 188 lineto
-818 188 lineto
-830 200 lineto
-830 220 lineto
-closepath stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 720 232 moveto
-714 232 708 226 708 220 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 720 232 moveto
-714 232 708 226 708 220 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 708 200 moveto
-708 194 714 188 720 188 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 708 200 moveto
-708 194 714 188 720 188 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 818 188 moveto
-824 188 830 194 830 200 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 818 188 moveto
-824 188 830 194 830 200 curveto
-stroke
-0.54118 0.25098 0.93333 nodecolor
-newpath 830 220 moveto
-830 226 824 232 818 232 curveto
-closepath fill
-1 setlinewidth
-filled
-0.54118 0.25098 0.93333 nodecolor
-newpath 830 220 moveto
-830 226 824 232 818 232 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 818 232 moveto
-720 232 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 720 232 moveto
-714 232 708 226 708 220 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 708 220 moveto
-708 200 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 708 200 moveto
-708 194 714 188 720 188 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 720 188 moveto
-818 188 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 818 188 moveto
-824 188 830 194 830 200 curveto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 830 200 moveto
-830 220 lineto
-stroke
-1 setlinewidth
-filled
-0 0 0 nodecolor
-newpath 830 220 moveto
-830 226 824 232 818 232 curveto
-stroke
-0 0 0 nodecolor
-14 /Times-Roman set_font
-734 215.4 moveto 70 (AquaMeta) alignedtext
-0 0 0 nodecolor
-14 /Times-Roman set_font
-716 197.4 moveto 106 (\(assign,unnest\)) alignedtext
-grestore
-% 5f398745-a0da-4a93-8654-add2e550003c->4c0306ed-84f7-4dd8-987c-a800d925505a
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 769 134.12 moveto
-769 146.49 769 163.2 769 177.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 765.5 177.96 moveto
-769 187.96 lineto
-772.5 177.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 765.5 177.96 moveto
-769 187.96 lineto
-772.5 177.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-769 157.4 moveto 23 (1:1) alignedtext
-grestore
-% 55442d10-e749-4178-99e7-c29d40c980d1->019d92ce-5cb6-4ed4-a55b-5088b1298356
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 423.2 1254.12 moveto
-414.91 1268.04 403.34 1287.47 393.98 1303.18 curveto
-stroke
-0 0 0 edgecolor
-newpath 390.88 1301.55 moveto
-388.76 1311.93 lineto
-396.89 1305.13 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 390.88 1301.55 moveto
-388.76 1311.93 lineto
-396.89 1305.13 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-412 1277.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 162900ff-b4a6-4d0c-b9c2-6595f9d11e4e->094cb8b2-df6d-4f73-a8f5-00a6ce14d59b
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 501.6 976.28 moveto
-492.21 989.85 480.16 1007.28 470.29 1021.56 curveto
-stroke
-0 0 0 edgecolor
-newpath 467.27 1019.76 moveto
-464.46 1029.97 lineto
-473.03 1023.74 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 467.27 1019.76 moveto
-464.46 1029.97 lineto
-473.03 1023.74 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-489 999.4 moveto 67 (M:N Hash) alignedtext
-grestore
-% 67d4cc31-c6fb-48d3-8ca3-af44628f68ca->a80baf03-e23a-4e51-828a-b9ec8620767b
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 125 232.28 moveto
-125 245.34 125 261.97 125 275.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 121.5 275.97 moveto
-125 285.97 lineto
-128.5 275.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 121.5 275.97 moveto
-125 285.97 lineto
-128.5 275.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-125 255.4 moveto 23 (1:1) alignedtext
-grestore
-% 7e45e056-61c7-47a0-a5d0-5e145b48b64b->6a50b453-2460-4ee8-8fc4-9855ecb54862
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 353 510.12 moveto
-353 522.49 353 539.2 353 553.8 curveto
-stroke
-0 0 0 edgecolor
-newpath 349.5 553.96 moveto
-353 563.96 lineto
-356.5 553.96 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 349.5 553.96 moveto
-353 563.96 lineto
-356.5 553.96 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-353 533.4 moveto 23 (1:1) alignedtext
-grestore
-% 4c0306ed-84f7-4dd8-987c-a800d925505a->73e52bad-0cff-4d55-b95b-176b16f7f464
-gsave
-1 setlinewidth
-0 0 0 edgecolor
-newpath 769 232.28 moveto
-769 245.34 769 261.97 769 275.93 curveto
-stroke
-0 0 0 edgecolor
-newpath 765.5 275.97 moveto
-769 285.97 lineto
-772.5 275.97 lineto
-closepath fill
-1 setlinewidth
-solid
-0 0 0 edgecolor
-newpath 765.5 275.97 moveto
-769 285.97 lineto
-772.5 275.97 lineto
-closepath stroke
-0 0 0 edgecolor
-14 /Times-Roman set_font
-769 255.4 moveto 23 (1:1) alignedtext
-grestore
-endpage
-showpage
-grestore
-%%PageTrailer
-%%EndPage: 1
-%%Trailer
-%%Pages: 1
-%%BoundingBox: 36 36 781 1476
-end
-restore
-%%EOF
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql
deleted file mode 100644
index f5e73eb..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type UserType as open {
-  uid: int32, 
-  name: string,
-  lottery_numbers: {{int32}},
-  interests: {{string}}
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Users(UserType) 
-  primary key uid on group1;
-
-load dataset Users 
-using localfs
-(("path"="asterix_nc1:///asterix/asterix-app/data/users-visitors-small/users.json"),("format"="adm")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/020-drop-users.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/020-drop-users.aql
deleted file mode 100644
index 4fd6787..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/020-drop-users.aql
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type UserType as open {
-  uid: int32, 
-  name: string,
-  lottery_numbers: {{int32}},
-  interests: {{string}}
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Users(UserType) 
-  primary key uid on group1;
-
-drop dataset Users;
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql
deleted file mode 100644
index 3051b11..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type UserType as open {
-  uid: int32, 
-  name: string,
-  lottery_numbers: {{int32}},
-  interests: {{string}}
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Users(UserType) 
-  primary key uid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:'/tmp/users.adm';
-
-for $u in dataset('Users')
-// where $u.uid > 1
-// where $u.name = 'Jodi Rotruck'
-return $u
-// return's:q1 { 'user_name': $u.name }
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql
deleted file mode 100644
index 85154b6..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type VisitorType as open {
-  vid: int32, 
-  name: string,
-  lottery_numbers: {{int32}},
-  interests: {{string}}
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Visitors(VisitorType) 
-  primary key vid on group1;
-
-load dataset Visitors 
-using localfs
-(("path"="asterix_nc1:///asterix/asterix-app/data/users-visitors-small/visitors.json"),("format"="asm")) pre-sorted;
-
-
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/050-drop-visitors.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/050-drop-visitors.aql
deleted file mode 100644
index 7be4c8e..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/050-drop-visitors.aql
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type VisitorType as open {
-  vid: int32, 
-  name: string,
-  lottery_numbers: {{int32}},
-  interests: {{string}}
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Visitors(VisitorType) 
-  primary key vid on group1;
-
-drop dataset Visitors;
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql
deleted file mode 100644
index 2f3e103..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type VisitorType as open {
-  vid: int32, 
-  name: string,
-  lottery_numbers: {{int32}},
-  interests: {{string}}
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Visitors(VisitorType) 
-  primary key vid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:'/tmp/visitors.adm';
-
-for $v in dataset('Visitors')
-// where $v.vid >= 10
-// where $v.name = 'Marvella Loud'
-return $v
-// return { 'user_name': $v.name }
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/070-join-aql-lottery_numbers.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/070-join-aql-lottery_numbers.aql
deleted file mode 100644
index 4cea4cf..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/070-join-aql-lottery_numbers.aql
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type UserType as open {
-  uid: int32, 
-  name: string,
-  lottery_numbers: {{int32}},
-  interests: {{string}}
-}
-
-declare type VisitorType as open {
-  vid: int32, 
-  name: string,
-  lottery_numbers: {{int32}},
-  interests: {{string}}
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Users(UserType) 
-  primary key uid on group1;
-declare dataset Visitors(VisitorType) 
-  primary key vid on group1;
-
-write output to asterix_nc1:'/tmp/users-visitors.adm';
-
-//
-// -- - Stage 3 - --
-//
-for $ridpair in 
-    //
-    // -- - Stage 2 - --
-    //
-    for $user in dataset('Users')
-    let $tokens_user :=
-        for $lottery_number in $user.lottery_numbers
-        for $token at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $user in dataset('Users')
-            for $lottery_number in $user.lottery_numbers 
-            group by $item := $lottery_number with $user 
-            order by count($user)
-            return $item
-        where $lottery_number = $token
-        order by $i
-        return $i
-    for $prefix_token_user in subset-collection(
-                                $tokens_user, 
-                                0,
-                                prefix-len(
-                                    len($tokens_user), 'Jaccard', .5))
-
-    for $visitor in dataset('Visitors')
-    let $tokens_visitor :=
-        for $lottery_number in $visitor.lottery_numbers
-        for $token at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $user in dataset('Users')
-            for $lottery_number in $user.lottery_numbers 
-            group by $item := $lottery_number with $user 
-            order by count($user)
-            return $item
-        where $lottery_number = $token
-        order by $i
-        return $i
-    for $prefix_token_visitor in subset-collection(
-                                    $tokens_visitor, 
-                                    0, 
-                                    prefix-len(
-                                        len($tokens_visitor), 'Jaccard', .5))
-
-    where $prefix_token_user = $prefix_token_visitor
-
-    let $sim := similarity(
-                    len($user.lottery_numbers),
-                    $tokens_user,
-                    len($visitor.lottery_numbers),
-                    $tokens_visitor,
-                    $prefix_token_user,
-                    'Jaccard',
-                    .5)
-    where $sim >= .5
-    group by $uid := $user.uid, $vid := $visitor.vid with $sim
-    return { 'uid': $uid, 'vid': $vid, 'sim': $sim[0] }
-
-for $user in dataset('Users')
-for $visitor in dataset('Visitors')
-where $ridpair.uid = $user.uid and $ridpair.vid = $visitor.vid
-return { 'user': $user, 'visitor': $visitor, 'sim': $ridpair.sim }
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/080-join-op-lottery_numbers.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/080-join-op-lottery_numbers.aql
deleted file mode 100644
index c52bb2f..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/080-join-op-lottery_numbers.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type UserType as open {
-  uid: int32, 
-  name: string,
-  lottery_numbers: {{int32}},
-  interests: {{string}}
-}
-
-declare type VisitorType as open {
-  vid: int32, 
-  name: string,
-  lottery_numbers: {{int32}},
-  interests: {{string}}
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Users(UserType) 
-  primary key uid on group1;
-declare dataset Visitors(VisitorType) 
-  primary key vid on group1;
-
-write output to asterix_nc1:'/tmp/users-visitors.adm';
-
-set simthreshold '.5';
-
-for $user in dataset('Users')
-for $visitor in dataset('Visitors')
-where $user.lottery_numbers ~= $visitor.lottery_numbers
-return { 'user': $user, 'visitor': $visitor }
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/090-join-op-interests.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/090-join-op-interests.aql
deleted file mode 100644
index b1334c0..0000000
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/090-join-op-interests.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse fuzzy1;
-
-declare type UserType as open {
-  uid: {{int32}}, 
-  name: string,
-  lottery_numbers: {{int32}},
-  interests: {{string}}
-}
-
-declare type VisitorType as open {
-  vid: {{int32}}, 
-  name: string,
-  lottery_numbers: {{int32}},
-  interests: {{string}}
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Users(UserType) 
-  primary key uid on group1;
-declare dataset Visitors(VisitorType) 
-  primary key vid on group1;
-
-write output to asterix_nc1:'/tmp/users-visitors.adm';
-
-set simthreshold '.5';
-
-for $user in dataset('Users')
-for $visitor in dataset('Visitors')
-where $user.interests ~= $visitor.interests
-return { 'user': $user, 'visitor': $visitor }
diff --git a/asterixdb/asterix-app/src/test/resources/integration/queries/dataset-scan.aql b/asterixdb/asterix-app/src/test/resources/integration/queries/dataset-scan.aql
deleted file mode 100644
index 38262b9..0000000
--- a/asterixdb/asterix-app/src/test/resources/integration/queries/dataset-scan.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo0927;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-
-for $c in dataset('Customers')
-return $c
-// { "custname":$c.name }
-
diff --git a/asterixdb/asterix-app/src/test/resources/integration/queries/retrecord.aql b/asterixdb/asterix-app/src/test/resources/integration/queries/retrecord.aql
deleted file mode 100644
index 997eafd..0000000
--- a/asterixdb/asterix-app/src/test/resources/integration/queries/retrecord.aql
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-declare function samecust($cust, $ord)
-{$cust.cid = $ord.cid}
-
-for $c in recordset(['cid', 'int32', 'name', 'string', 'age', 'int32'], 'osfiles', ['asterix_nc1', 'data/spj01/cust1.adm'], ['asterix_nc2', 'data/spj01/cust2.adm'])
-for $o in recordset(['oid', 'int32', 'date', 'int32', 'cid', 'int32', 'total', 'float'], 'osfiles', ['asterix_nc1', 'data/spj01/ord1.adm'], ['asterix_nc2', 'data/spj01/ord2.adm'])
-where samecust($c, $o)
-return { "customer":$c, "order":$o } 
-
diff --git a/asterixdb/asterix-app/src/test/resources/integration/queries/underpayment1-recordset.aql b/asterixdb/asterix-app/src/test/resources/integration/queries/underpayment1-recordset.aql
deleted file mode 100644
index c599ffc..0000000
--- a/asterixdb/asterix-app/src/test/resources/integration/queries/underpayment1-recordset.aql
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $p in recordset(['pid', 'int32', 'oid', 'int32', 'value', 'float'], 'osfiles', ['asterix_nc1', 'data/spj01/payment1.adm'], ['asterix_nc2', 'data/spj01/payment2.adm'])
-for $o in recordset(['oid', 'int32', 'date', 'int32', 'cid', 'int32', 'total', 'float'], 'osfiles', ['asterix_nc1', 'data/spj01/ord1.adm'], ['asterix_nc2', 'data/spj01/ord2.adm'])
-where $o.oid = $p.oid and $o.total > $p.value
-return 
-{ "order-id": $o.oid, "balance": $o.total - $p.value }
diff --git a/asterixdb/asterix-app/src/test/resources/integration/updates/load-dataset.aql b/asterixdb/asterix-app/src/test/resources/integration/updates/load-dataset.aql
deleted file mode 100644
index 7b9eb66..0000000
--- a/asterixdb/asterix-app/src/test/resources/integration/updates/load-dataset.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo0927;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32
-}
-
-declare type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-
-load dataset Customers 
-using localfs
-(("path"="asterix_nc1://data/spj01/cust1.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/misc/split01.aql b/asterixdb/asterix-app/src/test/resources/misc/split01.aql
deleted file mode 100644
index 5b48a7a..0000000
--- a/asterixdb/asterix-app/src/test/resources/misc/split01.aql
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type CustomerType as open {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/split01.adm";
-
-let $os := for $o in dataset('Orders') return $o
-for $o1 in $os
-for $o2 in $os
-where $o1.cid = $o2.cid
-return { "o1": $o1.oid, "o2": $o2.oid, "cid": $o1.cid }
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/all-drop.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/all-drop.aql
deleted file mode 100644
index 3b2cdf4..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/all-drop.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type ExampleType as open {
-  id: int32,
-  name: string,
-  age: float,
-  salary: double,
-  married: boolean,
-  interests: {{string}},
-  children: [string],
-  address: AddressType,
-  dob: date,
-  time: time,
-  datetime: datetime,
-  duration: duration,
-  location2d: point,
-  location3d: point3d,
-  line: line,
-  polygon: polygon
-  
-  // ?
-  
-  // binary
-  // union
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset All(ExampleType)
-  primary key id on group1;
-
-drop dataset All;
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/all-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/all-load.aql
deleted file mode 100644
index 8053c11..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/all-load.aql
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type ExampleType as open {
-  id: int32,
-  name: string,
-  age: float,
-  salary: double,
-  married: boolean,
-  interests: {{string}},
-  children: [string],
-  address: AddressType,
-  dob: date,
-  time: time,
-  datetime: datetime,
-  duration: duration,
-  location2d: point,
-  location3d: point3d,
-  line: line,
-  polygon: polygon
-  
-  // ?
-  
-  // binary
-  // union
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset All(ExampleType)
-  primary key id on group1;
-
-load dataset All from asterix_nc1:"/home/yasser/Dropbox/Research/data/allData.json";
-
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/all-scan.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/all-scan.aql
deleted file mode 100644
index 04baa50..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/all-scan.aql
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type ExampleType as open {
-  id: int32,
-  name: string,
-  age: float,
-  salary: double,
-  married: boolean,
-  interests: {{string}},
-  children: [string],
-  address: AddressType,
-  dob: date,
-  time: time,
-  datetime: datetime,
-  duration: duration,
-  location2d: point,
-  location3d: point3d,
-  line: line,
-  polygon: polygon
-  
-  // ?
-  
-  // binary
-  // union
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset All(ExampleType)
-  primary key id on group1;
-  
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_all_3.adm";
-
-
-for $o in dataset('All')
-return $o
-
-
-/*
-for $o in dataset('Orders')
-let $c1 := int8("80")
-let $c2 := int16("160")
-let $c3 := int32("320")
-let $c4 := int64("640")
-return {"int8": $c1,"int16": $c2,"int32": $c3, "int8co": $o.int8co, "int64": $c4}
-*/
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-drop.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-drop.aql
deleted file mode 100644
index bee69c1..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-drop.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  budget: int32,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string?,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-
-drop dataset Customers;
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-load.aql
deleted file mode 100644
index 33e089c..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-load.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse metadata;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-write output to asterix_nc1:"/home/yasser/Dropbox/metadata.adm";
-
-
-declare type DataverseType as open {
-dataverseName : string,
-DataverseInfo : {
-    CreatedOn: string,
-    Comments : string
-                }
-}
-
-
-declare nodegroup group1 on asterix_nc1;
-
-declare dataset Dataverse(DataverseType)
-  primary key dataverseName with {"node-group":{"name":"group1"}};
-
-for $c in dataset('Dataverse')
-return $c
-
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-q1.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-q1.aql
deleted file mode 100644
index e86f835..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-q1.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  budget: int32,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_cust_q1.adm";
-
-for $c in dataset('Customers')
-let $rec := { "budget":$c.budget, "budget+5": $c.budget+5, "budget-5": $c.budget -5, "budget*5": $c.budget*5, "budget/5": $c.budget/ 5, "-budget": -$c.budget}
-where $c.cid >= int32("3") 
-return { "id": $c.cid, "custname":$c.name, "age" : $c.age, "MathBudget": $rec }
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-scan.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-scan.aql
deleted file mode 100644
index 8634aa3..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-scan.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  budget: int32,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_cust_3.adm";
-
-for $c in dataset('Customers')
-return $c
-
-
-/*
-for $c in dataset('Customers')
-let $c1 := int8("80")
-let $c2 := int16("160")
-let $c3 := int32("320")
-let $c4 := int64("640")
-let $c5 := float("-80.20")
-let $c6 := double("-20.56")
-return {"id": $c.cid, "int8": $c1,"int16": $c2,"int32": $c3, "int64": $c4, "float": $c5, "double": $c6}
-*/
-
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-drop.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-drop.aql
deleted file mode 100644
index 2f73411..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-drop.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type EmpType as open {
-  cid: int32, 
-  name: string,
-  address: {
-  number: int32, 
-  street: string,
-  city: string
-   },
-  age: int32?,
-  interests: {{string}},
-  children: [string]
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Emp(EmpType) 
-  primary key cid on group1;
-
-drop dataset Emp;
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-load.aql
deleted file mode 100644
index e8fc76b..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-load.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type EmpType as open {
-  cid: int32, 
-  name: string,
-  address: {
-  number: int32, 
-  street: string,
-  city: string
-   },
-  age: int32?,
-  interests: {{string}},
-  children: [string]
-}
-
-
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Emp(EmpType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-load dataset Emp from asterix_nc1:"/home/yasser/Dropbox/Research/data/EmpData.json";
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-q1.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-q1.aql
deleted file mode 100644
index 1091d73..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-q1.aql
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type EmpType as open {
-  cid: int32, 
-  name: string,
-  address: {
-  number: int32, 
-  street: string,
-  city: string
-   },
-  age: int32?,
-  interests: {{string}},
-  children: [string]
-}
-
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Emp(EmpType) 
-  primary key cid on group1;
-
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_emp_q1.adm";
-
-/*
-for $o in dataset('Emp')
-let $l1 := [$o.total, $o.lastorder] // work  
-let $l2 := [ $l1[0], $l1[1]]
-let $l3 := <$o.total, $o.lastorder> // work  
-let $l4 := < $o.children[0], $o.children[1]>
-return { "list1": $l1, "list2": $l2, "list3": $l3, "list4": $l4}
-*/
-/*
-for $o in dataset('Emp')
-
-return { "list0": $l3, "list1": $l7}
-*/
-
-// this query works
-
-for $o in dataset('Emp')
-let $l1 := [$o.cid, $o.name] // work
-let $l2 := [$o.cid , $o.lastorder, $o.name, $o.address, $o.total, $l1, $l1[0], $l1[1]] // work 
-let $l3 := [$o.cid, $l2[5], $l2[6], $l2[7], $o.lastorder]
-return { "list0": $o.children, "list1": $l1, "list2": $l2, "list3": $l3}
-
-
-//for $o in dataset('Emp')
-//let $l0 := [$o.cid, $o.cid] // work 
-//let $l1 := [$o.openlist, $o.total] // work
-//let $l2 := [$o.cid, $o.name] // work
-//let $l3 := [$o.cid, $o.total] // work 
-//let $l4 := [$o.cid , $o.total, $o.lastorder] // work 
-//let $l5 := [$o.cid , $o.lastorder, $o.total] // work 
-//let $l6 := [$o.cid , $o.lastorder, $o.name, $o.address, $o.total, $l2, $l2[0], $l2[1]] // work 
-//let $l7 := [$o.cid, $l6[0], $o.lastorder]
-//return { "list": $l7, "list2": $l6}
-//return { "list": $l0, "list1": $l1}
-//return { "custname":$o.name, "children" : $o.children, "firstChild": $o.children[0] ,  "secondChild": $o.children[1], "interests": $o.interests}
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-scan.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-scan.aql
deleted file mode 100644
index 9cc70ef..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-scan.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type EmpType as open {
-  cid: int32, 
-  name: string,
-  address: {
-  number: int32, 
-  street: string,
-  city: string
-   },
-  age: int32?,
-  interests: {{string}},
-  children: [string]
-}
-
-
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Emp(EmpType) 
-  primary key cid on group1;
-
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_emp_3.adm";
-
-for $c in dataset('Emp')
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/join-01.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/join-01.aql
deleted file mode 100644
index b4fa55f..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/join-01.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  budget: int32,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  hoList: [int32]
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_join_1.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
- where $c.cid = $o.cid 
-return {"cust":$c.name, "custage": $c.age, "ordertot":$o.total, "ordertot":[$o.oid, $o.cid], "unordertot":{{$o.oid, $o.cid}}} 
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/join-02.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/join-02.aql
deleted file mode 100644
index be96fc3..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/join-02.aql
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  budget: int32,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  hoList: [int32]
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-declare dataset Orders(OrderType)
-  primary key oid on group1;
-
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_join_2.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-let $d := [$o.oid, $c.age, $o.cid]
-// let $d := [$c.age, $o.oid, $o.cid] try this one
-where $c.cid = $o.cid
-//return {"cust":$c.name } 
-return {"cust":$c.name, "list": $d } 
-
-//return {"cust":$c.name, "custage": d[0], "orderid":d[1], "ordertotal":d[2]} 
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/join-03.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/join-03.aql
deleted file mode 100644
index 486cb8d..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/join-03.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  budget: int32,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-declare type AddressType as open {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  hoList: [int32]
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Customers(CustomerType) 
-  primary key cid on group1;
-declare dataset Orders(OrderType)
-  primary key oid on group1;
-
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_join_3.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-//let $d := [$c.age, $o.oid, $o.total]
-let $d := [$o.oid, $c.age, $o.cid]
-where $c.cid = $o.cid 
-return {"cust":$c.name, "list": $d, "field1": $d[0], "field2": $d[1], "field3": $d[2]}
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/numeric-drop.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/numeric-drop.aql
deleted file mode 100644
index 2bc4cbd..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/numeric-drop.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type ExampleType as open {
-  id: int32,
-  int8Field: int8,
-  int16Field: int16,
-  int32Field: int32,
-  int64Field: int64,
-  floatField: float,
-  doubleField: double
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Numeric(ExampleType)
-  primary key id with {"node-group":{"name":"group1"}};
-  
-drop dataset Numeric;
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/numeric-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/numeric-load.aql
deleted file mode 100644
index ab9a986..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/numeric-load.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type ExampleType as open {
-  id: int32,
-  int8Field: int8,
-  int16Field: int16,
-  int32Field: int32,
-  int64Field: int64,
-  floatField: float,
-  doubleField: double
-}
-
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Numeric(ExampleType)
-  primary key id on group1;
-
-load dataset Numeric from asterix_nc1:"/home/yasser/Dropbox/Research/data/numericData.json";
-
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/numeric-scan.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/numeric-scan.aql
deleted file mode 100644
index da498a5..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/numeric-scan.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type ExampleType as open {
-  id: int32,
-  int8Field: int8,
-  int16Field: int16,
-  int32Field: int32,
-  int64Field: int64,
-  floatField: float,
-  doubleField: double
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Numeric(ExampleType)
-  primary key id on group1;
-  
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_numeric_3.adm";
-
-
-for $o in dataset('Numeric')
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-drop.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-drop.aql
deleted file mode 100644
index ab12519..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-drop.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  hoList: [int32]
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Orders(OrderType)
-  primary key oid on group1;
-
-drop dataset Orders;
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-load.aql
deleted file mode 100644
index d526f2f..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-load.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  hoList: [int32]
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-load dataset Orders from asterix_nc1:"/home/yasser/Dropbox/Research/data/orderData.json";
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-q1.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-q1.aql
deleted file mode 100644
index 4d33b1b..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-q1.aql
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  hoList: [int32]
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Orders(OrderType)
-  primary key oid on group1;
-
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_ord_q1.adm";
-
-
-
-
-
-// q5:
-for $o in dataset('Orders')
-let $n := embed-type($o.hoList)
-let $c1 := [$o.heList, $n]
-return { "orderid": $o.oid, "heterorderedlist": $c1}
-
-/*
-
-
-// test with empty lists and with accessors on unorderedlist or anytype
-// q3:
-for $o in dataset('Orders')
-let $r := $o.lastorder
-let $l := [$o.DOB, $o.orderstatus]
-////let $nf := $r.oid
-where $o.cid = int32("775")
-////return { "oid" : $o.oid, "loc":$o.loc, "line":$o.line, "ploygon":$o.poly, "year": year($o.DOB)}
-////return { "field1": $nf } // does not wrok
-return { "orderid": $o.oid, "ordertot":$o.total, "list": $l, "item1": $l[0], "item2": $l[1], "item3": $l[2], "record": $r, "favorite numbers": $o.favnumbers, "number1": $o.favnumbers[0], "number2": $o.favnumbers[1], "number3": $o.favnumbers[2], "number6": $o.favnumbers[5]  }
-
-
-// q4:
-for $o in dataset('Orders')
-let $r := $o.lastorder
-let $l := [$o.DOB, $o.orderstatus]
-////let $nf := $r.oid
-where $o.cid = int32("775")
-////return { "oid" : $o.oid, "loc":$o.loc, "line":$o.line, "ploygon":$o.poly, "year": year($o.DOB)}
-////return { "field1": $nf } // does not wrok
-return { "orderid": $o.oid, "ordertot":$o.total, "list": $l, "item1": $l[0], "item2": $l[1], "item3": $l[2], "record": $r, "favorite numbers": $o.favnumbers, "number1": $o.favnumbers[0], "number2": $o.favnumbers[1], "number3": $o.favnumbers[2], "number6": $o.favnumbers[5]  }
-
-
-// q5:
-for $a in [10.0, 20.0 ,30.0]
-return { "ith numbers": $a}
-
-// q6:
-let $list := [10.0, 20.0 ,30.0]
-for $a in $list
-return { "list": $list, "ith numbers": $a}
-
-// q7 
-for $o in dataset('Orders')
-let $list := $o.favnumbers
-for $a in $list
-return { "list": $list, "ith numbers": $a}
-*/
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-scan.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-scan.aql
deleted file mode 100644
index e970692..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-scan.aql
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type OrderType as open {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  hoList: [int32]
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Orders(OrderType)
-  primary key oid on group1;
-
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_ord_3.adm";
-
-for $o in dataset('Orders')
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/spatial-drop.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/spatial-drop.aql
deleted file mode 100644
index 4fc1a32..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/spatial-drop.aql
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type ExampleType as open {
-  id: int32,
-  point: point,
-  point3d: point3d,
-  line: line,
-  polygon: polygon
-}
-
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Spatial(ExampleType)
-  primary key id on group1;
-
-drop dataset Spatial;
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/spatial-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/spatial-load.aql
deleted file mode 100644
index 9fee95d..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/spatial-load.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type ExampleType as open {
-  id: int32,
-  point: point,
-  point3d: point3d,
-  line: line,
-  polygon: polygon
-}
-
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Spatial(ExampleType)
-  primary key id on group1;
-
-load dataset Spatial from asterix_nc1:"/home/yasser/Dropbox/Research/data/spatialData.json";
-
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/spatial-scan.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/spatial-scan.aql
deleted file mode 100644
index b6bfbfd..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/spatial-scan.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-
-declare type ExampleType as open {
-  id: int32,
-  point: point,
-  point3d: point3d,
-  line: line,
-  polygon: polygon
-}
-
-
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Spatial(ExampleType)
-  primary key id with {"node-group":{"name":"group1"}};
-  
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_spatial_3.adm";
-
-
-for $o in dataset('Spatial')
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/temp-drop.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/temp-drop.aql
deleted file mode 100644
index bfd8740..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/temp-drop.aql
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type ExampleType as open {
-  id: int32,
-  dob: date,
-  time: time,
-  datetime: datetime,
-  duration: duration
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Temp(ExampleType)
-  primary key id on group1;
-
-drop dataset Temp;
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/temp-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/temp-load.aql
deleted file mode 100644
index 1f9d02b..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/temp-load.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type ExampleType as open {
-  id: int32,
-  dob: date,
-  time: time,
-  datetime: datetime,
-  duration: duration
-}
-
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Temp(ExampleType)
-  primary key id on group1;
-
-load dataset Temp from asterix_nc1:"/home/yasser/Dropbox/Research/data/tempData.json";
-
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/temp-scan.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/temp-scan.aql
deleted file mode 100644
index c4ce975..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/temp-scan.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type ExampleType as open {
-  id: int32,
-  dob: date,
-  time: time,
-  datetime: datetime,
-  duration: duration
-}
-
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset Temp(ExampleType)
-  primary key id on group1;
-  
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_temp_3.adm";
-
-
-for $o in dataset('Temp')
-return $o
-
-
-/*
-for $o in dataset('Orders')
-let $c1 := int8("80")
-let $c2 := int16("160")
-let $c3 := int32("320")
-let $c4 := int64("640")
-return {"int8": $c1,"int16": $c2,"int32": $c3, "int8co": $o.int8co, "int64": $c4}
-*/
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/alltables-loadAsOpen.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/alltables-loadAsOpen.aql
deleted file mode 100644
index 8db50fb..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/alltables-loadAsOpen.aql
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as open {
-  l_orderkey: int32, 
-  l_linenumber: int32
-}
-
-declare type OrderType as open {
-  o_orderkey: int32
-}
-
-declare type CustomerType as open {
-  c_custkey: int32
-}
-
-declare type SupplierType as open {
-  s_suppkey: int32
-}
-
-declare type NationType as open {
-  n_nationkey: int32
-}
-
-declare type RegionType as open {
-  r_regionkey: int32
-}
-
-declare type PartType as open {
-  p_partkey: int32
-}
-
-declare type PartSuppType as open {
-  ps_partkey: int32, 
-  ps_suppkey: int32
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-//load dataset LineItems from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/lineitem.json" pre-sorted;
-//load dataset Orders from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/orders.json" pre-sorted;
-//load dataset Customers from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/customer.json" pre-sorted;
-//load dataset Suppliers from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/supplier.json" pre-sorted;
-//load dataset Nations from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/nation.json" pre-sorted;
-//load dataset Regions from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/region.json" pre-sorted;
-//load dataset Parts from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/part.json" pre-sorted;
-//load dataset PartSupp from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/partsupp.json" pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/alltablesAsopen-scan.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/alltablesAsopen-scan.aql
deleted file mode 100644
index fc85cc2..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/alltablesAsopen-scan.aql
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: int32, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as open {
-  s_suppkey: int32
-}
-
-declare type NationType as open {
-  n_nationkey: int32
-}
-
-declare type RegionType as open {
-  r_regionkey: int32
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/home/yasser/Desktop/result_scan.adm";
-
-//for $c in dataset('LineItems')
-//return $c
-//for $c in dataset('Orders')
-//return $c
-//for $c in dataset('Customers')
-//return $c
-//for $c in dataset('Suppliers')
-//return $c
-//for $c in dataset('Nations')
-//return $c
-for $c in dataset('Regions')
-return $c
-//for $c in dataset('Parts')
-//return $c
-//for $c in dataset('PartSupp')
-//return $c
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-drop.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-drop.aql
deleted file mode 100644
index f3e6a8c..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-drop.aql
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: int32, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-drop dataset LineItems;
-//drop dataset Orders;
-//drop dataset Customers;
-//drop dataset Suppliers;
-//drop dataset Nations;
-//drop dataset Regions;
-//drop dataset Parts;
-//drop dataset PartSupp;
-
-
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-load.aql
deleted file mode 100644
index 9ce82f5..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-load.aql
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: int32, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-//load dataset LineItems from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/lineitem.json" pre-sorted;
-//load dataset Orders from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/orders.json" pre-sorted;
-//load dataset Customers from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/customer.json" pre-sorted;
-//load dataset Suppliers from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/supplier.json" pre-sorted;
-//load dataset Nations from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/nation.json" pre-sorted;
-//load dataset Regions from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/region.json" pre-sorted;
-//load dataset Parts from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/part.json" pre-sorted;
-load dataset PartSupp from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/partsupp.json" pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q1.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q1.aql
deleted file mode 100644
index 2d7dc47..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q1.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: int32, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_tpch_closed_1.adm";
- 
-for $l in dataset('LineItems')
-where $l.l_shipdate <= '1998-09-02'
-group by $l_returnflag := $l.l_returnflag, $l_linestatus := $l.l_linestatus  
-  with $l
-order by $l_returnflag, $l_linestatus
-return {
-  "l_returnflag": $l_returnflag,
-  "l_linestatus": $l_linestatus,
-  "sum_qty": sum(for $i in $l return $i.l_quantity),
-  "sum_base_price": sum(for $i in $l return $i.l_extendedprice),
-  "sum_disc_price": sum(for $i in $l return $i.l_extendedprice * (1 - $i.l_discount)),
-  "sum_charge": sum(for $i in $l return $i.l_extendedprice * (1 - $i.l_discount) * (1 + $i.l_tax)),
-  "ave_qty": avg(for $i in $l return $i.l_quantity),  
-  "ave_price": avg(for $i in $l return $i.l_extendedprice),
-  "ave_disc": avg(for $i in $l return $i.l_discount),
-  "count_order": count($l)
-}  
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q3.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q3.aql
deleted file mode 100644
index c07998f..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q3.aql
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: int32, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_tpch_closed_3.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where
-  $c.c_mktsegment = 'BUILDING' and $c.c_custkey = $o.o_custkey 
-for $l in dataset('LineItems')
-where
-  $l.l_orderkey = $o.o_orderkey and
-  $o.o_orderdate < '1995-03-15' and $l.l_shipdate > '1995-03-15'
-group by $l_orderkey := $l.l_orderkey, $o_orderdate := $o.o_orderdate, $o_shippriority := $o.o_shippriority
-  with $l
-let $revenue := sum (
-  for $i in $l 
-  return 
-    $i.l_extendedprice * (1 - $i.l_discount)
-)
-order by $revenue desc, $o_orderdate
-limit 10
-return {  
-  "l_orderkey": $l_orderkey,
-  "revenue": $revenue,
-  "o_orderdate": $o_orderdate,
-  "o_shippriority": $o_shippriority 
-}
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q5.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q5.aql
deleted file mode 100644
index 5e95b88..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q5.aql
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: int32, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
-declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
-declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
-declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
-declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
-  
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_tpch_closed_5.adm";
-
-
-for $c in dataset('Customers')
-for $o1 in 
-(  for $o in dataset('Orders')
-   for $l1 in (
-     for $l in dataset('LineItems')
-     for $s1 in 
-     (  for $s in dataset('Suppliers')
-        for $n1 in 
-        (  for $n in dataset('Nations')
-           for $r in dataset('Regions')
-             where $n.n_regionkey = $r.r_regionkey and $r.r_name = 'ASIA'
-           return 
-              {"n_name": $n.n_name, "n_nationkey": $n.n_nationkey}  )
-        where $s.s_nationkey = $n1.n_nationkey
-        return 
-           { "n_name": $n1.n_name, "s_suppkey": $s.s_suppkey, "s_nationkey": $s.s_nationkey }  )
-     where $l.l_suppkey = $s1.s_suppkey      
-     return 
-        { "n_name": $s1.n_name, "l_extendedprice": $l.l_extendedprice, "l_discount": $l.l_discount, "l_orderkey": $l.l_orderkey, "s_nationkey": $s1.s_nationkey }  )
-   where $l1.l_orderkey = $o.o_orderkey and $o.o_orderdate >= '1994-01-01' and $o.o_orderdate < '1995-01-01'
-   return 
-     { "n_name": $l1.n_name, "l_extendedprice": $l1.l_extendedprice, "l_discount": $l1.l_discount, "s_nationkey": $l1.s_nationkey, "o_custkey": $o.o_custkey }  )
-where $c.c_nationkey = $o1.s_nationkey and $c.c_custkey = $o1.o_custkey     
-group by $n_name := $o1.n_name with $o1
-let $revenue := sum (
-  for $i in $o1 
-  return 
-    $i.l_extendedprice * (1 - $i.l_discount)
-)
-order by $revenue desc
-return 
-  { "n_name": $n_name, "revenue": $revenue }
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q9.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q9.aql
deleted file mode 100644
index 9e66584..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q9.aql
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-  
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_tpch_closed_9.adm";
-
-                
-for $profit in 
-(  for $o in dataset('Orders')
-   for $l3 in 
-   (  for $p in dataset('Parts')
-      for $l2 in 
-      (  for $ps in dataset('PartSupp')
-         for $l1 in 
-        (  for $s1 in
-            (  for $s in dataset('Suppliers')
-               for $n in dataset('Nations')
-               where $n.n_nationkey = $s.s_nationkey
-               return 
-                 { "s_suppkey": $s.s_suppkey, "n_name": $n.n_name}  )
-            for $l in dataset('LineItems')
-            where $s1.s_suppkey = $l.l_suppkey       
-            return 
-              { "l_suppkey": $l.l_suppkey, "l_extendedprice": $l.l_extendedprice, "l_discount": $l.l_discount,
-                "l_quantity": $l.l_quantity, "l_partkey": $l.l_partkey, "l_orderkey": $l.l_orderkey, "n_name": $s1.n_name } )
-         where $ps.ps_suppkey = $l1.l_suppkey and $ps.ps_partkey = $l1.l_partkey       
-         return 
-           { "l_extendedprice": $l1.l_extendedprice, "l_discount": $l1.l_discount, "l_quantity": $l1.l_quantity, 
-             "l_partkey": $l1.l_partkey, "l_orderkey": $l1.l_orderkey, "n_name": $l1.n_name, "ps_supplycost": $ps.ps_supplycost }  )
-      where contains($p.p_name, 'green') and $p.p_partkey = $l2.l_partkey    
-      return 
-        { "l_extendedprice": $l2.l_extendedprice, "l_discount": $l2.l_discount, "l_quantity": $l2.l_quantity, 
-          "l_orderkey": $l2.l_orderkey, "n_name": $l2.n_name, "ps_supplycost": $l2.ps_supplycost  }  )
-   where $o.o_orderkey = $l3.l_orderkey
-   let $amount := $l3.l_extendedprice * (1 - $l3.l_discount) -  $l3.ps_supplycost * $l3.l_quantity 
-   let $o_year := year($o.o_orderdate)
-   return 
-     { "nation": $l3.n_name, "o_year": $o_year, "amount": $amount }  )
- group by $nation := $profit.nation, $o_year := $profit.o_year with $profit
- order by $nation, $o_year desc
- return 
-   { "nation": $nation, 
-     "o_year": $o_year, 
-      "sum_profit": sum( for $pr in $profit return $pr.amount )  }    
-   
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-scan.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-scan.aql
deleted file mode 100644
index 66c30cc..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-scan.aql
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: int32, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/home/yasser/Desktop/result_scan.adm";
-
-//for $c in dataset('LineItems')
-//return $c
-//for $c in dataset('Orders')
-//return $c
-for $c in dataset('Customers')
-return $c
-//for $c in dataset('Suppliers')
-//return $c
-//for $c in dataset('Nations')
-//return $c
-//for $c in dataset('Regions')
-//return $c
-//for $c in dataset('Parts')
-//return $c
-//for $c in dataset('PartSupp')
-//return $c
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-drop.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-drop.aql
deleted file mode 100644
index 31a19c7..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-drop.aql
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as open {
-  l_orderkey: int32, 
-  l_linenumber: int32
-}
-
-declare type OrderType as open {
-  o_orderkey: int32
-}
-
-declare type CustomerType as open {
-  c_custkey: int32
-}
-
-declare type SupplierType as open {
-  s_suppkey: int32
-}
-
-declare type NationType as open {
-  n_nationkey: int32
-}
-
-declare type RegionType as open {
-  r_regionkey: int32
-}
-
-declare type PartType as open {
-  p_partkey: int32
-}
-
-declare type PartSuppType as open {
-  ps_partkey: int32, 
-  ps_suppkey: int32 
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-drop dataset LineItems;
-//drop dataset Orders;
-//drop dataset Customers;
-//drop dataset Suppliers;
-//drop dataset Nations;
-//drop dataset Regions;
-//drop dataset Parts;
-//drop dataset PartSupp;
-
-
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-load.aql
deleted file mode 100644
index 89b2590..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-load.aql
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as open {
-  l_orderkey: int32, 
-  l_linenumber: int32
-}
-
-declare type OrderType as open {
-  o_orderkey: int32
-}
-
-declare type CustomerType as open {
-  c_custkey: int32
-}
-
-declare type SupplierType as open {
-  s_suppkey: int32
-}
-
-declare type NationType as open {
-  n_nationkey: int32
-}
-
-declare type RegionType as open {
-  r_regionkey: int32
-}
-
-declare type PartType as open {
-  p_partkey: int32
-}
-
-declare type PartSuppType as open {
-  ps_partkey: int32, 
-  ps_suppkey: int32 
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-//load dataset LineItems from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/lineitem.json" pre-sorted;
-//load dataset Orders from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/orders.json" pre-sorted;
-//load dataset Customers from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/customer.json" pre-sorted;
-//load dataset Suppliers from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/supplier.json" pre-sorted;
-//load dataset Nations from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/nation.json" pre-sorted;
-//load dataset Regions from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/region.json" pre-sorted;
-//load dataset Parts from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/part.json" pre-sorted;
-load dataset PartSupp from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/partsupp.json" pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q1.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q1.aql
deleted file mode 100644
index cd41928..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q1.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as open {
-  l_orderkey: int32, 
-  l_linenumber: int32
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_tpch_open_1.adm";
-
-for $l in dataset('LineItems')
-where $l.l_shipdate <= '1998-09-02'
-group by $l_returnflag := $l.l_returnflag, $l_linestatus := $l.l_linestatus  
-  with $l
-order by $l_returnflag, $l_linestatus
-return {
-  "l_returnflag": $l_returnflag,
-  "l_linestatus": $l_linestatus,
-  "sum_qty": sum(for $i in $l return $i.l_quantity),
-  "sum_base_price": sum(for $i in $l return $i.l_extendedprice),
-  "sum_disc_price": sum(for $i in $l return $i.l_extendedprice * (1 - $i.l_discount)),
-  "sum_charge": sum(for $i in $l return $i.l_extendedprice * (1 - $i.l_discount) * (1 + $i.l_tax)),
-  "ave_qty": avg(for $i in $l return $i.l_quantity),  
-  "ave_price": avg(for $i in $l return $i.l_extendedprice),
-  "ave_disc": avg(for $i in $l return $i.l_discount),
-  "count_order": count($l)
-}  
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q3.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q3.aql
deleted file mode 100644
index 9c319eb..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q3.aql
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as open {
-  l_orderkey: int32, 
-  l_linenumber: int32
-}
-
-declare type OrderType as open {
-  o_orderkey: int32
-}
-
-declare type CustomerType as open {
-  c_custkey: int32
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
-declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
-
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_tpch_open_3.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where
-  $c.c_mktsegment = 'BUILDING' and $c.c_custkey = $o.o_custkey 
-for $l in dataset('LineItems')
-where
-  $l.l_orderkey = $o.o_orderkey and
-  $o.o_orderdate < '1995-03-15' and $l.l_shipdate > '1995-03-15'
-group by $l_orderkey := $l.l_orderkey, $o_orderdate := $o.o_orderdate, $o_shippriority := $o.o_shippriority
-  with $l
-let $revenue := sum (
-  for $i in $l 
-  return 
-    $i.l_extendedprice * (1 - $i.l_discount)
-)
-order by $revenue desc, $o_orderdate
-limit 10
-return {  
-  "l_orderkey": $l_orderkey,
-  "revenue": $revenue,
-  "o_orderdate": $o_orderdate,
-  "o_shippriority": $o_shippriority 
-}
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q5.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q5.aql
deleted file mode 100644
index 408c5a5f..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q5.aql
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as open {
-  l_orderkey: int32, 
-  l_linenumber: int32
-}
-
-declare type OrderType as open {
-  o_orderkey: int32
-}
-
-declare type CustomerType as open {
-  c_custkey: int32
-}
-
-declare type SupplierType as open {
-  s_suppkey: int32
-}
-
-declare type NationType as open {
-  n_nationkey: int32
-}
-
-declare type RegionType as open {
-  r_regionkey: int32
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-  
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_tpch_open_5.adm";
-
-
-for $c in dataset('Customers')
-for $o1 in 
-(  for $o in dataset('Orders')
-   for $l1 in (
-     for $l in dataset('LineItems')
-     for $s1 in 
-     (  for $s in dataset('Suppliers')
-        for $n1 in 
-        (  for $n in dataset('Nations')
-           for $r in dataset('Regions')
-             where $n.n_regionkey = $r.r_regionkey and $r.r_name = 'ASIA'
-           return 
-              {"n_name": $n.n_name, "n_nationkey": $n.n_nationkey}  )
-        where $s.s_nationkey = $n1.n_nationkey
-        return 
-           { "n_name": $n1.n_name, "s_suppkey": $s.s_suppkey, "s_nationkey": $s.s_nationkey }  )
-     where $l.l_suppkey = $s1.s_suppkey      
-     return 
-        { "n_name": $s1.n_name, "l_extendedprice": $l.l_extendedprice, "l_discount": $l.l_discount, "l_orderkey": $l.l_orderkey, "s_nationkey": $s1.s_nationkey }  )
-   where $l1.l_orderkey = $o.o_orderkey and $o.o_orderdate >= '1994-01-01' and $o.o_orderdate < '1995-01-01'
-   return 
-     { "n_name": $l1.n_name, "l_extendedprice": $l1.l_extendedprice, "l_discount": $l1.l_discount, "s_nationkey": $l1.s_nationkey, "o_custkey": $o.o_custkey }  )
-where $c.c_nationkey = $o1.s_nationkey and $c.c_custkey = $o1.o_custkey     
-group by $n_name := $o1.n_name with $o1
-let $revenue := sum (
-  for $i in $o1 
-  return 
-    $i.l_extendedprice * (1 - $i.l_discount)
-)
-order by $revenue desc
-return 
-  { "n_name": $n_name, "revenue": $revenue }
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q9.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q9.aql
deleted file mode 100644
index dccef80..0000000
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q9.aql
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_linenumber: int32
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32
-}
-
-declare type NationType as closed {
-  n_nationkey: int32
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32
-}
-
-declare type PartType as closed {
-  p_partkey: int32
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32 
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-  
-write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_tpch_closed_9.adm";
-
-                
-for $profit in 
-(  for $o in dataset('Orders')
-   for $l3 in 
-   (  for $p in dataset('Parts')
-      for $l2 in 
-      (  for $ps in dataset('PartSupp')
-         for $l1 in 
-        (  for $s1 in
-            (  for $s in dataset('Suppliers')
-               for $n in dataset('Nations')
-               where $n.n_nationkey = $s.s_nationkey
-               return 
-                 { "s_suppkey": $s.s_suppkey, "n_name": $n.n_name}  )
-            for $l in dataset('LineItems')
-            where $s1.s_suppkey = $l.l_suppkey       
-            return 
-              { "l_suppkey": $l.l_suppkey, "l_extendedprice": $l.l_extendedprice, "l_discount": $l.l_discount,
-                "l_quantity": $l.l_quantity, "l_partkey": $l.l_partkey, "l_orderkey": $l.l_orderkey, "n_name": $s1.n_name } )
-         where $ps.ps_suppkey = $l1.l_suppkey and $ps.ps_partkey = $l1.l_partkey       
-         return 
-           { "l_extendedprice": $l1.l_extendedprice, "l_discount": $l1.l_discount, "l_quantity": $l1.l_quantity, 
-             "l_partkey": $l1.l_partkey, "l_orderkey": $l1.l_orderkey, "n_name": $l1.n_name, "ps_supplycost": $ps.ps_supplycost }  )
-      where contains($p.p_name, 'green') and $p.p_partkey = $l2.l_partkey    
-      return 
-        { "l_extendedprice": $l2.l_extendedprice, "l_discount": $l2.l_discount, "l_quantity": $l2.l_quantity, 
-          "l_orderkey": $l2.l_orderkey, "n_name": $l2.n_name, "ps_supplycost": $l2.ps_supplycost  }  )
-   where $o.o_orderkey = $l3.l_orderkey
-   let $amount := $l3.l_extendedprice * (1 - $l3.l_discount) -  $l3.ps_supplycost * $l3.l_quantity 
-   let $o_year := year($o.o_orderdate)
-   return 
-     { "nation": $l3.n_name, "o_year": $o_year, "amount": $amount }  )
- group by $nation := $profit.nation, $o_year := $profit.o_year with $profit
- order by $nation, $o_year desc
- return 
-   { "nation": $nation, 
-     "o_year": $o_year, 
-      "sum_profit": sum( for $pr in $profit return $pr.amount )  }    
-   
diff --git a/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/aggreg-test01.aql b/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/aggreg-test01.aql
deleted file mode 100644
index 74bcce3..0000000
--- a/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/aggreg-test01.aql
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-// count, sum, avg
-for $o in recordset(['oid', 'int32', 'date', 'int32', 'cid', 'int32', 'total', 'float'], 'osfiles', ['asterix_nc1', 'data/spj01/ord1.adm'], ['asterix_nc2', 'data/spj01/ord2.adm'])
-group by $cid := $o.cid with $o
-return { "cid": $cid , "ordpercust": count($o),  
-         "totalcust": sum(for $i in $o return $i.total), 
-         "avgcust": avg(for $i in $o return $i.total) } 
- 
diff --git a/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/j-cust-subplan.aql b/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/j-cust-subplan.aql
deleted file mode 100644
index 646a2d4..0000000
--- a/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/j-cust-subplan.aql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $c in recordset(['cid', 'int32', 'name', 'string', 'age', 'int32'], 'osfiles', ['asterix_nc1', 'data/spj01/cust1.adm'], ['asterix_nc2', 'data/spj01/cust2.adm'])
-where some $c2 in [ $c ]
-      satisfies substring($c2.name, 0, 1) = "J"
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/redundant-orderby.aql b/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/redundant-orderby.aql
deleted file mode 100644
index 216186f..0000000
--- a/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/redundant-orderby.aql
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $x in dataset('A')
-order by $x.a
-order by $x.a
-order by $x.b
-order by $x.b
-return $x
diff --git a/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/spj01-limit01.aql b/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/spj01-limit01.aql
deleted file mode 100644
index 1daa8a1..0000000
--- a/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/spj01-limit01.aql
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-declare function samecust($cust, $ord)
-{$cust.cid = $ord.cid}
-
-for $c in recordset(['cid', 'int32', 'name', 'string', 'age', 'int32'], 'osfiles', ['asterix_nc1', 'data/spj01/cust1.adm'], ['asterix_nc2', 'data/spj01/cust2.adm'])
-for $o in recordset(['oid', 'int32', 'date', 'int32', 'cid', 'int32', 'total', 'float'], 'osfiles', ['asterix_nc1', 'data/spj01/ord1.adm'], ['asterix_nc2', 'data/spj01/ord2.adm'])
-where samecust($c, $o)
-limit 2 
-return { "custname":$c.name, "orddate":$o.date } 
-
diff --git a/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/spj01-recordset.aql b/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/spj01-recordset.aql
deleted file mode 100644
index 5251d9a..0000000
--- a/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/spj01-recordset.aql
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-declare function samecust($cust, $ord)
-{$cust.cid = $ord.cid}
-
-for $c in recordset(['cid', 'int32', 'name', 'string', 'age', 'int32'], 'osfiles', ['asterix_nc1', 'data/spj01/cust1.adm'], ['asterix_nc2', 'data/spj01/cust2.adm'])
-for $o in recordset(['oid', 'int32', 'date', 'int32', 'cid', 'int32', 'total', 'float'], 'osfiles', ['asterix_nc1', 'data/spj01/ord1.adm'], ['asterix_nc2', 'data/spj01/ord2.adm'])
-where samecust($c, $o)
- and $c.age < 21 and $o.total > 1000.00
-return { "custname":$c.name, "orddate":$o.date } 
diff --git a/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/spj01-somesat.aql b/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/spj01-somesat.aql
deleted file mode 100644
index 4cab1d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/spj01-somesat.aql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $c in recordset(['cid', 'int32', 'name', 'string', 'age', 'int32'], 'osfiles', ['asterix_nc1', 'data/spj01/cust1.adm'], ['asterix_nc2', 'data/spj01/cust2.adm'])
-where some $c2 in recordset(['cid', 'int32', 'name', 'string', 'age', 'int32'], 'osfiles', ['asterix_nc1', 'data/spj01/cust1.adm'], ['asterix_nc2', 'data/spj01/cust2.adm'])
-      satisfies $c2.age > $c.age
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/spj01.aql b/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/spj01.aql
deleted file mode 100644
index bec4ec8..0000000
--- a/asterixdb/asterix-app/src/test/resources/old-optimizerts/queries/spj01.aql
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-declare function samecust($cust, $ord)
-{$cust.cid = $ord.cid}
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where samecust($c, $o)
- and $c.age < 21 and $o.total > 1000.00
-return { "custname":$c.name, "orddate":$o.date } 
diff --git a/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/aggreg-test01.plan b/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/aggreg-test01.plan
deleted file mode 100644
index e62f6f3..0000000
--- a/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/aggreg-test01.plan
+++ /dev/null
@@ -1,17 +0,0 @@
--- SINK_WRITE  |PARTITIONED|
-  -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
-    -- STREAM_PROJECT  |PARTITIONED|
-      -- ASSIGN  |PARTITIONED|
-        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-          -- PRE_SORTED_GROUP_BY[$$21]  |PARTITIONED|
-                  {
-                    -- AGGREGATE  |LOCAL|
-                      -- NESTED_TUPLE_SOURCE  |LOCAL|
-                  }
-            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-              -- STABLE_SORT [$$21(ASCENDING)]  |PARTITIONED|
-                -- HASH_PARTITION_EXCHANGE [$$21]  |PARTITIONED|
-                  -- ASSIGN  |PARTITIONED|
-                    -- ASSIGN  |PARTITIONED|
-                      -- AQL_DATASET_UNNEST  |PARTITIONED|
-                        -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/j-cust-subplan.plan b/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/j-cust-subplan.plan
deleted file mode 100644
index 9f2d856..0000000
--- a/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/j-cust-subplan.plan
+++ /dev/null
@@ -1,16 +0,0 @@
--- SINK_WRITE  |PARTITIONED|
-  -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
-    -- STREAM_PROJECT  |PARTITIONED|
-      -- STREAM_SELECT  |PARTITIONED|
-        -- SUBPLAN  |PARTITIONED|
-                {
-                  -- AGGREGATE  |UNPARTITIONED|
-                    -- STREAM_SELECT  |UNPARTITIONED|
-                      -- ASSIGN  |UNPARTITIONED|
-                        -- ASSIGN  |UNPARTITIONED|
-                          -- ASSIGN  |UNPARTITIONED|
-                            -- UNNEST  |UNPARTITIONED|
-                              -- NESTED_TUPLE_SOURCE  |LOCAL|
-                }
-          -- AQL_DATASET_UNNEST  |PARTITIONED|
-            -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/redundant-orderby.plan b/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/redundant-orderby.plan
deleted file mode 100644
index 1674a32..0000000
--- a/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/redundant-orderby.plan
+++ /dev/null
@@ -1,18 +0,0 @@
--- SINK_WRITE  |PARTITIONED|
-  -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
-    -- STREAM_PROJECT  |PARTITIONED|
-      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-        -- STABLE_SORT [$$8(ASCENDING)]  |PARTITIONED|
-          -- RANGE_PARTITION_EXCHANGE [$$8(ASCENDING)]  |PARTITIONED|
-            -- STREAM_PROJECT  |PARTITIONED|
-              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- STABLE_SORT [$$6(ASCENDING)]  |PARTITIONED|
-                  -- RANGE_PARTITION_EXCHANGE [$$6(ASCENDING)]  |PARTITIONED|
-                    -- STREAM_PROJECT  |PARTITIONED|
-                      -- ASSIGN  |PARTITIONED|
-                        -- ASSIGN  |PARTITIONED|
-                          -- ASSIGN  |PARTITIONED|
-                            -- ASSIGN  |PARTITIONED|
-                              -- ASSIGN  |PARTITIONED|
-                                -- AQL_DATASET_UNNEST  |PARTITIONED|
-                                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/spj01-limit01.plan b/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/spj01-limit01.plan
deleted file mode 100644
index 9a84f93..0000000
--- a/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/spj01-limit01.plan
+++ /dev/null
@@ -1,20 +0,0 @@
--- SINK_WRITE  |UNPARTITIONED|
-  -- STREAM_PROJECT  |UNPARTITIONED|
-    -- ASSIGN  |UNPARTITIONED|
-      -- STREAM_LIMIT  |UNPARTITIONED|
-        -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
-          -- STREAM_LIMIT  |PARTITIONED|
-            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-              -- IN_MEMORY_HASH_PAIRWISE_JOIN [$$18][$$19]  |PARTITIONED|
-                -- HASH_PARTITION_EXCHANGE [$$18]  |PARTITIONED|
-                  -- STREAM_PROJECT  |PARTITIONED|
-                    -- ASSIGN  |PARTITIONED|
-                      -- ASSIGN  |PARTITIONED|
-                        -- AQL_DATASET_UNNEST  |PARTITIONED|
-                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                -- HASH_PARTITION_EXCHANGE [$$19]  |PARTITIONED|
-                  -- STREAM_PROJECT  |PARTITIONED|
-                    -- ASSIGN  |PARTITIONED|
-                      -- ASSIGN  |PARTITIONED|
-                        -- AQL_DATASET_UNNEST  |PARTITIONED|
-                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/spj01-recordset.plan b/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/spj01-recordset.plan
deleted file mode 100644
index 9910524..0000000
--- a/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/spj01-recordset.plan
+++ /dev/null
@@ -1,22 +0,0 @@
--- SINK_WRITE  |PARTITIONED|
-  -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
-    -- STREAM_PROJECT  |PARTITIONED|
-      -- ASSIGN  |PARTITIONED|
-        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-          -- IN_MEMORY_HASH_PAIRWISE_JOIN [$$25][$$26]  |PARTITIONED|
-            -- HASH_PARTITION_EXCHANGE [$$25]  |PARTITIONED|
-              -- STREAM_PROJECT  |PARTITIONED|
-                -- STREAM_SELECT  |PARTITIONED|
-                  -- ASSIGN  |PARTITIONED|
-                    -- ASSIGN  |PARTITIONED|
-                      -- ASSIGN  |PARTITIONED|
-                        -- AQL_DATASET_UNNEST  |PARTITIONED|
-                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-            -- HASH_PARTITION_EXCHANGE [$$26]  |PARTITIONED|
-              -- STREAM_PROJECT  |PARTITIONED|
-                -- STREAM_SELECT  |PARTITIONED|
-                  -- ASSIGN  |PARTITIONED|
-                    -- ASSIGN  |PARTITIONED|
-                      -- ASSIGN  |PARTITIONED|
-                        -- AQL_DATASET_UNNEST  |PARTITIONED|
-                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/spj01-somesat.plan b/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/spj01-somesat.plan
deleted file mode 100644
index f96a70e..0000000
--- a/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/spj01-somesat.plan
+++ /dev/null
@@ -1,25 +0,0 @@
--- SINK_WRITE  |PARTITIONED|
-  -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
-    -- STREAM_PROJECT  |PARTITIONED|
-      -- STREAM_SELECT  |PARTITIONED|
-        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-          -- PRE_SORTED_GROUP_BY[$$0]  |PARTITIONED|
-                  {
-                    -- AGGREGATE  |LOCAL|
-                      -- STREAM_SELECT  |LOCAL|
-                        -- NESTED_TUPLE_SOURCE  |LOCAL|
-                  }
-            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-              -- STABLE_SORT [$$0(ASCENDING)]  |PARTITIONED|
-                -- HASH_PARTITION_EXCHANGE [$$0]  |PARTITIONED|
-                  -- STREAM_PROJECT  |PARTITIONED|
-                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      -- NESTED_LOOP_BCAST_JOIN  |PARTITIONED|
-                        -- BROADCAST_EXCHANGE  |PARTITIONED|
-                          -- ASSIGN  |PARTITIONED|
-                            -- AQL_DATASET_UNNEST  |PARTITIONED|
-                              -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                          -- ASSIGN  |PARTITIONED|
-                            -- AQL_DATASET_UNNEST  |PARTITIONED|
-                              -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/spj01.plan b/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/spj01.plan
deleted file mode 100644
index b48a773..0000000
--- a/asterixdb/asterix-app/src/test/resources/old-optimizerts/results/spj01.plan
+++ /dev/null
@@ -1,30 +0,0 @@
--- SINK_WRITE  |PARTITIONED|
-  -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
-    -- STREAM_PROJECT  |PARTITIONED|
-      -- ASSIGN  |PARTITIONED|
-        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-          -- IN_MEMORY_HASH_PAIRWISE_JOIN [$$19][$$20]  |PARTITIONED|
-            -- HASH_PARTITION_EXCHANGE [$$19]  |PARTITIONED|
-              -- STREAM_PROJECT  |PARTITIONED|
-                -- STREAM_SELECT  |PARTITIONED|
-                  -- ASSIGN  |PARTITIONED|
-                    -- ASSIGN  |PARTITIONED|
-                      -- ASSIGN  |PARTITIONED|
-                        -- ASSIGN  |PARTITIONED|
-                          -- ASSIGN  |PARTITIONED|
-                            -- ASSIGN  |PARTITIONED|
-                              -- ASSIGN  |PARTITIONED|
-                                -- AQL_DATASET_UNNEST  |PARTITIONED|
-                                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-            -- HASH_PARTITION_EXCHANGE [$$20]  |PARTITIONED|
-              -- STREAM_PROJECT  |PARTITIONED|
-                -- STREAM_SELECT  |PARTITIONED|
-                  -- ASSIGN  |PARTITIONED|
-                    -- ASSIGN  |PARTITIONED|
-                      -- ASSIGN  |PARTITIONED|
-                        -- ASSIGN  |PARTITIONED|
-                          -- ASSIGN  |PARTITIONED|
-                            -- ASSIGN  |PARTITIONED|
-                              -- ASSIGN  |PARTITIONED|
-                                -- AQL_DATASET_UNNEST  |PARTITIONED|
-                                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01-index-only.aql
deleted file mode 100644
index f2c4028..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01-index-only.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree
- *              : and another for secondary btree index in index subtree.
- *              : In fact, this is an index-only plan from the inner branch's perspective since only PK and SK
- *              : variables are used and returned.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender-location) type rtree;
-create index msgCountAIx on TweetMessages(countA) type btree;
-create index msgCountBIx on TweetMessages(countB) type btree;
-create index msgTextIx on TweetMessages(message-text) type keyword;
-
-for $t1 in dataset('TweetMessages')
-where $t1.tweetid < int64("10")
-order by $t1.tweetid
-return {
-"tweetid1": $t1.tweetid,
-"count1":$t1.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-          where $t1.countA /* +indexnl */= $t2.countB
-          order by $t2.tweetid
-          return {"tweetid2": $t2.tweetid,
-                  "count2":$t2.countB}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
deleted file mode 100644
index 784bf90..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and
- *              : another for secondary btree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender-location) type rtree;
-create index msgCountAIx on TweetMessages(countA) type btree;
-create index msgCountBIx on TweetMessages(countB) type btree;
-create index msgTextIx on TweetMessages(message-text) type keyword;
-
-set 'compiler.indexonly' "false";
-
-for $t1 in dataset('TweetMessages')
-where $t1.tweetid < int64("10")
-order by $t1.tweetid
-return {
-"tweetid1": $t1.tweetid,
-"count1":$t1.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-          where $t1.countA /* +indexnl */= $t2.countB
-          order by $t2.tweetid
-          return {"tweetid2": $t2.tweetid,
-                  "count2":$t2.countB}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/pidx-to-sidx-idxonly-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/pidx-to-sidx-idxonly-equi-join_01.aql
deleted file mode 100644
index 08e786f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/pidx-to-sidx-idxonly-equi-join_01.aql
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Orders' secondary index.
- *                  In fact, this is an index-only plan.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as open {
-  number: int64,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int64,
-  name: string,
-  cashBack: int64,
-  age: int64?,
-  address: AddressType?,
-  lastorder: {
-    oid: int64,
-    total: float
-  }
-}
-
-create type OrderType as open {
-  oid: int64,
-  cid: int64,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  items: [int64]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-create dataset Orders(OrderType) primary key oid;
-
-create index CustomerID_idx on Orders(cid);
-
-count(
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where $c.cid /*+ indexnl */ = $o.cid
-return {"oid": $o.oid, "cid":$c.cid}
-);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_01.aql
deleted file mode 100644
index f247132..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_01.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    fname : string,
-    lname : string
-}
-
-create dataset Names(Name) primary key fname,lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_01.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.fname /*+ indexnl*/> $emp2.fname and $emp1.lname /*+ indexnl*/> $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_02.aql
deleted file mode 100644
index 1c04e5b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_02.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    fname : string,
-    lname : string
-}
-
-create dataset Names(Name) primary key fname,lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_02.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.fname /*+ indexnl*/< $emp2.fname and $emp1.lname /*+ indexnl*/< $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_03.aql
deleted file mode 100644
index 8b52af5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_03.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    fname : string,
-    lname : string
-}
-
-create dataset Names(Name) primary key fname,lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_03.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.fname /*+ indexnl*/= $emp2.fname and $emp1.lname /*+ indexnl*/= $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_01.aql
deleted file mode 100644
index e03febf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_01.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    fname : string,
-    lname : string
-}
-
-create dataset Names(Name) primary key fname,lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_01.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.fname /*+ indexnl*/< $emp2.fname and $emp1.lname /*+ indexnl*/> $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_02.aql
deleted file mode 100644
index 99ea3de..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_02.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    fname : string,
-    lname : string
-}
-
-create dataset Names(Name) primary key fname,lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_02.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.fname /*+ indexnl*/> $emp2.fname and $emp1.lname /*+ indexnl*/< $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_03.aql
deleted file mode 100644
index 195eeb4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_03.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    fname : string,
-    lname : string
-}
-
-create dataset Names(Name) primary key fname,lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_03.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.fname /*+ indexnl*/> $emp2.fname and $emp1.lname /*+ indexnl*/= $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_04.aql
deleted file mode 100644
index 5fe30db..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_04.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    fname : string,
-    lname : string
-}
-
-create dataset Names(Name) primary key fname,lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_04.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.fname /*+ indexnl*/< $emp2.fname and $emp1.lname /*+ indexnl*/= $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_05.aql
deleted file mode 100644
index 2ccaca3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_05.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    fname : string,
-    lname : string
-}
-
-create dataset Names(Name) primary key fname,lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_05.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.fname /*+ indexnl*/= $emp2.fname and $emp1.lname /*+ indexnl*/> $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_06.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_06.aql
deleted file mode 100644
index c9767af..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_06.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    fname : string,
-    lname : string
-}
-
-create dataset Names(Name) primary key fname,lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_06.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.fname /*+ indexnl*/= $emp2.fname and $emp1.lname /*+ indexnl*/< $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-multipred.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-multipred.aql
deleted file mode 100644
index 8a78d40..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-multipred.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Customers' primary index.
- *                  We expect the additional predicates to be put into a select above the
- *                  primary index search.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-create type OrderType as closed {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-create dataset Customers(CustomerType) primary key cid;
-create dataset Orders(OrderType) primary key oid;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-multipred.adm";
-
-for $o in dataset('Orders')
-for $c in dataset('Customers')
-where $c.cid /*+ indexnl */ = $o.cid and $c.name < $o.orderstatus and $c.age < $o.cid
-return {"customer":$c, "order": $o}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-neg_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-neg_01.aql
deleted file mode 100644
index 1815c66..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-neg_01.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : This is a negative test, mis-spelt/incorrect HINT should result in
- *                a plan not using an indexed-nested loops join strategy. We expect a hash join. 
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestType as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create dataset test1.DsOne(TestType) primary key key1;
-create dataset test1.DsTwo(TestType) primary key key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-neg_01.adm";
-
-for $x in dataset('test1.DsOne')
-for $y in dataset('test1.DsTwo')
-where $x.key1 /*+ index */ = $y.key2
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-neg_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-neg_02.aql
deleted file mode 100644
index 057f9a5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-neg_02.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : This is a negative test, mis-spelt/incorrect HINT should result in
- *                a plan not using an indexed-nested loops join strategy. We expect a hash join. 
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestType as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create dataset test1.DsOne(TestType) primary key key1;
-create dataset test1.DsTwo(TestType) primary key key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-neg_02.adm";
-
-for $x in dataset('test1.DsOne')
-for $y in dataset('test1.DsTwo')
-where $x.key2 /*+ index */ = $y.key1
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_01.aql
deleted file mode 100644
index aeb6cbb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_01.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan.
- *              : We expect a plan that hash-exchanges internal dataset DsTwo, then probes internal dataset DsOne’s primary index.
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestType as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create dataset test1.DsOne(TestType) primary key key1;
-create dataset test1.DsTwo(TestType) primary key key1;
-
-// Please note content enclosed in the comment in the predicate is a HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_01.adm";
-
-for $y in dataset('test1.DsTwo')
-for $x in dataset('test1.DsOne')
-where $x.key1 /*+ indexnl */ = $y.key2
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_02.aql
deleted file mode 100644
index 2aa29f4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_02.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan.
- *              : We expect a plan that hash-exchanges internal dataset DsTwo, then probes internal dataset DsOne’s primary index.
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestType as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create dataset test1.DsOne(TestType) primary key key1;
-create dataset test1.DsTwo(TestType) primary key key1;
-
-// Please note content enclosed in the comment in the predicate is a HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_02.adm";
-
-for $x in dataset('test1.DsOne')
-for $y in dataset('test1.DsTwo')
-where $x.key2 /*+ indexnl */ = $y.key1
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_03.aql
deleted file mode 100644
index 622e8e1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_03.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Customers' primary index.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-create type OrderType as closed {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-create dataset Customers(CustomerType) primary key cid;
-create dataset Orders(OrderType) primary key oid;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_04.adm";
-
-for $o in dataset('Orders')
-for $c in dataset('Customers')
-where $c.cid /*+ indexnl */ = $o.cid
-return {"customer":$c, "order": $o}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_05.aql
deleted file mode 100644
index f8525cf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_05.aql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self-equi joins a dataset, Customers, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Customers' primary index.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_06.adm";
-
-for $c1 in dataset('Customers')
-for $c2 in dataset('Customers')
-where $c1.cid /*+ indexnl */ = $c2.cid 
-return {"customer1":$c1, "customer2":$c2} 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-ge-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-ge-join_01.aql
deleted file mode 100644
index 72b8b87..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-ge-join_01.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan.
- *              : We expect a plan that broadcasts internal dataset DsTwo, then probes internal dataset DsOne’s primary index.
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestType as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create dataset test1.DsOne(TestType) primary key key1;
-create dataset test1.DsTwo(TestType) primary key key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-ge-join_01.adm";
-
-for $y in dataset('test1.DsTwo')
-for $x in dataset('test1.DsOne')
-where $x.key1 /*+ indexnl */ >= $y.key2
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-ge-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-ge-join_02.aql
deleted file mode 100644
index 745361f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-ge-join_02.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan. 
- *              : We expect a plan that broadcasts internal dataset DsTwo, then probes internal dataset DsOne’s primary index. 
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestType as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create dataset test1.DsOne(TestType) primary key key1;
-create dataset test1.DsTwo(TestType) primary key key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-ge-join_02.adm";
-
-for $x in dataset('test1.DsOne')
-for $y in dataset('test1.DsTwo')
-where $x.key2 /*+ indexnl */ <= $y.key1
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-gt-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-gt-join_01.aql
deleted file mode 100644
index 05d3f89..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-gt-join_01.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan.
- *              : We expect a plan that broadcasts internal dataset DsTwo, then probes internal dataset DsOne’s primary index.
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestType as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create dataset test1.DsOne(TestType) primary key key1;
-create dataset test1.DsTwo(TestType) primary key key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-gt-join_01.adm";
-
-for $y in dataset('test1.DsTwo')
-for $x in dataset('test1.DsOne')
-where $x.key1 /*+ indexnl */ > $y.key2
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-gt-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-gt-join_02.aql
deleted file mode 100644
index 935b884..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-gt-join_02.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan. 
- *              : We expect a plan that broadcasts internal dataset DsTwo, then probes internal dataset DsOne’s primary index. 
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestType as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create dataset test1.DsOne(TestType) primary key key1;
-create dataset test1.DsTwo(TestType) primary key key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-gt-join_02.adm";
-
-for $x in dataset('test1.DsOne')
-for $y in dataset('test1.DsTwo')
-where $x.key2 /*+ indexnl */ < $y.key1
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-le-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-le-join_01.aql
deleted file mode 100644
index 6353d16..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-le-join_01.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan.
- *              : We expect a plan that broadcasts internal dataset DsTwo, then probes internal dataset DsOne’s primary index.
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestType as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create dataset test1.DsOne(TestType) primary key key1;
-create dataset test1.DsTwo(TestType) primary key key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-le-join_01.adm";
-
-for $y in dataset('test1.DsTwo')
-for $x in dataset('test1.DsOne')
-where $x.key1 /*+ indexnl */ <= $y.key2
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-le-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-le-join_02.aql
deleted file mode 100644
index 34d128d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-le-join_02.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan. 
- *              : We expect a plan that broadcasts internal dataset DsTwo, then probes internal dataset DsOne’s primary index. 
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestType as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create dataset test1.DsOne(TestType) primary key key1;
-create dataset test1.DsTwo(TestType) primary key key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-le-join_02.adm";
-
-for $x in dataset('test1.DsOne')
-for $y in dataset('test1.DsTwo')
-where $x.key2 /*+ indexnl */ >= $y.key1
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-lt-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-lt-join_01.aql
deleted file mode 100644
index a5a964d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-lt-join_01.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan.
- *              : We expect a plan that broadcasts internal dataset DsTwo, then probes internal dataset DsOne’s primary index.
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestType as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create dataset test1.DsOne(TestType) primary key key1;
-create dataset test1.DsTwo(TestType) primary key key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-lt-join_01.adm";
-
-for $y in dataset('test1.DsTwo')
-for $x in dataset('test1.DsOne')
-where $x.key1 /*+ indexnl */ < $y.key2
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-lt-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-lt-join_02.aql
deleted file mode 100644
index b629d54..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-lt-join_02.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan. 
- *              : We expect a plan that broadcasts internal dataset DsTwo, then probes internal dataset DsOne’s primary index. 
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestType as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create dataset test1.DsOne(TestType) primary key key1;
-create dataset test1.DsTwo(TestType) primary key key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-lt-join_02.adm";
-
-for $x in dataset('test1.DsOne')
-for $y in dataset('test1.DsTwo')
-where $x.key2 /*+ indexnl */ > $y.key1
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join-multipred.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join-multipred.aql
deleted file mode 100644
index bffaf9c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join-multipred.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, DBLP and CSX, based on their title.
- *                  DBLP has a secondary btree index on title, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the additional predicates to be put into a select above the
- *                  primary index search.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index title_index on DBLP(title);
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multipred.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where $a.title /*+ indexnl */ = $b.title and $a.authors < $b.authors and $a.misc > $b.misc
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_01.aql
deleted file mode 100644
index eb2d407..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_01.aql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, DBLP and CSX, based on their title.
- *                  DBLP has a secondary btree index on title, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index title_index on DBLP(title);
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where $a.title /*+ indexnl */ = $b.title
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-self-equi-join-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-self-equi-join-index-only.aql
deleted file mode 100644
index e71101a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-self-equi-join-index-only.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self-equi joins on a dataset using two fields - countA and countB.
- *                  TweetMessages has a secondary btree index on countB, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- *                  In fact, this is an index-only plan from the inner branch's perspective since only PK and SK
- *                  variables are used and returned.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int64,
-    statuses-count: int64,
-    name: string,
-    followers-count: int64
-}
-
-create type TweetMessageType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int64,
-    countB: int64
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender-location) type rtree;
-create index msgCountAIx on TweetMessages(countA) type btree;
-create index msgCountBIx on TweetMessages(countB) type btree;
-create index msgTextIx on TweetMessages(message-text) type keyword;
-
-for $t1 in dataset('TweetMessages')
-for $t2 in dataset('TweetMessages')
-let $c := $t1.countA + 20
-where $c /* +indexnl */= $t2.countB
-order by $t2.tweetid
-return {"tweetid2": $t2.tweetid, "count2":$t2.countB};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-self-equi-join.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-self-equi-join.aql
deleted file mode 100644
index 7dd9ddb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-self-equi-join.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self-equi joins on a dataset using two fields - countA and countB.
- *                  TweetMessages has a secondary btree index on countB, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int64,
-    statuses-count: int64,
-    name: string,
-    followers-count: int64
-}
-
-create type TweetMessageType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int64,
-    countB: int64
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender-location) type rtree;
-create index msgCountAIx on TweetMessages(countA) type btree;
-create index msgCountBIx on TweetMessages(countB) type btree;
-create index msgTextIx on TweetMessages(message-text) type keyword;
-
-set 'compiler.indexonly' "false";
-
-for $t1 in dataset('TweetMessages')
-for $t2 in dataset('TweetMessages')
-let $c := $t1.countA + 20
-where $c /* +indexnl */= $t2.countB
-order by $t2.tweetid
-return {"tweetid2": $t2.tweetid, "count2":$t2.countB};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-idxonly-to-pidx-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-idxonly-to-pidx-equi-join_01.aql
deleted file mode 100644
index d001bc4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-idxonly-to-pidx-equi-join_01.aql
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /*
- * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Customers' primary index.
- *                  An index-only plan exists in the outer branch.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type AddressType as open {
-  number: int64,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int64,
-  name: string,
-  cashBack: int64,
-  age: int64?,
-  address: AddressType?,
-  lastorder: {
-    oid: int64,
-    total: float
-  }
-}
-
-create type OrderType as open {
-  oid: int64,
-  cid: int64,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  items: [int64]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-create dataset Orders(OrderType) primary key oid;
-
-create index CustomerID_idx on Orders(cid);
-
-count(
-for $o in dataset('Orders')
-for $c in dataset('Customers')
-where $o.cid < 800 and $o.cid /*+ indexnl */ = $c.cid
-return {"oid": $o.oid, "cid":$c.cid}
-);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-idxonly-to-sidx-idxonly-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-idxonly-to-sidx-idxonly-equi-join_01.aql
deleted file mode 100644
index 44efb8a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-idxonly-to-sidx-idxonly-equi-join_01.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Orders' secondary index.
- *                  Each branch (outer and inner) will be transformed as an index-only plan.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type AddressType as open {
-  number: int64,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int64,
-  name: string,
-  cashBack: int64,
-  age: int64?,
-  address: AddressType?,
-  lastorder: {
-    oid: int64,
-    total: float
-  }
-}
-
-create type OrderType as open {
-  oid: int64,
-  cid: int64,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  items: [int64]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-create dataset Orders(OrderType) primary key oid;
-
-create index CustomerID_idx on Orders(cid);
-create index Cashback_idx on Customers(cashBack);
-
-count(
-for $o in dataset('Orders')
-for $c in dataset('Customers')
-where $o.cid < 100000 and $o.cid /*+ indexnl */ = $c.cashBack
-return {"oid": $o.oid, "cid":$c.cid}
-);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-non-idxonly-to-sidx-idxonly-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-non-idxonly-to-sidx-idxonly-equi-join_01.aql
deleted file mode 100644
index 950e451..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-non-idxonly-to-sidx-idxonly-equi-join_01.aql
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Orders' secondary index.
- *                  Inner branch will be transformed as an index-only plan.
- *                  Outer branch cannot be transformed as an index-only plan as an index can't cover
- *                  all search predicates even excluding the join condition.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type AddressType as open {
-  number: int64,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int64,
-  name: string,
-  cashBack: int64,
-  age: int64?,
-  address: AddressType?,
-  lastorder: {
-    oid: int64,
-    total: float
-  }
-}
-
-create type OrderType as open {
-  oid: int64,
-  cid: int64,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  items: [int64]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-create dataset Orders(OrderType) primary key oid;
-
-create index CustomerID_idx on Orders(cid);
-create index Cashback_idx on Customers(cashBack);
-
-count(
-for $o in dataset('Orders')
-for $c in dataset('Customers')
-where $o.cid < 100000 and $o.total >= 0 and $o.cid /*+ indexnl */ = $c.cashBack
-return {"oid": $o.oid, "cid":$c.cid}
-);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-01.aql
deleted file mode 100644
index 407513e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-01.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used
- *                  : for an invocation of current-datetime()
- *  Expected Result : Success
- *  Date            : 27th Aug 2015
- *    Author            : Steven Jacobs
- */
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-create type CHPReport as {
-        "id":int,
-    "timestamp":datetime,
-        "title":string,
-        "message":string
-}
-create dataset CHPReports(CHPReport)
-primary key timestamp;
-
-for $emergency in dataset CHPReports
-where $emergency.timestamp >= current-datetime() - day-time-duration("PT10H")
-and $emergency.title = "ghost"
-return $emergency.message;
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-02.aql
deleted file mode 100644
index e6335ba..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-02.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used
- *                  : for an invocation of current-datetime()
- *  Expected Result : Success
- *  Date            : 27th Aug 2015
- *    Author            : Steven Jacobs
- */
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-create type CHPReport as {
-        "id":int,
-    "timestamp":datetime,
-        "title":string,
-        "message":string
-}
-create dataset CHPReports(CHPReport)
-primary key timestamp;
-
-for $emergency in dataset CHPReports
-let $time := current-datetime() - day-time-duration("PT10H")
-where $emergency.timestamp >= $time
-return $emergency;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-03.aql
deleted file mode 100644
index df6f528..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-03.aql
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used
- *                  : for an invocation of current-datetime()
- *  Expected Result : Success
- *  Date            : 27th Aug 2015
- *    Author            : Steven Jacobs
- */
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-create type CHPReport as {
-        "id":int,
-    "timestamp":datetime,
-        "title":string,
-        "message":string
-}
-create dataset CHPReports(CHPReport)
-primary key timestamp;
-
-for $emergency in dataset CHPReports
-where $emergency.timestamp >= current-datetime()
-return $emergency;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-04.aql
deleted file mode 100644
index 5af8ce9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-04.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test makes sure that the plan is still okay when not converted to index search
- *  Expected Result : Success
- *  Date            : 27th Aug 2015
- *    Author            : Steven Jacobs
- */
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-create type CHPReport as {
-        "id":int,
-    "timestamp":datetime,
-        "title":string,
-        "message":string
-}
-create dataset CHPReports(CHPReport)
-primary key id;
-
-for $emergency in dataset CHPReports
-where $emergency.timestamp >= current-datetime()
-return $emergency;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-01.aql
deleted file mode 100644
index 18b8095..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-01.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Please note this is a Positive test and the BTree index should be used in the plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-01.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname > "Roger"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-02.aql
deleted file mode 100644
index 47d3fa5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-02.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// This is a Positive test - prefix search, BTree index should be used in the plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-02.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-// create internal dataset with primary index defined on fname,lname fields
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname >= "Susan"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-03.aql
deleted file mode 100644
index a2558a5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-03.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Positive test - prefix search, BTree index should be used.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-03.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-// create internal dataset with primary index defined on fname,lname fields
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname < "Isa"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-04.aql
deleted file mode 100644
index 264025a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-04.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Positive test - prefix search, BTree index should be used in query plan
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-04.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-// create internal dataset with primary index defined on fname,lname fields
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname <= "Vanpatten"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-05.aql
deleted file mode 100644
index 319e68f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-05.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is NOT used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - BTree index should NOT be used in query plan
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-05.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-// create internal dataset with primary index defined on fname,lname fields
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname != "Max"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-06.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-06.aql
deleted file mode 100644
index 587608e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-06.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Positive test - prefix search, BTree index should be used in the query plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-06.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-// create internal dataset with primary index defined on fname,lname fields
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname = "Julio"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-07.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-07.aql
deleted file mode 100644
index 0a0d25f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-07.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is NOT used 
- *                  : in the optimized query plan. 
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// THE BTREE INDEX IN THIS CASE SHOULD NOT BE PICKED UP!!!!
-// Verify that the optimized query plan does not have the BTree search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-07.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-// create internal dataset with primary index defined on fname,lname fields
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.lname = "Kim"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-08.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-08.aql
deleted file mode 100644
index 965ed78..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-08.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used in the optimized query plan 
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-08.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname = "Young Seok" and $emp.lname = "Kim"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-09.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-09.aql
deleted file mode 100644
index e3337ed..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-09.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is NOT used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-09.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname = "Julio" or $emp.lname = "Malaika"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-10.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-10.aql
deleted file mode 100644
index 34dbe35..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-10.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification (usage) test
- *                  : This test is intended to verify that the primary BTree index is NOT used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-10.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname > "Alex" and $emp.lname < "Zach"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-11.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-11.aql
deleted file mode 100644
index 48881d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-11.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan for predicates.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-11.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname > "Allan" and $emp.lname < "Zubi"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-12.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-12.aql
deleted file mode 100644
index da7f3e7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-12.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification (usage) test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Positive test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-12.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname > "Allan" and $emp.lname = "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-13.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-13.aql
deleted file mode 100644
index cb75b3d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-13.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Positive test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-13.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname = "Julio" and $emp.lname < "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-14.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-14.aql
deleted file mode 100644
index 14ad381..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-14.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-14.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname >= "Michael" and $emp.lname <= "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-15.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-15.aql
deleted file mode 100644
index f682827..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-15.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-15.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname > "Craig" and $emp.lname > "Kevin" and $emp.fname < "Mary" and $emp.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-16.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-16.aql
deleted file mode 100644
index 9ec8de5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-16.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-16.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname >= "Craig" and $emp.lname >= "Kevin" and $emp.fname <= "Mary" and $emp.lname <= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-17.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-17.aql
deleted file mode 100644
index d835232..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-17.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-17.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname <= "Craig" and $emp.lname > "Kevin"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-18.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-18.aql
deleted file mode 100644
index 9b2dbd9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-18.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is NOT used 
- *                  : in the optimized query plan 
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-18.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname != "Michael" and $emp.lname != "Carey"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-19.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-19.aql
deleted file mode 100644
index a086a1e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-19.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-19.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname > "Craig" and $emp.lname > "Kevin" and $emp.fname <= "Mary" and $emp.lname <= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-20.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-20.aql
deleted file mode 100644
index df40b5a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-20.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-20.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname >= "Craig" and $emp.lname >= "Kevin" and $emp.fname < "Mary" and $emp.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-21.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-21.aql
deleted file mode 100644
index a4687ae..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-21.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-21.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname;
-
-for $emp in dataset('testdst') 
-where $emp.fname > "Max" 
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-22.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-22.aql
deleted file mode 100644
index 1e0b035..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-22.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-22.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname;
-
-for $emp in dataset('testdst') 
-where $emp.fname >= "Sofia" 
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-23.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-23.aql
deleted file mode 100644
index 80bcd8c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-23.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-23.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname;
-
-for $emp in dataset('testdst') 
-where $emp.fname < "Chen" 
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-24.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-24.aql
deleted file mode 100644
index e72a8ab..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-24.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-24.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname;
-
-for $emp in dataset('testdst') 
-where $emp.fname <= "Julio" 
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-25.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-25.aql
deleted file mode 100644
index 4e58551..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-25.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-25.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname;
-
-for $emp in dataset('testdst') 
-where $emp.fname > "Neil" and $emp.fname < "Roger" 
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-26.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-26.aql
deleted file mode 100644
index 1eaa9b0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-26.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-26.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname;
-
-for $emp in dataset('testdst') 
-where $emp.fname >= "Max" and $emp.fname <= "Roger" 
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-27.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-27.aql
deleted file mode 100644
index 0d49790..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-27.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 5th Feb 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-27.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname > "Craig" and $emp.lname > "Kevin" and $emp.fname <= "Mary" and $emp.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-28.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-28.aql
deleted file mode 100644
index 7a5e69e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-28.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 5th Feb 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-28.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType)  primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname > "Craig" and $emp.lname > "Kevin" and $emp.fname < "Mary" and $emp.lname <= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-29.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-29.aql
deleted file mode 100644
index 153c20f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-29.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 5th Feb 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-29.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType)  primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname > "Craig" and $emp.lname >= "Kevin" and $emp.fname < "Mary" and $emp.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-30.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-30.aql
deleted file mode 100644
index 873130b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-30.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 5th Feb 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-30.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType)  primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname >= "Craig" and $emp.lname > "Kevin" and $emp.fname < "Mary" and $emp.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-31.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-31.aql
deleted file mode 100644
index 4e74512..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-31.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 11th Nov 2014
- */
-
-// Positive test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-31.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname = "Julio" and $emp.lname > "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-32.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-32.aql
deleted file mode 100644
index 8958d54..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-primary-32.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 11th Nov 2014
- */
-
-// Positive test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-32.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname < "Julio" and $emp.lname = "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-37.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-37.aql
deleted file mode 100644
index 08a4024..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-37.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - BTree index should NOT be used in query plan
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-37.adm";
-
-create type TestType as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname,lname);
-
-for $emp in dataset('testdst') 
-where $emp.fname != "Max"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-38.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-38.aql
deleted file mode 100644
index 176be62..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-38.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Positive test - prefix search, BTree index should be used in the query plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-38.adm";
-
-create type TestType as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname,lname);
-
-for $emp in dataset('testdst') 
-where $emp.fname = "Julio"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-39.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-39.aql
deleted file mode 100644
index ca205ab..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-39.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// THE BTREE INDEX IN THIS CASE SHOULD NOT BE PICKED UP!!!!
-// Verify that the optimized query plan does not have the BTree search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-39.adm";
-
-create type TestType as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname,lname);
-
-for $emp in dataset('testdst') 
-where $emp.lname = "Kim"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-41.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-41.aql
deleted file mode 100644
index 15187dc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-41.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-41.adm";
-
-create type TestType as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname,lname);
-
-for $emp in dataset('testdst') 
-where $emp.fname = "Julio" or $emp.lname = "Malaika"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-50.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-50.aql
deleted file mode 100644
index 815bae3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-50.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used 
- *                  : in the optimized query plan 
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-50.adm";
-
-create type TestType as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname,lname);
-
-for $emp in dataset('testdst') 
-where $emp.fname != "Michael" and $emp.lname != "Carey"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-composite-idxonly-01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-composite-idxonly-01.aql
deleted file mode 100644
index 2599bd1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-composite-idxonly-01.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : This test is intended to verify that the secondary BTree index is
- *                  : used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                                union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid_val1 on MyData(docid,val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-for $o in dataset('MyData')
-where $o.docid < 3
-return {"pk":$o.id, "sk":$o.val1}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-02.aql
deleted file mode 100644
index 77633fb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-02.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-for $o in dataset('MyData')
-where $o.docid < 3
-order by $o.id
-return {"pk":$o.id}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-03.aql
deleted file mode 100644
index dc271af..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-03.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-for $o in dataset('MyData')
-where $o.docid < 3
-order by $o.id
-return {"sk":$o.docid}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-04.aql
deleted file mode 100644
index b1297f1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-04.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-for $o in dataset('MyData')
-where $o.docid < 3
-order by $o.id
-return {"pk":$o.id, "sk":$o.docid}
-);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-05.aql
deleted file mode 100644
index 3d1d1fb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-05.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-for $o in dataset('MyData')
-where $o.docid < 3
-order by $o.id
-return {"pk":$o.id}
-);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-06.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-06.aql
deleted file mode 100644
index 3aea6ee..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-06.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-for $o in dataset('MyData')
-where $o.docid < 3
-order by $o.id
-return {"sk":$o.docid}
-);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-07.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-07.aql
deleted file mode 100644
index 06d89b5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-07.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-for $o in dataset('MyData')
-where $o.docid < 3
-order by $o.id
-return {"rec":$o, "pk":$o.id}
-);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-08.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-08.aql
deleted file mode 100644
index 0892b7e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-08.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-for $o in dataset('MyData')
-where $o.docid < 3
-order by $o.id
-return $o
-);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-09.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-09.aql
deleted file mode 100644
index a0cdc2b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-idxonly-09.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type testType as {
-   id: uuid,
-   sid: int32
-}
-
-create dataset testDataset(testType) primary key id autogenerated
-create index testIdx on testDataset(sid)
-
-for $y in [0,2,4,6,8]
-return { "quantile":$y,
-         "count": count(for $x in dataset testDataset
-                        where $x.sid /* +indexnl */ <= $y
-                        return $x.sid)
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/consolidate-selects-complex.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/consolidate-selects-complex.aql
deleted file mode 100644
index 9cbd549..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/consolidate-selects-complex.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset DBLP(DBLPType) 
-  primary key id with {"node-group":{"name":"group1"}};
-
-load dataset DBLP 
-using localfs
-(("path"="asterix_nc1://data/dblp-small/dblp-small-id.txt"),("format"="delimited-text"),("delimiter"=":")) pre-sorted;
-
-write output to asterix_nc1:"rttest/consolidate-complex-selects.aql";
-
-for $paper in dataset('DBLP')
-let $paper_tokens := word-tokens($paper.title)
-let $query_tokens := word-tokens("Transactions for Cooperative Environments")
-let $jacca := similarity-jaccard-check($paper_tokens, $query_tokens, 0.8f)
-let $jaccb := similarity-jaccard-check($paper_tokens, $query_tokens, 0.5f)
-let $jaccc := similarity-jaccard-check($paper_tokens, $query_tokens, 0.3f)
-where $jacca[0] and $jaccb[0] and $paper.authors = "testauth" and $jaccc
-return {"Paper": $paper_tokens, "Query": $query_tokens }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/consolidate-selects-simple.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/consolidate-selects-simple.aql
deleted file mode 100644
index fe0c6de..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/consolidate-selects-simple.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double,
-  c_mktsegment: string,
-  c_comment: string
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"rttest/consolidate-selects-simple.aql";
-
-for $c in dataset('Customers')
-where $c.c_name = "testname" 
-  and $c.c_address = "testaddr"
-  and $c.c_nationkey = 1
-  and $c.c_phone = "123456789"
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/const-folding.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/const-folding.aql
deleted file mode 100644
index ee4b191..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/const-folding.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/divide.adm";
-
-let $x := [ "foo", "bar" ]
-let $r := { "a": 1+2, "b": $x[0] }
-let $f := $r.b
-return $f
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/count-tweets.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/count-tweets.aql
deleted file mode 100644
index f018358..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/count-tweets.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse twitter if exists;
-create dataverse twitter;
-use dataverse twitter;
-
-create type Tweet as open {
-  id: int32,
-  tweetid: int64,
-  loc: point,
-  time: datetime,
-  text: string
-}
-
-create external dataset TwitterData(Tweet)
-using localfs
-(("path"="asterix_nc1://data/twitter/smalltweets.txt"),("format"="adm"));
-
-write output to asterix_nc1:"/tmp/count-tweets.adm";
-
-for $t in dataset('TwitterData')
-let $tokens := word-tokens($t.text)
-for $token in $tokens
-group by $tok := $token with $token
-return { "word": $tok, "count": count($token) }
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/disjunction-to-join-delete-1.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/disjunction-to-join-delete-1.aql
deleted file mode 100644
index b5e972f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/disjunction-to-join-delete-1.aql
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TestType as {
-  "id" : string,
-  "idx" : string,
-  "no-idx" : string
-};
-
-create dataset TestSet(TestType) primary key "id";
-create index TestSetIndex on TestSet(idx);
-
-delete $x from dataset TestSet where $x.id = "one" or $x.id = "two";
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/disjunction-to-join-delete-2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/disjunction-to-join-delete-2.aql
deleted file mode 100644
index 3b4478b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/disjunction-to-join-delete-2.aql
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TestType as {
-  "id" : string,
-  "idx" : string,
-  "no-idx" : string
-};
-
-create dataset TestSet(TestType) primary key "id";
-create index TestSetIndex on TestSet(idx);
-
-delete $x from dataset TestSet where $x.idx = "one" or $x.idx = "two";
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/distinct_aggregate.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/distinct_aggregate.aql
deleted file mode 100644
index a9fef5c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/distinct_aggregate.aql
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse tpch if exists;
-create dataverse tpch;
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int32,
-  l_partkey: int32,
-  l_suppkey: int32,
-  l_linenumber: int32,
-  l_quantity: double,
-  l_extendedprice: double,
-  l_discount: double,
-  l_tax: double,
-  l_returnflag: string,
-  l_linestatus: string,
-  l_shipdate: string,
-  l_commitdate: string,
-  l_receiptdate: string,
-  l_shipinstruct: string,
-  l_shipmode: string,
-  l_comment: string
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset LineItems_q1(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
-
-write output to asterix_nc1:"rttest/tpch_q1_pricing_summary_report_nt.adm";
-
-for $g in
-(
-    for $l in dataset('LineItems_q1')
-    where $l.l_shipdate <= '1998-09-02'
-    group by $l_returnflag := $l.l_returnflag, $l_linestatus := $l.l_linestatus,
-            $l_suppkey := $l.l_suppkey with $l
-    return {
-        "l_returnflag": $l_returnflag,
-        "l_linestatus": $l_linestatus,
-        "l_suppkey": $l_suppkey
-    }
-)
-group by $l_returnflag := $g.l_returnflag, $l_linestatus := $g.l_linestatus
-  with $g
-order by $l_returnflag, $l_linestatus
-return {
-  "l_returnflag": $l_returnflag,
-  "l_linestatus": $l_linestatus,
-  "count_suppkey": count($g)
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/external-indexing/leftouterjoin-probe-sidx-with-join-btree-sidx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/external-indexing/leftouterjoin-probe-sidx-with-join-btree-sidx_01.aql
deleted file mode 100644
index 4c62bb7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/external-indexing/leftouterjoin-probe-sidx-with-join-btree-sidx_01.aql
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * Description  : Test that left-outer-join may use available indexes, one for a secondary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 1325, 1326
- * Expected Res : Success
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int64,
-    statuses-count: int64,
-    name: string,
-    followers-count: int64
-}
-
-create type TweetMessageType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int64,
-    countB: int64
-}
-
-create external dataset TweetMessages(TweetMessageType) using hdfs(("hdfs"="hdfs://127.0.0.1:31888"),("path"="/asterix/tw_for_indexleftouterjoin.adm"),("input-format"="text-input-format"),("format"="adm"));
-
-create index IdIx on TweetMessages(tweetid) type btree;
-create index msgCountAIx on TweetMessages(countA) type btree;
-create index msgCountBIx on TweetMessages(countB) type btree;
-
-write output to asterix_nc1:"rttest/external-indexing_leftouterjoin-probe-sidx-with-join-btree-sidx_01.adm";
-
-for $t1 in dataset('TweetMessages')
-where $t1.tweetid < int64("10")
-order by $t1.tweetid
-return {
-"tweetid1": $t1.tweetid,
-"count1":$t1.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-          where $t1.countA /* +indexnl */= $t2.countB
-          order by $t2.tweetid
-          return {"tweetid2": $t2.tweetid,
-                  "count2":$t2.countB}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter-nested.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter-nested.aql
deleted file mode 100644
index ec6efc8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter-nested.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-//Check Plan for nested Filter
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/filter-nested.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.fname with filter on nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.lname > "Roger"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/btree-btree-search-wo-query-filter.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/btree-btree-search-wo-query-filter.aql
deleted file mode 100644
index 520f59f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/btree-btree-search-wo-query-filter.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id with filter on create_at;
-
-create index misc_index on dsTweet(misc) type btree;
-
-for $t in dataset dsTweet
-where $t.misc = "xyz"
-return $t
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/btree-btree-search.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/btree-btree-search.aql
deleted file mode 100644
index b37b1ad..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/btree-btree-search.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id with filter on create_at;
-
-create index misc_index on dsTweet(misc) type btree;
-
-let $ts_start := datetime("2015-11-11T00:00:00Z")
-let $ts_end := datetime("2015-12-18T23:59:59Z")
-
-for $t in dataset dsTweet
-where $t.create_at >= $ts_start and $t.create_at < $ts_end
-  and $t.misc = "xyz"
-return $t
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/inverted-btree-search-wo-query-filter.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/inverted-btree-search-wo-query-filter.aql
deleted file mode 100644
index 92226ec..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/inverted-btree-search-wo-query-filter.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id with filter on create_at;
-
-create index ft_index on dsTweet(message) type fulltext;
-
-let $keyword := "hello"
-
-for $t in dataset dsTweet
-where ftcontains($t.message, $keyword)
-return $t
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/inverted-btree-search.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/inverted-btree-search.aql
deleted file mode 100644
index 61f7e08..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/inverted-btree-search.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id with filter on create_at;
-
-create index ft_index on dsTweet(message) type fulltext;
-
-let $ts_start := datetime("2015-11-11T00:00:00Z")
-let $ts_end := datetime("2015-12-18T23:59:59Z")
-let $keyword := "hello"
-
-for $t in dataset dsTweet
-where $t.create_at >= $ts_start and $t.create_at < $ts_end
-  and ftcontains($t.message, $keyword)
-return $t
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/multi-index-btree-search-wo-query-filter.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/multi-index-btree-search-wo-query-filter.aql
deleted file mode 100644
index cd8639e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/multi-index-btree-search-wo-query-filter.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id with filter on create_at;
-
-create index ft_index on dsTweet(message) type fulltext;
-create index misc_index on dsTweet(misc) type btree;
-create index location_index on dsTweet(location) type rtree;
-
-let $region := create-rectangle(create-point(-128.43,20.29), create-point(-64.26,54.56))
-let $keyword := "hello"
-
-for $t in dataset dsTweet
-where  $t.misc < "xzy"
-  and spatial-intersect($t.location, $region)
-  and ftcontains($t.message, $keyword)
-return $t
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/multi-index-btree-search.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/multi-index-btree-search.aql
deleted file mode 100644
index c50fa1f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/multi-index-btree-search.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id with filter on create_at;
-
-create index ft_index on dsTweet(message) type fulltext;
-create index misc_index on dsTweet(misc) type btree;
-create index location_index on dsTweet(location) type rtree;
-
-let $region := create-rectangle(create-point(-128.43,20.29), create-point(-64.26,54.56))
-let $ts_start := datetime("2015-11-11T00:00:00Z")
-let $ts_end := datetime("2015-12-18T23:59:59Z")
-let $keyword := "hello"
-
-for $t in dataset dsTweet
-where $t.create_at >= $ts_start and $t.create_at < $ts_end
-  and $t.misc < "xzy"
-  and spatial-intersect($t.location, $region)
-  and ftcontains($t.message, $keyword)
-return $t
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/rtree-btree-search-wo-query-filter.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/rtree-btree-search-wo-query-filter.aql
deleted file mode 100644
index 556fddd..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/rtree-btree-search-wo-query-filter.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id with filter on create_at;
-
-create index location_index on dsTweet(location) type rtree;
-
-let $region := create-rectangle(create-point(-128.43,20.29), create-point(-64.26,54.56))
-
-for $t in dataset dsTweet
-where spatial-intersect($t.location, $region)
-return $t
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/rtree-btree-search.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/rtree-btree-search.aql
deleted file mode 100644
index 5b4bcb2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/filter/rtree-btree-search.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id with filter on create_at;
-
-create index location_index on dsTweet(location) type rtree;
-
-let $region := create-rectangle(create-point(-128.43,20.29), create-point(-64.26,54.56))
-let $ts_start := datetime("2015-11-11T00:00:00Z")
-let $ts_end := datetime("2015-12-18T23:59:59Z")
-
-for $t in dataset dsTweet
-where $t.create_at >= $ts_start and $t.create_at < $ts_end
-  and spatial-intersect($t.location, $region)
-return $t
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-hybrid.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-hybrid.aql
deleted file mode 100644
index a753907..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-hybrid.aql
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Multiple fuzzy join on three datasets, with a star join condition.
- *                  Each star join is composed of a linked join condition to propagate
- *                  the fuzzy join results.
- * Success        : Yes
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPNestedType as closed {
-  id: int64,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested: DBLPNestedType
-}
-
-create type CSXNestedType as closed {
-  id: int64,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  nested: CSXNestedType
-}
-
-create dataset DBLPOpen(DBLPNestedType) primary key id;
-
-create dataset DBLP(DBLPType) primary key nested.id;
-create dataset CSX(CSXType) primary key nested.id;
-
-set import-private-functions 'true';
-set simthreshold "0.5f";
-for $p in dataset DBLP
-for $p1 in dataset CSX
-for $p2 in dataset DBLPOpen
-for $p3 in dataset CSX
-for $p4 in dataset DBLPOpen
-where gram-tokens($p.nested.title, 3, false) ~= gram-tokens($p1.nested.title, 3, false)
-and word-tokens($p1.nested.title) ~= word-tokens($p2.title)
-and word-tokens($p.authors) ~= word-tokens($p3.nested.authors)
-and gram-tokens($p3.nested.misc, 3, false) ~= gram-tokens($p4.misc, 3, false)
-return { "pid": $p.nested.id, "p1id": $p1.nested.id, "p2id": $p2.id, "p3id": $p3.nested.id, "p4id": $p4.id }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-selflink.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-selflink.aql
deleted file mode 100644
index cbc88ce..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-selflink.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy join on two datasets, with a series of link join conditions.
- *                  The dataset DBLP will fuzzy join with CSX and propagate the results
- *                  with a series of linked join conditions on CSX.
- * Success        : Yes
- */
-drop dataverse test if exists;
-
-create dataverse test;
-
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset DBLP(DBLPType) primary key id with {"node-group":{"name":"group1"}};
-create dataset CSX(CSXType) primary key id with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:'rttest/test.adm';
-
-use dataverse test;
-set import-private-functions 'true';
-set simthreshold "0.5f";
-for $p in dataset DBLP
-for $p1 in dataset CSX
-for $p2 in dataset CSX
-for $p3 in dataset CSX
-for $p4 in dataset CSX
-where word-tokens($p.title) ~= word-tokens($p1.title)
-and word-tokens($p2.title) ~= word-tokens($p3.title)
-and gram-tokens($p1.authors, 3, false) ~= gram-tokens($p2.authors, 2, false)
-and gram-tokens($p3.misc, 3, false) ~= gram-tokens($p4.misc, 3, false)
-return { "pid":$p.id, "p1id":$p1.id, "p2id": $p2.id, "p3id": $p3.id, "p4id": $p4.id }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-simple.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-simple.aql
deleted file mode 100644
index 166f305..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-simple.aql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- /*
-  * Description    : Two-way fuzzy join on DBLP and CSX with a fuzzy join condition on word tokens of their titles.
-  * Success        : Yes
-  */
-drop dataverse fj-dblp-csx if exists;
-
-create dataverse fj-dblp-csx;
-
-use dataverse fj-dblp-csx;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset DBLP(DBLPType) primary key id with {"node-group":{"name":"group1"}};
-create dataset CSX(CSXType) primary key id with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:'rttest/fj-dblp-csx.adm';
-for $s in dataset('DBLP')
-for $t in dataset('CSX')
-where word-tokens($s.title) ~= word-tokens($t.title)
-return {"sid": $s.id, "tid": $t.id}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-star.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-star.aql
deleted file mode 100644
index df0cb86..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-star.aql
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy join on three datasets, with a set of star join conditions.
- *                  The CSX and DBLP are used twice and will be propagated onto the output with their ids.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPNestedType as closed {
-  id: int64,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested: DBLPNestedType
-}
-
-create type CSXNestedType as closed {
-  id: int64,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  nested: CSXNestedType
-}
-
-create dataset DBLPOpen(DBLPNestedType) primary key id;
-
-create dataset DBLP(DBLPType) primary key nested.id;
-create dataset CSX(CSXType) primary key nested.id;
-
-set import-private-functions 'true';
-set simthreshold "0.5f";
-for $p in dataset DBLP
-for $p1 in dataset CSX
-for $p2 in dataset DBLPOpen
-for $p3 in dataset CSX
-for $p4 in dataset DBLPOpen
-where word-tokens($p.nested.title) ~= word-tokens($p1.nested.title)
-and word-tokens($p.nested.authors) ~= word-tokens($p3.nested.authors)
-and word-tokens($p.nested.title) ~= word-tokens($p2.title)
-and gram-tokens($p.nested.title, 3, false) ~= gram-tokens($p4.title, 3, false)
-return { "pid": $p.nested.id, "p1id": $p1.nested.id, "p2id": $p2.id, "p3id": $p3.nested.id, "p4id": $p4.id }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx.aql
deleted file mode 100644
index 048df9e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx.aql
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse fj-dblp-csx if exists;
-
-create dataverse fj-dblp-csx;
-
-use dataverse fj-dblp-csx;
-
-create type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32, 
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset DBLP(DBLPType) primary key id with {"node-group":{"name":"group1"}};
-create dataset CSX(CSXType) primary key id with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:'rttest/fj-dblp-csx.adm';
-
-set import-private-functions 'true'
-
-for $paperDBLP in dataset('DBLP')
-let $idDBLP := $paperDBLP.id
-let $unrankedTokensDBLP := counthashed-word-tokens($paperDBLP.title)
-let $lenDBLP := len($unrankedTokensDBLP)
-let $tokensDBLP :=
-    for $token in $unrankedTokensDBLP
-    for $tokenRanked at $i in
-        //
-        // -- - Stage 1 - --
-        //
-        for $paper in dataset('DBLP')
-        let $id := $paper.id
-        for $token in counthashed-word-tokens($paper.title)
-        /*+ hash */
-        group by $tokenGroupped := $token with $id
-        /*+ inmem 16 16384 */
-        order by count($id), $tokenGroupped
-        return $tokenGroupped
-    where $token = /*+ hash-bcast */ $tokenRanked
-    order by $i
-    return $i
-for $prefixTokenDBLP in subset-collection($tokensDBLP, 0, prefix-len-jaccard(len($tokensDBLP), .8f))
-
-for $paperCSX in dataset('CSX')
-let $idCSX := $paperCSX.id
-let $unrankedTokensCSX := counthashed-word-tokens($paperCSX.title)
-let $lenCSX := len($unrankedTokensCSX)
-let $tokensCSX :=
-    for $token in $unrankedTokensCSX
-    for $tokenRanked at $i in
-        //
-        // -- - Stage 1 - --
-        //
-        for $paper in dataset('DBLP')
-        let $id := $paper.id
-        for $token in counthashed-word-tokens($paper.title)
-        /*+ hash */
-        group by $tokenGroupped := $token with $id
-        /*+ inmem 16 16384 */
-        order by count($id), $tokenGroupped
-        return $tokenGroupped
-    where $token = /*+ hash-bcast */ $tokenRanked
-    order by $i
-    return $i
-let $actualPrefixLen := prefix-len-jaccard(len($unrankedTokensCSX), .8f) - len($unrankedTokensCSX) + len($tokensCSX)
-for $prefixTokenCSX in subset-collection($tokensCSX, 0, $actualPrefixLen)
-
-where $prefixTokenDBLP = $prefixTokenCSX
-
-/*+ hash */
-group by $idDBLP := $idDBLP, $idCSX := $idCSX with $unrankedTokensDBLP, $unrankedTokensCSX
-let $sim := similarity-jaccard-check($unrankedTokensDBLP[0], $unrankedTokensCSX[0], .8f)
-where $sim[1] >= .8f
-return {'idDBLP': $idDBLP, 'idCSX': $idCSX}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-phase1.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-phase1.aql
deleted file mode 100644
index 9a436ed..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-phase1.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse rares03 if exists;
-
-create dataverse rares03;
-
-use dataverse rares03;
-
-create type UserType as open {
-  uid: int32, 
-  name: string,
-  lottery_numbers: {{int32}}
-}
-
-create type VisitorType as open {
-  vid: int32, 
-  name: string,
-  lottery_numbers: {{int32}}
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Users(UserType) 
-  primary key uid with {"node-group":{"name":"group1"}};
-
-create dataset Visitors(VisitorType) 
-  primary key vid with {"node-group":{"name":"group1"}};
-
-
-// set simfunction "jaccard";
-// set simthreshold ".8";
-
-write output to asterix_nc1:"/tmp/rares03.adm";
-
-for $user in dataset('Users')
-let $tokens := 
-    for $lottery_number in $user.lottery_numbers
-    for $token at $i in
-       for $user in dataset('Users')
-       for $lottery_number in $user.lottery_numbers 
-       group by $item := $lottery_number with $user 
-       let $count := count($user)
-       order by $count desc 
-       return $item 
-    where $lottery_number = $token
-    order by $token
-    return $i
-return {"uid": $user.uid, "tokens": $tokens}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-phase2-with-hints.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-phase2-with-hints.aql
deleted file mode 100644
index 6e52a08..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-phase2-with-hints.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse fuzzyjoin_078 if exists;
-
-create dataverse fuzzyjoin_078;
-
-use dataverse fuzzyjoin_078;
-
-create type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset DBLP_fuzzyjoin_078(DBLPType) 
-  primary key id on group1;
-
-write output to asterix_nc1:'rttest/fuzzyjoin_078.adm';
-
-    //
-    // -- - Stage 2 - --
-    //
-    for $paperDBLP in dataset('DBLP_fuzzyjoin_078')
-    let $unrankedTokensDBLP := counthashed-word-tokens($paperDBLP.title)
-    let $tokensDBLP :=
-        for $token in $unrankedTokensDBLP
-        for $tokenRanked at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $paper in dataset('DBLP_fuzzyjoin_078')
-            for $token in counthashed-word-tokens($paper.title)
-            /*+ hash */ 
-            group by $tokenGroupped := $token with $paper
-            /*+ inmem 1 302 */
-            order by count($paper), $tokenGroupped
-            return $tokenGroupped
-        where $token = /*+ hash-bcast */ $tokenRanked
-        order by $i
-        return $i
-    order by $paperDBLP.id
-    return {'id': $paperDBLP.id, 'tokens':$tokensDBLP}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/gby_inline.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/gby_inline.aql
deleted file mode 100644
index bb29875..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/gby_inline.aql
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * This query is to verify the fix for ASTERIXDB-1291.
- */
-
-drop dataverse tpch if exists;
-create dataverse tpch;
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int32,
-  l_partkey: int32,
-  l_suppkey: int32,
-  l_linenumber: int32,
-  l_quantity: double,
-  l_extendedprice: double,
-  l_discount: double,
-  l_tax: double,
-  l_returnflag: string,
-  l_linestatus: string,
-  l_shipdate: string,
-  l_commitdate: string,
-  l_receiptdate: string,
-  l_shipinstruct: string,
-  l_shipmode: string,
-  l_comment: string
-}
-
-create type OrderType as closed {
-  o_orderkey: int32,
-  o_custkey: int32,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int32,
-  o_comment: string
-}
-
-create type CustomerType as closed {
-  c_custkey: int32,
-  c_name: string,
-  c_address: string,
-  c_nationkey: int32,
-  c_phone: string,
-  c_acctbal: double,
-  c_mktsegment: string,
-  c_comment: string
-}
-
-create dataset Orders(OrderType)
-  primary key o_orderkey;
-create dataset Customers(CustomerType)
-  primary key c_custkey;
-
-for $c in dataset('Customers')
-group by $ccustkey := $c.c_custkey, $cnationkey := $c.c_nationkey with $c
-let $orders :=
-  for $o in dataset('Orders')
-  where $cnationkey = 5 and $o.o_$o.o_custkey = $ccustkey
-  return $o
-return {
-  "cust": $c,
-  "orders": $orders
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/hashjoin-with-unnest.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/hashjoin-with-unnest.aql
deleted file mode 100644
index 8ae6165..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/hashjoin-with-unnest.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that non-datascan unnests are pushed through join and 
- *                : the query plan is rewritten as hybrid hash join.
- * Success        : Yes
- */
- 
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TestType as open {
-id:int32,
-name:string
-}
-
-create dataset t1(TestType) primary key id;
-create dataset t2(TestType) primary key id;
-
-write output to asterix_nc1:"rttest/hahsjoin-with-unnest.adm";
-
-for $m in dataset('t1')
-for $n in dataset('t2')
-for $a in $m.hobbies
-for $b in $n.hobbies
-where $a = $b
-return {"t1":$m, "t2":$n}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inline-funs.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inline-funs.aql
deleted file mode 100644
index b9999bc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inline-funs.aql
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"/tmp/inline_funs.adm";
-
-declare function f1() { 1 + f2() }
-
-declare function f2() { 2 + f3() + f3() + f3() + f4() }
-
-declare function f3() { 0 - 1 }
-
-declare function f4() { 1001 }
-
-f1()
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inlined_q18_large_volume_customer.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inlined_q18_large_volume_customer.aql
deleted file mode 100644
index e0580a2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inlined_q18_large_volume_customer.aql
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse inlined_q18_large_volume_customer if exists;
-
-create dataverse inlined_q18_large_volume_customer;
-
-use dataverse inlined_q18_large_volume_customer;
-
-create type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-create type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-create type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-create dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/inlined_q18_large_volume_customer.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where
-  $c.c_custkey = $o.o_custkey
-for $t in 
-(
-  for $l in dataset('LineItems')
-  group by $l_orderkey := $l.l_orderkey with $l
-  return 
-    { "l_orderkey": $l_orderkey, 
-      "t_sum_quantity": sum(for $i in $l return $i.l_quantity) }
-) 
-where 
-  $o.o_orderkey = $t.l_orderkey and $t.t_sum_quantity > 300
-for $l in dataset('LineItems')
-where
-  $l.l_orderkey = $o.o_orderkey 
-group by $c_name := $c.c_name, $c_custkey := $c.c_custkey, $o_orderkey := $o.o_orderkey, 
-         $o_orderdate := $o.o_orderdate, $o_totalprice := $o.o_totalprice with $l
-order by $o_totalprice desc, $o_orderdate 
-limit 100
-return {  
-  "c_name": $c_name,
-  "c_custkey": $c_custkey,
-  "o_orderkey": $o_orderkey,
-  "o_orderdate": $o_orderdate,
-  "o_totalprice": $o_totalprice,
-  "sum_quantity": sum(for $j in $l return $j.l_quantity)  
-}
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-dataset-with-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-dataset-with-index.aql
deleted file mode 100644
index 1c897eb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-dataset-with-index.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name  : insert-and-scan-dataset-with-index.aql
- * Description     : This test is intended to test inserting into a dataset that has a secondary index and scan
- * the data at the same time where we insert a materializing to prevent the possibility of deadlatch.
- * Expected Result : Success
- * Date            : July 11 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-create type test.Emp as closed {
-id:int32,
-fname:string,
-lname:string,
-age:int32,
-dept:string
-}
-
-create dataset test.employee(Emp) primary key id;
-
-create index idx_employee_first_name on test.employee(fname);
-
-insert into dataset test.employee (
-for $x in dataset test.employee
-return {
-    "id": $x.id + 10000,
-    "fname": $x.fname,
-    "lname": $x.lname,
-    "age": $x.age,
-    "dept": $x.dept
-}
-);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-joined-datasets.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-joined-datasets.aql
deleted file mode 100644
index 201e598..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-joined-datasets.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name  : insert-and-scan-joined-datasets.aql
- * Description     : This test is intended to test inserting into a dataset where the incoming stream
-  is involve a join operation that has the same dataset. We insert a materializing to prevent the
-  possibility of deadlatch.
- * Expected Result : Success
- * Date            : July 11 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type myDataType as open {
-  id: int32
-}
-
-create dataset myData(myDataType)
-  primary key id;
-
-create dataset myData2(myDataType)
-  primary key id;
-
-insert into dataset myData (
-for $x in dataset myData2
-for $y in dataset myData
-where $x.id = $y.id
-return {
-    "id": $x.id + 1
-}
-);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-return-custom-result.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-return-custom-result.aql
deleted file mode 100644
index 205edc2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-return-custom-result.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TweetMessageTypeuuid as closed {
-  tweetid: int,
-  message-text: string,
-  location:point
-}
-
-create dataset TweetMessageuuids(TweetMessageTypeuuid)
-primary key tweetid;
-
-
-insert into dataset TweetMessageuuids as $a(
-let $x :=
-[{ "tweetid":1,"message-text":"hello","location":create-point(6.0,6.0)},
-{"tweetid":2,"message-text":"goodbye","location":create-point(1.0,1.0)},
-{"tweetid":3,"message-text":"the end","location":create-point(6.0,3.0)},
-{"tweetid":4,"message-text":"what","location":create-point(3.0,6.0)},
-{"tweetid":5,"message-text":"good","location":create-point(5.0,6.0)}]
-for $y in $x
-return $y
-) returning
-let $x := create-circle($a.location,5.0)
-order by $a.tweetid
-return {
-  "x":$x,
-  "tweetid":$a.tweetid
-}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/fulltext-contains-without-option.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/fulltext-contains-without-option.aql
deleted file mode 100644
index 3c924f9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/fulltext-contains-without-option.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * Description    : Tests whether an full-text index is applied to optimize a selection query
- *                : using the ftcontains function. The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index fulltext_index_title on MyData(title) type fulltext;
-
-for $o in dataset MyData
-where ftcontains($o.title, "database")
-order by $o.id
-return {"id":$o.id}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/fulltext-contains.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/fulltext-contains.aql
deleted file mode 100644
index 3ef8cd8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/fulltext-contains.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * Description    : Tests whether an full-text index is applied to optimize a selection query
- *                : using the ftcontains function. The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index fulltext_index_title on MyData(title) type fulltext;
-
-for $o in dataset MyData
-where ftcontains($o.title, "database", {"mode":"any"})
-order by $o.id
-return {"id":$o.id}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-check-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-check-panic.aql
deleted file mode 100644
index 4d0219c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-check-panic.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on strings.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-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-basic_ngram-edit-distance-check-panic.adm";
-
-// This query cannot be optimized with an index, based on the high edit distance.
-for $o in dataset('DBLP')
-let $ed := edit-distance-check($o.authors, "Amihay Motro", 5)
-where $ed[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-panic.aql
deleted file mode 100644
index aa51e50..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-panic.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance function on strings.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-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-basic_ngram-edit-distance-panic.adm";
-
-// This query cannot be optimized with an index, based on the high edit distance.
-for $o in dataset('DBLP')
-where edit-distance($o.authors, "Amihay Motro") <= 5
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let-panic.aql
deleted file mode 100644
index fc3894f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let-panic.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on strings.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-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-complex_ngram-edit-distance-check-let-panic.adm";
-
-// This query cannot be optimized with an index, based on the high edit distance.
-for $o in dataset('DBLP')
-let $ed := edit-distance-check($o.authors, "Amihay Motro", 5)
-where $ed[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql
deleted file mode 100644
index 30bc42f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index index is applied to optimize a selection query using the similarity-edit-distance-check function on individual word tokens.
- *                  Tests that the optimizer rule correctly drills through the word-tokens function and existential query.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-word-tokens.adm";
-
-for $paper in dataset('DBLP')
-for $word in word-tokens($paper.title)
-where edit-distance-check($word, "Multmedia", 1)[0]
-distinct by $paper.id
-return {
-  "id" : $paper.id,
-  "title" : $paper.title
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-edit-distance.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-edit-distance.aql
deleted file mode 100644
index 6640508..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-edit-distance.aql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) 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.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where edit-distance($a.authors, $b.authors) < 3 and $a.id < $b.id
-return {"aauthors": $a.authors, "bauthors": $b.authors}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.aql
deleted file mode 100644
index 72e4b69..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.aql
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-fuzzyeq-jaccard.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where gram-tokens($a.title, 3, false) ~= gram-tokens($b.title, 3, false) and $a.id < $b.id
-return {"atitle": $a.title, "btitle": $b.title}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-jaccard.aql
deleted file mode 100644
index 5f0c612..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ngram-jaccard.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-jaccard.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard(gram-tokens($a.title, 3, false), gram-tokens($b.title, 3, false)) >= 0.5f
-      and $a.id < $b.id
-return {"atitle": $a.title, "btitle": $b.title}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-edit-distance.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-edit-distance.aql
deleted file mode 100644
index 0e7ee97..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-edit-distance.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the edit-distance function of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(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.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where edit-distance($a.interests, $b.interests) <= 2 and $a.cid < $b.cid
-return {"ainterests": $a.interests, "binterests": $b.interests}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-fuzzyeq-edit-distance.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-fuzzyeq-edit-distance.aql
deleted file mode 100644
index 0021360..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-fuzzyeq-edit-distance.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on ~= using edit distance of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(CustomerType) primary key cid;
-
-create index interests_index on Customers(interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-fuzzyeq-edit-distance.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '3';
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where $a.interests ~= $b.interests and $a.cid < $b.cid
-return {"ainterests": $a.interests, "binterests": $b.interests}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-fuzzyeq-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-fuzzyeq-jaccard.aql
deleted file mode 100644
index ba31c49..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-fuzzyeq-jaccard.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on ~= using Jaccard of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(CustomerType) primary key cid;
-
-create index interests_index on Customers(interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-fuzzyeq-jaccard.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.7f';
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where $a.interests /*+ indexnl */ ~= $b.interests and $a.cid < $b.cid
-return {"ainterests": $a.interests, "binterests": $b.interests}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-jaccard.aql
deleted file mode 100644
index eec411d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/olist-jaccard.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the similarity-jaccard function of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(CustomerType) primary key cid;
-
-create index interests_index on Customers(interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-jaccard.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where /*+ indexnl */ similarity-jaccard($a.interests, $b.interests) >= 0.7f and $a.cid < $b.cid
-return {"ainterests": $a.interests, "binterests": $b.interests}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ulist-fuzzyeq-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ulist-fuzzyeq-jaccard.aql
deleted file mode 100644
index f2983ce..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ulist-fuzzyeq-jaccard.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on ~= using Jaccard of their interest sets.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(CustomerType) primary key cid;
-
-create index interests_index on Customers(interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ulist-fuzzyeq-jaccard.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.7f';
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where $a.interests /*+ indexnl */ ~= $b.interests and $a.cid < $b.cid
-return {"ainterests": $a.interests, "binterests": $b.interests}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ulist-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ulist-jaccard.aql
deleted file mode 100644
index 557990c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/ulist-jaccard.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the similarity-jaccard function of their interest sets.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(CustomerType) primary key cid;
-
-create index interests_index on Customers(interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ulist-jaccard.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where /*+ indexnl */ similarity-jaccard($a.interests, $b.interests) >= 0.7f and $a.cid < $b.cid
-return {"ainterests": $a.interests, "binterests": $b.interests}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.aql
deleted file mode 100644
index 1b90252..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.aql
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index keyword_index on DBLP(title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_word-fuzzyeq-jaccard.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where word-tokens($a.title) ~= word-tokens($b.title) and $a.id < $b.id
-return {"atitle": $a.title, "btitle": $b.title}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/word-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/word-jaccard.aql
deleted file mode 100644
index 4558d49..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join-noeqjoin/word-jaccard.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index keyword_index on DBLP(title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_word-jaccard.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard(word-tokens($a.title), word-tokens($b.title)) >= 0.5f
-      and $a.id < $b.id
-return {"atitle": $a.title, "btitle": $b.title}
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-contains.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-contains.aql
deleted file mode 100644
index 30afec8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-contains.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a join query using the contains function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains.adm";
-
-for $o1 in dataset('DBLP')
-for $o2 in dataset('DBLP')
-where contains($o1.title, $o2.title) and $o1.id < $o2.id
-order by $o1.id, $o2.id
-return {"title1":$o1.title, "title2":$o2.title}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_01.aql
deleted file mode 100644
index ed212cc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-check_01.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance-check function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) 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_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where edit-distance-check($a.authors, $b.authors, 3)[0] and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-contains.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-contains.aql
deleted file mode 100644
index 7d9c5d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance-contains.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance-contains function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) 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-contains.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where edit-distance-contains($a.authors, $b.authors, 3)[0] and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_01.aql
deleted file mode 100644
index 391f165..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-edit-distance_01.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) 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_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where edit-distance($a.authors, $b.authors) < 3 and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-fuzzyeq-edit-distance_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-fuzzyeq-edit-distance_02.aql
deleted file mode 100644
index 50ed8d5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-fuzzyeq-edit-distance_02.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using edit distance of their authors.
- *                  CSX has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(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';
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where $a.authors ~= $b.authors and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-fuzzyeq-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-fuzzyeq-jaccard_01.aql
deleted file mode 100644
index a9aa579..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-fuzzyeq-jaccard_01.aql
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where gram-tokens($a.title, 3, false) ~= gram-tokens($b.title, 3, false) and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-jaccard-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-jaccard-check_01.aql
deleted file mode 100644
index 07e6c18..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-jaccard-check_01.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard-check function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard-check(gram-tokens($a.title, 3, false), gram-tokens($b.title, 3, false), 0.5f)[0]
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-jaccard_01.aql
deleted file mode 100644
index a68d600..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ngram-jaccard_01.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard(gram-tokens($a.title, 3, false), gram-tokens($b.title, 3, false)) >= 0.5f
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_01.aql
deleted file mode 100644
index d02cee7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance-check_01.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the edit-distance-check function of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(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_01.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where edit-distance-check($a.interests, $b.interests, 3)[0] and $a.cid < $b.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_01.aql
deleted file mode 100644
index b46fbc1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-edit-distance_01.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the edit-distance function of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(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_01.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where edit-distance($a.interests, $b.interests) <= 2 and $a.cid < $b.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-fuzzyeq-edit-distance_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-fuzzyeq-edit-distance_01.aql
deleted file mode 100644
index 840e9c7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-fuzzyeq-edit-distance_01.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on ~= using edit distance of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(CustomerType) primary key cid;
-
-create index interests_index on Customers(interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '3';
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where $a.interests ~= $b.interests and $a.cid < $b.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-fuzzyeq-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-fuzzyeq-jaccard_01.aql
deleted file mode 100644
index fb39ddf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-fuzzyeq-jaccard_01.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on ~= using Jaccard of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(CustomerType) primary key cid;
-
-create index interests_index on Customers(interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.7f';
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where $a.interests /*+ indexnl */ ~= $b.interests and $a.cid < $b.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-jaccard-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-jaccard-check_01.aql
deleted file mode 100644
index 14e3dc5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-jaccard-check_01.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the similarity-jaccard-check function of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(CustomerType) primary key cid;
-
-create index interests_index on Customers(interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard-check_01.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where /*+ indexnl */ similarity-jaccard-check($a.interests, $b.interests, 0.7f)[0] and $a.cid < $b.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-jaccard_01.aql
deleted file mode 100644
index 4c865f6..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/olist-jaccard_01.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the similarity-jaccard function of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(CustomerType) primary key cid;
-
-create index interests_index on Customers(interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard_01.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where /*+ indexnl */ similarity-jaccard($a.interests, $b.interests) >= 0.7f and $a.cid < $b.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ulist-fuzzyeq-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ulist-fuzzyeq-jaccard_01.aql
deleted file mode 100644
index edd1e94..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ulist-fuzzyeq-jaccard_01.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on ~= using Jaccard of their interest sets.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(CustomerType) primary key cid;
-
-create index interests_index on Customers(interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.7f';
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where $a.interests /*+ indexnl */ ~= $b.interests and $a.cid < $b.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ulist-jaccard-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ulist-jaccard-check_01.aql
deleted file mode 100644
index 53ff785..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ulist-jaccard-check_01.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the similarity-jaccard-check function of their interest sets.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(CustomerType) primary key cid;
-
-create index interests_index on Customers(interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard-check_01.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where /*+ indexnl */ similarity-jaccard-check($a.interests, $b.interests, 0.7f)[0] and $a.cid < $b.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ulist-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ulist-jaccard_01.aql
deleted file mode 100644
index e23334f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/ulist-jaccard_01.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the similarity-jaccard function of their interest sets.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create dataset Customers2(CustomerType) primary key cid;
-
-create index interests_index on Customers(interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard_01.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where /*+ indexnl */ similarity-jaccard($a.interests, $b.interests) >= 0.7f and $a.cid < $b.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/word-fuzzyeq-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/word-fuzzyeq-jaccard_01.aql
deleted file mode 100644
index 29bd3d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/word-fuzzyeq-jaccard_01.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index keyword_index on DBLP(title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where word-tokens($a.title) ~= word-tokens($b.title) and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/word-jaccard-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/word-jaccard-check_01.aql
deleted file mode 100644
index 989f250..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/word-jaccard-check_01.aql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard-check function of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index keyword_index on DBLP(title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard-check(word-tokens($a.title), word-tokens($b.title), 0.5f)[0]
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/word-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/word-jaccard_01.aql
deleted file mode 100644
index e2c373a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/word-jaccard_01.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index keyword_index on DBLP(title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard(word-tokens($a.title), word-tokens($b.title)) >= 0.5f
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/limit-issue353.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/limit-issue353.aql
deleted file mode 100644
index 9c9e406..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/limit-issue353.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : This test case is to verify the fix for issue353
-                 : https://code.google.com/p/asterixdb/issues/detail?id=353
- * Expected Res : Success
- * Date         : 28th April 2013
- */
-
-drop dataverse tpch if exists;
-create dataverse tpch;
-
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int32,
-  l_partkey: int32,
-  l_suppkey: int32,
-  l_linenumber: int32,
-  l_quantity: double,
-  l_extendedprice: double,
-  l_discount: double,
-  l_tax: double,
-  l_returnflag: string,
-  l_linestatus: string,
-  l_shipdate: string,
-  l_commitdate: string,
-  l_receiptdate: string,
-  l_shipinstruct: string,
-  l_shipmode: string,
-  l_comment: string
-}
-
-create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber;
-
-write output to asterix_nc1:"/tmp/push_limit.adm";
-
-for $l in dataset('LineItem')
-limit 2
-return {
-"l_returnflag": $l.l_returnflag,
-"l_linestatus": $l.l_linestatus,
-"l_shipmode": $l.l_shipmode
-}
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/primary_index_with_meta-1.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/primary_index_with_meta-1.aql
deleted file mode 100644
index c07dcb1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/primary_index_with_meta-1.aql
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AuxiliaryType as open {
-  id:int32
-}
-
-create type LineType as open {
-  id:int32,
-  text: string
-}
-
-create dataset Book(LineType) with meta(AuxiliaryType)
-primary key meta().id;
-
-
-for $x in dataset Book
-where meta($x).id >10
-return $x;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/primary_index_with_meta-2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/primary_index_with_meta-2.aql
deleted file mode 100644
index f236645..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/primary_index_with_meta-2.aql
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AuxiliaryType as open {
-  id:int32
-}
-
-create type LineType as open {
-  id:int32,
-  text: string
-}
-
-create dataset Book(LineType) with meta(AuxiliaryType)
-primary key meta().id;
-
-
-for $x in dataset Book
-where meta().id >10
-return $x;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/primary_index_with_meta_index_join.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/primary_index_with_meta_index_join.aql
deleted file mode 100644
index d1ec9bc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/primary_index_with_meta_index_join.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AuxiliaryType as open {
-  id:int32
-}
-
-create type BookType as open {
-  id:int32,
-  text: string
-}
-
-create type ChapterType as open {
-  id: int32,
-  book_id: int32,
-  abstract: string
-}
-
-create dataset Book(BookType) with meta(AuxiliaryType)
-primary key meta().id;
-
-create dataset Chapter(ChapterType)
-primary key id;
-
-
-for $c in dataset Chapter
-for $b in dataset Book
-where $c.book_id /*+ indexnl */= meta().id
-return {
-   "id": meta().id,
-   "abstract": $c.abstract
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/primary_index_with_meta_self_index_join.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/primary_index_with_meta_self_index_join.aql
deleted file mode 100644
index 953802e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/primary_index_with_meta_self_index_join.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AuxiliaryType as open {
-  id:int32
-}
-
-create type LineType as open {
-  id:int32,
-  text: string
-}
-
-create dataset Book(LineType) with meta(AuxiliaryType)
-primary key meta().id;
-
-
-for $x in dataset Book
-for $y in dataset Book
-where $x.id /*+ indexnl */= meta($y).id
-return {
-   "id": meta($y).id,
-   "text": $x.text
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/secondary_index-nljoin_with_meta-1.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/secondary_index-nljoin_with_meta-1.aql
deleted file mode 100644
index 1dc3b44..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/secondary_index-nljoin_with_meta-1.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AuxiliaryType as open {
-  id:int32,
-  num:int32
-}
-
-create type LineType as open {
-}
-
-create dataset Book(LineType) with meta(AuxiliaryType)
-primary key meta().id;
-
-create index NumIndex on Book(lineid:int64?) enforced;
-
-for $x in dataset Book
-for $y in dataset Book
-where $x.lineid /*+ indexnl */ = $y.lineid
-return {"authx":$x.author,"authy":$y.author};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/secondary_index-nljoin_with_meta-2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/secondary_index-nljoin_with_meta-2.aql
deleted file mode 100644
index 09ffd0a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/secondary_index-nljoin_with_meta-2.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AuxiliaryType as open {
-  id:int32,
-  num:int32
-}
-
-create type LineType as open {
-}
-
-create type LineTypeWithNum as open {
-lineid:int64
-}
-create dataset Book1(LineType) with meta(AuxiliaryType)
-primary key meta().id;
-
-create dataset Book2(LineTypeWithNum) with meta(AuxiliaryType)
-primary key meta().id;
-
-create index NumIndex on Book1(lineid:int64?) enforced;
-
-for $y in dataset Book2
-for $x in dataset Book1
-where $y.lineid  /*+ indexnl */=  $x.lineid
-return {"authx":$x.author,"authy":$y.author};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/secondary_index_with_meta-2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/secondary_index_with_meta-2.aql
deleted file mode 100644
index b570498..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/meta/secondary_index_with_meta-2.aql
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AuxiliaryType as open {
-  id:int32,
-  num:int32
-}
-
-create type LineType as open {
-}
-
-create dataset Book(LineType) with meta(AuxiliaryType)
-primary key meta().id;
-
-create index NumIndex on Book(lineid:int64?) enforced;
-
-for $x in dataset Book
-where $x.lineid >10
-return $x;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/btree-rtree-ngram-intersect-with-filter.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/btree-rtree-ngram-intersect-with-filter.aql
deleted file mode 100644
index 353129e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/btree-rtree-ngram-intersect-with-filter.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests three types of secondary indexes should trigger intersection rule
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id with filter on create_at;
-
-create index ngram_index on dsTweet(message) type ngram(3);
-create index time_index on dsTweet(create_at) type btree;
-create index location_index on dsTweet(location) type rtree;
-
-write output to nc1:"rttest/btree-rtree-ngram-intersect.adm";
-
-let $region := create-rectangle(create-point(-128.43007812500002,20.298506037222175), create-point(-64.26992187500002,54.56902589732035))
-let $ts_start := datetime("2015-11-11T00:00:00Z")
-let $ts_end := datetime("2015-12-18T23:59:59Z")
-let $keyword := "hello"
-for $t in dataset dsTweet
-where $t.create_at >= $ts_start and $t.create_at < $ts_end
-  and spatial-intersect($t.location, $region)
-  and contains($t.message, $keyword)
-return $t
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/btree-rtree-ngram-intersect.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/btree-rtree-ngram-intersect.aql
deleted file mode 100644
index 5f57d07..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/btree-rtree-ngram-intersect.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests three types of secondary indexes should trigger intersection rule
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id;
-
-create index ngram_index on dsTweet(message) type ngram(3);
-create index time_index on dsTweet(create_at) type btree;
-create index location_index on dsTweet(location) type rtree;
-
-write output to nc1:"rttest/btree-rtree-ngram-intersect.adm";
-
-let $region := create-rectangle(create-point(-128.43007812500002,20.298506037222175), create-point(-64.26992187500002,54.56902589732035))
-let $ts_start := datetime("2015-11-11T00:00:00Z")
-let $ts_end := datetime("2015-12-18T23:59:59Z")
-let $keyword := "hello"
-for $t in dataset dsTweet
-where $t.create_at >= $ts_start and $t.create_at < $ts_end
-  and spatial-intersect($t.location, $region)
-  and contains($t.message, $keyword)
-return $t
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/skip-one-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/skip-one-index.aql
deleted file mode 100644
index 7383edc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/skip-one-index.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id;
-
-create index ngram_index on dsTweet(message) type ngram(3);
-create index time_index on dsTweet(create_at) type btree;
-create index location_index on dsTweet(location) type rtree;
-
-write output to nc1:"rttest/btree-rtree-ngram-intersect.adm";
-
-let $region := create-rectangle(create-point(-128.43007812500002,20.298506037222175), create-point(-64.26992187500002,54.56902589732035))
-let $ts_start := datetime("2015-11-11T00:00:00Z")
-let $ts_end := datetime("2015-12-18T23:59:59Z")
-let $keyword := "hello"
-for $t in dataset dsTweet
-where $t.create_at >= $ts_start and $t.create_at < $ts_end
-  and /* +skip-index */ spatial-intersect($t.location, $region)
-  and contains($t.message, $keyword)
-return $t
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/skip-two-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/skip-two-index.aql
deleted file mode 100644
index de0807f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/skip-two-index.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests three types of secondary indexes should trigger intersection rule
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id;
-
-create index ngram_index on dsTweet(message) type ngram(3);
-create index time_index on dsTweet(create_at) type btree;
-create index location_index on dsTweet(location) type rtree;
-
-write output to nc1:"rttest/btree-rtree-ngram-intersect.adm";
-
-let $region := create-rectangle(create-point(-128.43007812500002,20.298506037222175), create-point(-64.26992187500002,54.56902589732035))
-let $ts_start := datetime("2015-11-11T00:00:00Z")
-let $ts_end := datetime("2015-12-18T23:59:59Z")
-let $keyword := "hello"
-for $t in dataset dsTweet
-where $t.create_at /* +skip-index */ >= $ts_start and $t.create_at /* +skip-index */ < $ts_end
-  and  /* +skip-index */ spatial-intersect($t.location, $region)
-  and contains($t.message, $keyword)
-return $t
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/two-2nd-btree-intersect.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/two-2nd-btree-intersect.aql
deleted file mode 100644
index f0ecf57..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/two-2nd-btree-intersect.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests two secondary Btree indexes should trigger intersection rule
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id;
-
-create index time_index on dsTweet(create_at) type btree;
-create index misc_index on dsTweet(misc) type btree;
-
-write output to nc1:"rttest/two-2nd-btree-intersect.adm";
-
-let $ts_start := datetime("2015-11-11T00:00:00Z")
-let $ts_end := datetime("2015-12-18T23:59:59Z")
-let $keyword := "hello"
-for $t in dataset dsTweet
-where $t.create_at >= $ts_start and $t.create_at < $ts_end
-  and $t.misc > $keyword
-return $t
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/two-inverted-index-intersect.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/two-inverted-index-intersect.aql
deleted file mode 100644
index 2947d61..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/two-inverted-index-intersect.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests keyword index and the ngram indexe should trigger intersection rule
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id;
-
-create index msg_index on dsTweet(message) type ngram(3);
-create index msc_index on dsTweet(misc) type keyword;
-
-for $t in dataset dsTweet
-let $ed := edit-distance($t.message, "Suzanna Tilson")
-let $jacc := similarity-jaccard-check(word-tokens($t.misc), word-tokens("love like verizon"), 0.2f)
-where $jacc[0] and $ed <= 2
-return $t
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/two-rtree-intersect.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/two-rtree-intersect.aql
deleted file mode 100644
index 40c9617..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/two-rtree-intersect.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests two secondary rtree indexes should trigger intersection rule
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  place: rectangle,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id;
-
-create index loc_index on dsTweet(location) type rtree;
-create index plc_index on dsTweet(place) type rtree;
-
-let $region := create-rectangle(create-point(-128.43007812500002,20.298506037222175), create-point(-64.26992187500002,54.56902589732035))
-for $t in dataset dsTweet
-where spatial-intersect($t.location , $region) and spatial-intersect($t.place, $region)
-return $t
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/with-primary-index-intersect.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/with-primary-index-intersect.aql
deleted file mode 100644
index d90f119..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/multi-indexes/with-primary-index-intersect.aql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests primary index will be chosen if it existed in the job plan, no intersection should apply
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type tTweet as closed {
-  id: int32,
-  location: point,
-  message: string,
-  create_at: datetime,
-  misc: string
-}
-
-create dataset dsTweet(tTweet) primary key id;
-
-create index ngram_index on dsTweet(message) type ngram(3);
-create index time_index on dsTweet(create_at) type btree;
-create index location_index on dsTweet(location) type rtree;
-
-write output to nc1:"rttest/btree-rtree-ngram-intersect.adm";
-
-let $region := create-rectangle(create-point(-128.43007812500002,20.298506037222175), create-point(-64.26992187500002,54.56902589732035))
-let $ts_start := datetime("2015-11-11T00:00:00Z")
-let $ts_end := datetime("2015-12-18T23:59:59Z")
-let $keyword := "hello"
-for $t in dataset dsTweet
-where $t.create_at >= $ts_start and $t.create_at < $ts_end
-  and spatial-intersect($t.location, $region)
-  and contains($t.message, $keyword)
-  and $t.id > 0
-return $t
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nest_aggregate.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nest_aggregate.aql
deleted file mode 100644
index d252768..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nest_aggregate.aql
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : This test case is to verify the fix for issue782
- * https://code.google.com/p/asterixdb/issues/detail?id=782
- * Expected Res : SUCCESS
- * Date         : 2nd Jun 2014
- */
-
-drop dataverse tpch if exists;
-create dataverse tpch;
-
-use dataverse tpch;
-
-create type OrderType as closed {
-  o_orderkey: int32,
-  o_custkey: int32,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int32,
-  o_comment: string
-}
-
-create type CustomerType as closed {
-  c_custkey: int32,
-  c_name: string,
-  c_address: string,
-  c_nationkey: int32,
-  c_phone: string,
-  c_acctbal: double,
-  c_mktsegment: string,
-  c_comment: string
-}
-
-create type SupplierType as closed {
-  s_suppkey: int32,
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-create type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-create type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-create type PartType as closed {
-  p_partkey: int32,
-  p_name: string,
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-create type PartSuppType as closed {
-  ps_partkey: int32,
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string
-}
-
-create dataset Orders(OrderType)
-  primary key o_orderkey;
-create dataset Supplier(SupplierType)
-  primary key s_suppkey;
-create dataset Region(RegionType)
-  primary key r_regionkey;
-create dataset Nation(NationType)
-  primary key n_nationkey;
-create dataset Part(PartType)
-  primary key p_partkey;
-create dataset Partsupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey;
-create dataset Customer(CustomerType)
-  primary key c_custkey;
-create dataset SelectedNation(NationType)
-  primary key n_nationkey;
-
-
-
-for $nation in dataset Nation
-for $sn in dataset SelectedNation
-where $nation.n_nationkey = $sn.n_nationkey  /*+ indexnl */
-return {
-  "nation_key": $nation.n_nationkey,
-  "name": $nation.n_name,
-  "aggregates": for $order in dataset Orders
-                for $customer in dataset Customer
-                where $order.o_custkey = $customer.c_custkey
-                and  $customer.c_nationkey = $nation.n_nationkey
-                group by $orderdate := $order.o_orderdate with $order
-                let $sum := sum(for $o in $order return $o.o_totalprice)
-                order by $sum
-                limit 3
-                return {
-                  "order_date": $orderdate,
-                  "sum_price": $sum
-                }
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/disjunction-to-join.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/disjunction-to-join.aql
deleted file mode 100644
index c654f31..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/disjunction-to-join.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Disjunctive predicate should be transformed into collection scan.
- *                  Secondary index should be used to probe the values retrieved from collection.
- * Success        : Yes
- */
- 
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type NestedTestType as open {
-  "idx" : string
-};
-
-create type TestType as open {
-  "id" : string,
-  "no-idx" : string,
-  "nested" : NestedTestType
-};
-
-
-create dataset TestSet(TestType) primary key "id";
-create index TestSetIndex on TestSet(nested.idx);
-
-for $x in dataset TestSet 
-where $x.nested.idx = "one" or $x.nested.idx = "two"
-return $x
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
deleted file mode 100644
index 93c9532..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create type TweetMessageType as closed {
-    nested: TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index msgCountBIx on TweetMessages(nested.countB) type btree;
-
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm";
-
-for $t1 in dataset('TweetMessages')
-where $t1.nested.tweetid < int64("10")
-order by $t1.nested.tweetid
-return {
-"tweetid1": $t1.nested.tweetid,
-"count1":$t1.nested.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-          where $t1.nested.countA /* +indexnl */= $t2.nested.countB
-          order by $t2.nested.tweetid
-          return {"tweetid2": $t2.nested.tweetid,
-                  "count2":$t2.nested.countB}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql
deleted file mode 100644
index cb9a633..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create type TweetMessageType as closed {
-    nested: TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index msgCountBIx on TweetMessages(nested.countB) type btree;
-
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm";
-
-for $t1 in dataset('TweetMessages')
-where $t1.nested.tweetid < int64("10")
-order by $t1.nested.tweetid
-return {
-"tweetid1": $t1.nested.tweetid,
-"count1":$t1.nested.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-                        where $t1.nested.countA /* +indexnl */= $t2.nested.countB and
-                        $t1.nested.tweetid != $t2.nested.tweetid
-                        order by $t2.nested.tweetid
-                        return {"tweetid2": $t2.nested.tweetid,
-                                       "count2":$t2.nested.countB}
-};
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-join_01.aql
deleted file mode 100644
index c1879ee..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-join_01.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    fname : string,
-    lname : string
-}
-
-create type Name as open {
-    nested : Nametmp
-}
-
-create dataset Names(Name) primary key nested.fname,nested.lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_01.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/> $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/> $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-join_02.aql
deleted file mode 100644
index e6b5787..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-join_02.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    fname : string,
-    lname : string
-}
-
-create type Name as open {
-    nested : Nametmp
-}
-
-create dataset Names(Name) primary key nested.fname,nested.lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_02.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/< $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/< $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-join_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-join_03.aql
deleted file mode 100644
index 3927162..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-join_03.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    fname : string,
-    lname : string
-}
-
-create type Name as open {
-    nested : Nametmp
-}
-
-create dataset Names(Name) primary key nested.fname,nested.lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_03.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/= $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/= $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_01.aql
deleted file mode 100644
index c8e66a9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_01.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    fname : string,
-    lname : string
-}
-
-create type Name as open {
-    nested : Nametmp
-}
-
-create dataset Names(Name) primary key nested.fname,nested.lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_01.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/< $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/> $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_02.aql
deleted file mode 100644
index c8512fc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_02.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    fname : string,
-    lname : string
-}
-
-create type Name as open {
-    nested : Nametmp
-}
-
-create dataset Names(Name) primary key nested.fname,nested.lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_02.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/> $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/< $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_03.aql
deleted file mode 100644
index 912b3c7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_03.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    fname : string,
-    lname : string
-}
-
-create type Name as open {
-    nested : Nametmp
-}
-
-create dataset Names(Name) primary key nested.fname,nested.lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_03.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/> $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/= $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_04.aql
deleted file mode 100644
index bc49b9a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_04.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    fname : string,
-    lname : string
-}
-
-create type Name as open {
-    nested : Nametmp
-}
-
-create dataset Names(Name) primary key nested.fname,nested.lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_04.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/< $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/= $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_05.aql
deleted file mode 100644
index fd3337f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_05.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    fname : string,
-    lname : string
-}
-
-create type Name as open {
-    nested : Nametmp
-}
-
-create dataset Names(Name) primary key nested.fname,nested.lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_05.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/= $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/> $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_06.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_06.aql
deleted file mode 100644
index 23e9e5e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-composite-key-prefix-join_06.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its primary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    fname : string,
-    lname : string
-}
-
-create type Name as open {
-    nested : Nametmp
-}
-
-create dataset Names(Name) primary key nested.fname,nested.lname;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_06.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/= $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/< $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join-multipred.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join-multipred.aql
deleted file mode 100644
index c681194..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join-multipred.aql
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Customers' primary index.
- *                  We expect the additional predicates to be put into a select above the
- *                  primary index search.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-create type OrderTypetmp as closed {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create type OrderType as closed {
-  nested : OrderTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-create dataset Orders(OrderType) primary key nested.oid;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-multipred.adm";
-
-for $o in dataset('Orders')
-for $c in dataset('Customers')
-where $c.nested.cid /*+ indexnl */ = $o.nested.cid and $c.nested.name < $o.nested.orderstatus and $c.nested.age < $o.nested.cid
-return {"customer":$c.nested, "order": $o.nested}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join-neg_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join-neg_01.aql
deleted file mode 100644
index d95a193..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join-neg_01.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : This is a negative test, mis-spelt/incorrect HINT should result in
- *                a plan not using an indexed-nested loops join strategy. We expect a hash join.
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestTypetmp as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create type test1.TestType as open {
-          nested : TestTypetmp
-}
-
-create dataset test1.DsOne(TestType) primary key nested.key1;
-create dataset test1.DsTwo(TestType) primary key nested.key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-neg_01.adm";
-
-for $x in dataset('test1.DsOne')
-for $y in dataset('test1.DsTwo')
-where $x.nested.key1 /*+ index */ = $y.nested.key2
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_01.aql
deleted file mode 100644
index 2794abc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_01.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan.
- *              : We expect a plan that hash-exchanges internal dataset DsTwo, then probes internal dataset DsOne's primary index.
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestTypetmp as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create type test1.TestType as open {
-          nested : TestTypetmp
-}
-
-create dataset test1.DsOne(TestType) primary key nested.key1;
-create dataset test1.DsTwo(TestType) primary key nested.key1;
-
-// Please note content enclosed in the comment in the predicate is a HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_01.adm";
-
-for $y in dataset('test1.DsTwo')
-for $x in dataset('test1.DsOne')
-where $x.nested.key1 /*+ indexnl */ = $y.nested.key2
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_02.aql
deleted file mode 100644
index fb5e452..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_02.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan.
- *              : We expect a plan that hash-exchanges internal dataset DsTwo, then probes internal dataset DsOne's primary index.
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestTypetmp as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create type test1.TestType as open {
-          nested : TestTypetmp
-}
-
-create dataset test1.DsOne(TestType) primary key nested.key1;
-create dataset test1.DsTwo(TestType) primary key nested.key1;
-
-// Please note content enclosed in the comment in the predicate is a HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_02.adm";
-
-for $x in dataset('test1.DsOne')
-for $y in dataset('test1.DsTwo')
-where $x.nested.key2 /*+ indexnl */ = $y.nested.key1
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_03.aql
deleted file mode 100644
index 08042d6..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_03.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Customers' primary index.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-create type OrderTypetmp as closed {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create type OrderType as closed {
-  nested : OrderTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-create dataset Orders(OrderType) primary key nested.oid;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_04.adm";
-
-for $o in dataset('Orders')
-for $c in dataset('Customers')
-where $c.nested.cid /*+ indexnl */ = $o.nested.cid
-return {"customer":$c.nested, "order": $o.nested}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_04.aql
deleted file mode 100644
index aa4f69e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_04.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Customers' primary index.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-create type OrderTypetmp as closed {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create type OrderType as closed {
-  nested : OrderTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-create dataset Orders(OrderType) primary key nested.oid;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_05.adm";
-
-for $o in dataset('Orders')
-for $c in dataset('Customers')
-where $o.nested.cid /*+ indexnl */ = $c.nested.cid
-return {"customer":$c.nested, "order": $o.nested}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_05.aql
deleted file mode 100644
index 1a4a8d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-equi-join_05.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self-equi joins a dataset, Customers, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Customers' primary index.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_06.adm";
-
-for $c1 in dataset('Customers')
-for $c2 in dataset('Customers')
-where $c1.nested.cid /*+ indexnl */ = $c2.nested.cid
-return {"customer1":$c1.nested, "customer2":$c2.nested}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-ge-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-ge-join_01.aql
deleted file mode 100644
index 86887b9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-ge-join_01.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan.
- *              : We expect a plan that broadcasts internal dataset DsTwo, then probes internal dataset DsOne's primary index.
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestTypetmp as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create type test1.TestType as open {
-          nested : TestTypetmp
-}
-
-create dataset test1.DsOne(TestType) primary key nested.key1;
-create dataset test1.DsTwo(TestType) primary key nested.key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-ge-join_01.adm";
-
-for $y in dataset('test1.DsTwo')
-for $x in dataset('test1.DsOne')
-where $x.nested.key1 /*+ indexnl */ >= $y.nested.key2
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-gt-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-gt-join_01.aql
deleted file mode 100644
index d72c87c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-gt-join_01.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan.
- *              : We expect a plan that broadcasts internal dataset DsTwo, then probes internal dataset DsOnes primary index.
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestTypetmp as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create type test1.TestType as open {
-          nested : TestTypetmp
-}
-
-create dataset test1.DsOne(TestType) primary key nested.key1;
-create dataset test1.DsTwo(TestType) primary key nested.key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-gt-join_01.adm";
-
-for $y in dataset('test1.DsTwo')
-for $x in dataset('test1.DsOne')
-where $x.nested.key1 /*+ indexnl */ > $y.nested.key2
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-le-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-le-join_01.aql
deleted file mode 100644
index f5fa9ed..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-le-join_01.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan.
- *              : We expect a plan that broadcasts internal dataset DsTwo, then probes internal dataset DsOnes primary index.
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestTypetmp as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create type test1.TestType as open {
-          nested : TestTypetmp
-}
-
-create dataset test1.DsOne(TestType) primary key nested.key1;
-create dataset test1.DsTwo(TestType) primary key nested.key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-le-join_01.adm";
-
-for $y in dataset('test1.DsTwo')
-for $x in dataset('test1.DsOne')
-where $x.nested.key1 /*+ indexnl */ <= $y.nested.key2
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-lt-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-lt-join_01.aql
deleted file mode 100644
index b623032..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/primary-lt-join_01.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan.
- *              : We expect a plan that broadcasts internal dataset DsTwo, then probes internal dataset DsOnes primary index.
- * Expected Res : Success
- * Date         : 29th November 2012
- */
-
-drop dataverse test1 if exists;
-create dataverse test1;
-
-create type test1.TestTypetmp as open {
-          key1: int32,
-          key2: int32,
-          fname : string,
-          lname : string
-}
-
-create type test1.TestType as open {
-          nested : TestTypetmp
-}
-
-create dataset test1.DsOne(TestType) primary key nested.key1;
-create dataset test1.DsTwo(TestType) primary key nested.key1;
-
-// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-
-write output to asterix_nc1:"rttest/btree-index-join_primary-lt-join_01.adm";
-
-for $y in dataset('test1.DsTwo')
-for $x in dataset('test1.DsOne')
-where $x.nested.key1 /*+ indexnl */ < $y.nested.key2
-return $x
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/secondary-equi-join-multiindex.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/secondary-equi-join-multiindex.aql
deleted file mode 100644
index 468e715..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/secondary-equi-join-multiindex.aql
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, FacebookUsers and FacebookMessages, based on their user's id.
- *                  We first expect FacebookUsers' primary index to be used
- *                  to satisfy the range condition on it's primary key.
- *                  FacebookMessages has a secondary btree index on author-id-copy, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type EmploymentType as closed {
-  organization-name: string,
-  start-date: date,
-  end-date: date?
-}
-
-create type FacebookUserTypetmp as closed {
-  id: int32,
-  id-copy: int32,
-  alias: string,
-  name: string,
-  user-since: datetime,
-  user-since-copy: datetime,
-  friend-ids: {{ int32 }},
-  employment: [EmploymentType]
-}
-
-create type FacebookMessageTypetmp as closed {
-  message-id: int32,
-  message-id-copy: int32,
-  author-id: int32,
-  author-id-copy: int32,
-  in-response-to: int32?,
-  sender-location: point?,
-  message: string
-}
-
-create type FacebookUserType as closed {
-  nested : FacebookUserTypetmp
-}
-
-create type FacebookMessageType as closed {
-  nested : FacebookMessageTypetmp
-}
-
-create dataset FacebookUsers(FacebookUserType)
-primary key nested.id;
-
-create dataset FacebookMessages(FacebookMessageType)
-primary key nested.message-id;
-
-create index fbmIdxAutId if not exists on FacebookMessages(nested.author-id-copy);
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multiindex.adm";
-
-for $user in dataset('FacebookUsers')
-for $message in dataset('FacebookMessages')
-where $user.nested.id /*+ indexnl */ = $message.nested.author-id-copy
-and $user.nested.id >= 11000 and $user.nested.id <= 12000
-return {
-  "fbu-ID": $user.nested.id,
-  "fbm-auth-ID": $message.nested.author-id,
-  "uname": $user.nested.name,
-  "message": $message.nested.message
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/secondary-equi-join-multipred.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/secondary-equi-join-multipred.aql
deleted file mode 100644
index ecad56d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/secondary-equi-join-multipred.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, DBLP and CSX, based on their title.
- *                  DBLP has a secondary btree index on title, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the additional predicates to be put into a select above the
- *                  primary index search.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index title_index on DBLP(nested.title);
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multipred.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where $a.nested.title /*+ indexnl */ = $b.nested.title and $a.nested.authors < $b.nested.authors and $a.nested.misc > $b.nested.misc
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/secondary-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/secondary-equi-join_01.aql
deleted file mode 100644
index d0d2d57..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/secondary-equi-join_01.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, DBLP and CSX, based on their title.
- *                  DBLP has a secondary btree index on title, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index title_index on DBLP(nested.title);
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where $a.nested.title /*+ indexnl */ = $b.nested.title
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-01.aql
deleted file mode 100644
index d7123f7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-01.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Please note this is a Negative test and the BTree index should NOT be used in the plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-01.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Roger"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-02.aql
deleted file mode 100644
index 874c232..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-02.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// This is a Negative test - prefix search, BTree index should not be used in the plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-02.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Susan"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-03.aql
deleted file mode 100644
index b9b3272..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-03.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search, BTree index should not be used.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-03.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname < "Isa"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-04.aql
deleted file mode 100644
index ef42b4c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-04.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search, BTree index should not be used in query plan
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-04.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname <= "Vanpatten"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-05.aql
deleted file mode 100644
index d447766..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-05.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - BTree index should NOT be used in query plan
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-05.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname != "Max"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-06.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-06.aql
deleted file mode 100644
index f963827..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-06.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search, BTree index should NOT be used in the query plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-06.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname = "Julio"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-07.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-07.aql
deleted file mode 100644
index eabae77..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-07.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// THE BTREE INDEX IN THIS CASE SHOULD NOT BE PICKED UP!!!!
-// Verify that the optimized query plan does not have the BTree search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-07.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.lname = "Kim"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-08.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-08.aql
deleted file mode 100644
index 131cff2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-08.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used in the optimized query plan
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-08.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname = "Young Seok" and $emp.nested.lname = "Kim"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-09.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-09.aql
deleted file mode 100644
index 40a429d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-09.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-09.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname = "Julio" or $emp.nested.lname = "Malaika"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-10.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-10.aql
deleted file mode 100644
index 570ceac..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-10.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification (usage) test
- *                  : This test is intended to verify that the primary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-10.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Alex" and $emp.nested.lname < "Zach"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-11.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-11.aql
deleted file mode 100644
index 84fb8bb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-11.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is NOT used
- *                  : in the optimized query plan for predicates.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-11.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Allan" and $emp.nested.lname < "Zubi"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-12.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-12.aql
deleted file mode 100644
index bf18468..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-12.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification (usage) test
- *                  : This test is intended to verify that the primary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-12.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Allan" and $emp.nested.lname = "Xu"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-13.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-13.aql
deleted file mode 100644
index 17148b1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-13.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-13.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname = "Julio" and $emp.nested.lname < "Xu"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-14.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-14.aql
deleted file mode 100644
index 6b802dd..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-14.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-14.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Michael" and $emp.nested.lname <= "Xu"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-15.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-15.aql
deleted file mode 100644
index 04b3b1f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-15.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-15.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Craig" and $emp.nested.lname > "Kevin" and $emp.nested.fname < "Mary" and $emp.nested.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-16.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-16.aql
deleted file mode 100644
index 9cb620b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-16.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-16.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst') 
-where $emp.nested.fname >= "Craig" and $emp.nested.lname >= "Kevin" and $emp.nested.fname <= "Mary" and $emp.nested.lname <= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-17.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-17.aql
deleted file mode 100644
index 3509cd5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-17.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-17.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname <= "Craig" and $emp.nested.lname > "Kevin"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-18.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-18.aql
deleted file mode 100644
index 9c64748..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-18.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is NOT used
- *                  : in the optimized query plan
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-18.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname != "Michael" and $emp.nested.lname != "Carey"
-return $emp.nested
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-19.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-19.aql
deleted file mode 100644
index dece127..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-19.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-19.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Craig" and $emp.nested.lname > "Kevin" and $emp.nested.fname <= "Mary" and $emp.nested.lname <= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-20.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-20.aql
deleted file mode 100644
index 8f3a64b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-20.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-20.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Craig" and $emp.nested.lname >= "Kevin" and $emp.nested.fname < "Mary" and $emp.nested.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-21.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-21.aql
deleted file mode 100644
index a2585ae..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-21.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-21.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Max" 
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-22.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-22.aql
deleted file mode 100644
index 61b6fd7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-22.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-22.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Sofia" 
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-23.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-23.aql
deleted file mode 100644
index d7fad72..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-23.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-23.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname < "Chen" 
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-24.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-24.aql
deleted file mode 100644
index f44173e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-24.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-24.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname <= "Julio"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-25.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-25.aql
deleted file mode 100644
index 952fd9e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-25.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-25.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Neil" and $emp.nested.fname < "Roger"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-26.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-26.aql
deleted file mode 100644
index f44bab0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-26.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-26.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Max" and $emp.nested.fname <= "Roger"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-27.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-27.aql
deleted file mode 100644
index 60bf24e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-27.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 5th Feb 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-27.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Craig" and $emp.nested.lname > "Kevin" and $emp.nested.fname <= "Mary" and $emp.nested.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-28.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-28.aql
deleted file mode 100644
index faa0fbe..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-28.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 5th Feb 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-28.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Craig" and $emp.nested.lname > "Kevin" and $emp.nested.fname < "Mary" and $emp.nested.lname <= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-29.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-29.aql
deleted file mode 100644
index eb30856..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-29.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 5th Feb 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-29.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Craig" and $emp.nested.lname >= "Kevin" and $emp.nested.fname < "Mary" and $emp.nested.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-30.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-30.aql
deleted file mode 100644
index 4e20c32..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-30.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 5th Feb 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-30.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Craig" and $emp.nested.lname > "Kevin" and $emp.nested.fname < "Mary" and $emp.nested.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-31.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-31.aql
deleted file mode 100644
index 5c079db..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-31.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 11th Nov 2014
- */
-
-// Positive test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-31.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst') 
-where $emp.nested.fname = "Julio" and $emp.nested.lname > "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-32.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-32.aql
deleted file mode 100644
index 0ba7e4a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-primary-32.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the primary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 11th Nov 2014
- */
-
-// Positive test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-32.adm";
-
-create type TestTypetmp as open {
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-// create internal dataset with primary index (composite key) defined on fname,lname fields
-create dataset testdst(TestType) primary key nested.fname,nested.lname;
-
-for $emp in dataset('testdst') 
-where $emp.nested.fname < "Julio" and $emp.nested.lname = "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-33.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-33.aql
deleted file mode 100644
index b7e4be1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-33.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Please note this is a Negative test and the BTree index should NOT be used in the plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-31.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Roger"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-34.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-34.aql
deleted file mode 100644
index 07b40f1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-34.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// This is a Negative test - prefix search, BTree index should not be used in the plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-32.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Susan"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-35.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-35.aql
deleted file mode 100644
index 27004fd..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-35.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification (usage) test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search, BTree index should not be used.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-33.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname < "Isa"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-36.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-36.aql
deleted file mode 100644
index b90d463..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-36.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search, BTree index should not be used in query plan
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-34.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname <= "Vanpatten"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-37.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-37.aql
deleted file mode 100644
index ecd166f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-37.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - BTree index should NOT be used in query plan
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-35.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname != "Max"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-38.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-38.aql
deleted file mode 100644
index dca8698..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-38.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search, BTree index should NOT be used in the query plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-36.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname = "Julio"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-39.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-39.aql
deleted file mode 100644
index 80af215..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-39.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// THE BTREE INDEX IN THIS CASE SHOULD NOT BE PICKED UP!!!!
-// Verify that the optimized query plan does not have the BTree search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-37.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.lname = "Kim"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-40.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-40.aql
deleted file mode 100644
index 8282428..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-40.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used in the optimized query plan
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-38.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname = "Young Seok" and $emp.nested.lname = "Kim"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-41.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-41.aql
deleted file mode 100644
index 07ce0dc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-41.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-39.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname = "Julio" or $emp.nested.lname = "Malaika"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-42.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-42.aql
deleted file mode 100644
index f5d6275..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-42.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-40.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Alex" and $emp.nested.lname < "Zach"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-43.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-43.aql
deleted file mode 100644
index 2499481..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-43.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-41.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Allan" and $emp.nested.lname < "Zubi"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-44.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-44.aql
deleted file mode 100644
index 07f6fd4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-44.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-42.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Allan" and $emp.nested.lname = "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-45.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-45.aql
deleted file mode 100644
index 62ae7c2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-45.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-43.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname = "Julio" and $emp.nested.lname < "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-46.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-46.aql
deleted file mode 100644
index 5b58a05..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-46.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-44.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Michael" and $emp.nested.lname <= "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-47.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-47.aql
deleted file mode 100644
index 9dca80f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-47.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-45.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Craig" and $emp.nested.lname > "Kevin" and $emp.nested.fname < "Mary" and $emp.nested.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-48.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-48.aql
deleted file mode 100644
index 94f99f2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-48.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-46.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Craig" and $emp.nested.lname >= "Kevin" and $emp.nested.fname <= "Mary" and $emp.nested.lname <= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-49.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-49.aql
deleted file mode 100644
index 70bf2a7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-49.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-47.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname <= "Craig" and $emp.nested.lname > "Kevin"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-50.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-50.aql
deleted file mode 100644
index 6f8bb61..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-50.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-48.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname != "Michael" and $emp.nested.lname != "Carey"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-51.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-51.aql
deleted file mode 100644
index 6bd87f5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-51.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-49.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Craig" and $emp.nested.lname > "Kevin" and $emp.nested.fname <= "Mary" and $emp.nested.lname <= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-52.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-52.aql
deleted file mode 100644
index ecb41ab..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-52.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-50.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Craig" and $emp.nested.lname >= "Kevin" and $emp.nested.fname < "Mary" and $emp.nested.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-53.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-53.aql
deleted file mode 100644
index 56507b3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-53.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-51.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Craig" and $emp.nested.lname <= "Kevin" and $emp.nested.fname <= "Mary" and $emp.nested.lname >= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-54.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-54.aql
deleted file mode 100644
index f6c61b6..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-54.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-52.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Max"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-55.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-55.aql
deleted file mode 100644
index ccf4772..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-55.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-53.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Sofia"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-56.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-56.aql
deleted file mode 100644
index 42a4da4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-56.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-54.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname < "Chen"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-57.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-57.aql
deleted file mode 100644
index 5f39274..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-57.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-55.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname <= "Julio"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-58.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-58.aql
deleted file mode 100644
index 28e321f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-58.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-56.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Neil" and $emp.nested.fname < "Roger"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-59.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-59.aql
deleted file mode 100644
index 9060d83..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-59.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Max" and $emp.nested.fname <= "Roger"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-60.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-60.aql
deleted file mode 100644
index c1840d3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-60.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-58.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname = "Max"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-61.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-61.aql
deleted file mode 100644
index 1b17b05..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-61.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-61.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Craig" and $emp.nested.lname > "Kevin" and $emp.nested.fname <= "Mary" and $emp.nested.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-62.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-62.aql
deleted file mode 100644
index 15c84be..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-62.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 11th Nov 2014
- */
-
-// Positive test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-62.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst') 
-where $emp.nested.fname = "Julio" and $emp.nested.lname > "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-63.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-63.aql
deleted file mode 100644
index 2e32bcb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index/btree-secondary-63.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 11th Nov 2014
- */
-
-// Positive test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-63.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname,nested.lname);
-
-for $emp in dataset('testdst') 
-where $emp.nested.fname < "Julio" and $emp.nested.lname = "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-contains-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-contains-panic.aql
deleted file mode 100644
index f977606..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-contains-panic.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the contains function.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains-panic.adm";
-
-// Cannot optimize this query because the string constant is shorter than the gram length.
-for $o in dataset('DBLP')
-where contains($o.nested.title, "Mu")
-order by $o.nested.id
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-contains.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-contains.aql
deleted file mode 100644
index 63e3dba..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-contains.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the contains function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm";
-
-for $o in dataset('DBLP')
-where contains($o.nested.title, "Multimedia")
-order by $o.nested.id
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.aql
deleted file mode 100644
index cefa81c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on strings.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check-panic.adm";
-
-// This query cannot be optimized with an index, based on the high edit distance.
-for $o in dataset('DBLP')
-let $ed := edit-distance-check($o.nested.authors, "Amihay Motro", 5)
-where $ed[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-edit-distance-check.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-edit-distance-check.aql
deleted file mode 100644
index 7551a42..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-edit-distance-check.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on strings.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check.adm";
-
-for $o in dataset('DBLP')
-where edit-distance-check($o.nested.authors, "Amihay Motro", 1)[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-edit-distance-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-edit-distance-panic.aql
deleted file mode 100644
index a8bcfe3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-edit-distance-panic.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance function on strings.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-panic.adm";
-
-// This query cannot be optimized with an index, based on the high edit distance.
-for $o in dataset('DBLP')
-where edit-distance($o.nested.authors, "Amihay Motro") <= 5
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-edit-distance.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-edit-distance.aql
deleted file mode 100644
index dc0baa5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-edit-distance.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance function on strings.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance.adm";
-
-for $o in dataset('DBLP')
-where edit-distance($o.nested.authors, "Amihay Motro") <= 1
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.aql
deleted file mode 100644
index c466756..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query with ~= using edit-distance on strings.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-edit-distance.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '1';
-
-for $o in dataset('DBLP')
-where $o.nested.authors ~= "Amihay Motro"
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.aql
deleted file mode 100644
index 346174c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query with ~= using Jaccard on 3-gram tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-jaccard.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.8f';
-
-for $o in dataset('DBLP')
-where gram-tokens($o.nested.title, 3, false) ~= gram-tokens("Transactions for Cooperative Environments", 3, false)
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-jaccard-check.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-jaccard-check.aql
deleted file mode 100644
index d587987..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-jaccard-check.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the similarity-jaccard-check function on 3-gram tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard-check.adm";
-
-for $o in dataset('DBLP')
-where similarity-jaccard-check(gram-tokens($o.nested.title, 3, false), gram-tokens("Transactions for Cooperative Environments", 3, false), 0.5f)[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-jaccard.aql
deleted file mode 100644
index be61a9d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ngram-jaccard.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the similarity-jaccard function on 3-gram tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard.adm";
-
-for $o in dataset('DBLP')
-where similarity-jaccard(gram-tokens($o.nested.title, 3, false), gram-tokens("Transactions for Cooperative Environments", 3, false)) >= 0.5f
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-edit-distance-check-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-edit-distance-check-panic.aql
deleted file mode 100644
index 03072ea..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-edit-distance-check-panic.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the edit-distance-check function on lists.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-check-panic.adm";
-
-// Index should not be applied because all list elements can be modified by 3 edit operations.
-for $c in dataset('Customers')
-where edit-distance-check($c.nested.interests, ["computers", "wine", "walking"], 3)[0]
-order by $c.nested.cid
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-edit-distance-check.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-edit-distance-check.aql
deleted file mode 100644
index 45e12bf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-edit-distance-check.aql
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the edit-distance-check function on lists.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-check.adm";
-
-for $c in dataset('Customers')
-where edit-distance-check($c.nested.interests, ["computers", "wine", "walking"], 1)[0]
-order by $c.nested.cid
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-edit-distance-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-edit-distance-panic.aql
deleted file mode 100644
index 3998789..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-edit-distance-panic.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the edit-distance function on lists.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-panic.adm";
-
-// Index should not be applied because all list elements can be modified by 3 edit operations.
-for $c in dataset('Customers')
-where edit-distance($c.nested.interests, ["computers", "wine", "walking"]) <= 3
-order by $c.nested.cid
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-edit-distance.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-edit-distance.aql
deleted file mode 100644
index c5c67a0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-edit-distance.aql
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the edit-distance function on lists.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance.adm";
-
-for $c in dataset('Customers')
-where edit-distance($c.nested.interests, ["computers", "wine", "walking"]) <= 1
-order by $c.nested.cid
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.aql
deleted file mode 100644
index f802444..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.aql
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query with ~= using edit-distance on lists.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-fuzzyeq-edit-distance.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '1';
-
-for $c in dataset('Customers')
-where $c.nested.interests ~= ["computers", "wine", "walking"]
-order by $c.nested.cid
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.aql
deleted file mode 100644
index 6ffff30..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.aql
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword is applied to optimize a selection query with ~= using Jaccard on lists.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-fuzzyeq-jaccard.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.8f';
-
-for $c in dataset('Customers')
-where $c.nested.interests ~= ["databases", "computers", "wine"]
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-jaccard-check.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-jaccard-check.aql
deleted file mode 100644
index c618992..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-jaccard-check.aql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard-check function on lists.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-jaccard-check.adm";
-
-for $c in dataset('Customers')
-where similarity-jaccard-check($c.nested.interests, ["databases", "computers", "wine"], 0.7f)[0]
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-jaccard.aql
deleted file mode 100644
index 47e900e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/olist-jaccard.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard function on lists.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-jaccard.adm";
-
-for $c in dataset('Customers')
-where similarity-jaccard($c.nested.interests, ["databases", "computers", "wine"]) >= 0.7f
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.aql
deleted file mode 100644
index a3237a6..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.aql
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword is applied to optimize a selection query with ~= using Jaccard on sets.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ulist-fuzzyeq-jaccard.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.8f';
-
-for $c in dataset('Customers')
-where $c.nested.interests ~= {{"computers", "wine", "databases"}}
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ulist-jaccard-check.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ulist-jaccard-check.aql
deleted file mode 100644
index 9f5cce6..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ulist-jaccard-check.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard-check function on sets.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ulist-jaccard.adm";
-
-for $c in dataset('Customers')
-where similarity-jaccard-check($c.nested.interests, {{"computers", "wine", "databases"}}, 0.7f)[0]
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ulist-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ulist-jaccard.aql
deleted file mode 100644
index 7ebe334..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/ulist-jaccard.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard function on sets.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ulist-jaccard.adm";
-
-for $c in dataset('Customers')
-where similarity-jaccard($c.nested.interests, {{"computers", "databases", "wine"}}) >= 0.7f
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/word-contains.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/word-contains.aql
deleted file mode 100644
index 20bb147..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/word-contains.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the contains function.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_word-contains.adm";
-
-// Contains cannot be answered with a word inverted index.
-for $o in dataset('DBLP')
-where contains($o.nested.title, "Multimedia")
-order by $o.nested.id
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.aql
deleted file mode 100644
index f77591c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword is applied to optimize a selection query with ~= using Jaccard on word tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_word-fuzzyeq-jaccard.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $o in dataset('DBLP')
-where word-tokens($o.nested.title) ~= word-tokens("Transactions for Cooperative Environments")
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/word-jaccard-check.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/word-jaccard-check.aql
deleted file mode 100644
index 5df3ee3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/word-jaccard-check.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard-check function on word tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard-check.adm";
-
-for $o in dataset('DBLP')
-where similarity-jaccard-check(word-tokens($o.nested.title), word-tokens("Transactions for Cooperative Environments"), 0.5f)[0]
-return $o
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/word-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/word-jaccard.aql
deleted file mode 100644
index 5aa8f6e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-basic/word-jaccard.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard function on word tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm";
-
-for $o in dataset('DBLP')
-where similarity-jaccard(word-tokens($o.nested.title), word-tokens("Transactions for Cooperative Environments")) >= 0.5f
-return $o
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.aql
deleted file mode 100644
index 6fbccc9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.aql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using
- *                  two edit-distance-check function of which only the first can be optimized with an index.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
-
-// Only the first edit-distance-check can be optimized with an index.
-for $o in dataset('DBLP')
-let $eda := edit-distance-check($o.nested.authors, "Amihay Motro", 3)
-let $edb := edit-distance-check($o.nested.authors, "Amihay Motro", 5)
-where $eda[0] and $edb[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.aql
deleted file mode 100644
index bb2d7a0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.aql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using
- *                  two edit-distance-check function of which only the second can be optimized with an index.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
-
-// Only the second edit-distance-check can be optimized with an index.
-for $o in dataset('DBLP')
-let $edb := edit-distance-check($o.nested.authors, "Amihay Motro", 5)
-let $eda := edit-distance-check($o.nested.authors, "Amihay Motro", 3)
-where $edb[0] and $eda[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.aql
deleted file mode 100644
index 97c1e59..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on strings.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic.adm";
-
-// This query cannot be optimized with an index, based on the high edit distance.
-for $o in dataset('DBLP')
-let $ed := edit-distance-check($o.nested.authors, "Amihay Motro", 5)
-where $ed[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-let.aql
deleted file mode 100644
index a507b05..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-let.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on strings.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let.adm";
-
-for $o in dataset('DBLP')
-let $ed := edit-distance-check($o.nested.authors, "Amihay Motro", 1)
-where $ed[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.aql
deleted file mode 100644
index 4dac57c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index index is applied to optimize a selection query using the similarity-edit-distance-check function on the substring of the field.
- *                  Tests that the optimizer rule correctly drills through the substring function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPNestedType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested: DBLPNestedType
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-substring.adm";
-
-for $paper in dataset('DBLP')
-where edit-distance-check(substring($paper.nested.title, 0, 8), "datbase", 1)[0]
-return {
-  "id" : $paper.nested.id,
-  "title" : $paper.nested.title
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql
deleted file mode 100644
index 03cac36..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index index is applied to optimize a selection query using the similarity-edit-distance-check function on individual word tokens.
- *                  Tests that the optimizer rule correctly drills through the word-tokens function and existential query.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPNestedType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested: DBLPNestedType
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-word-tokens.adm";
-
-for $paper in dataset('DBLP')
-for $word in word-tokens($paper.nested.title)
-where edit-distance-check($word, "Multmedia", 1)[0]
-distinct by $paper.nested.id
-return {
-  "id" : $paper.nested.id,
-  "title" : $paper.nested.title
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-jaccard-check-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-jaccard-check-let.aql
deleted file mode 100644
index 4067927..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-jaccard-check-let.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the similarity-jaccard-check function on 3-gram tokens.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-let.adm";
-
-for $o in dataset('DBLP')
-let $jacc := similarity-jaccard-check(gram-tokens($o.nested.title, 3, false), gram-tokens("Transactions for Cooperative Environments", 3, false), 0.5f)
-where $jacc[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.aql
deleted file mode 100644
index 30f3ca4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the similarity-jaccard-check function on 3-gram tokens.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-multi-let.adm";
-
-// This test is complex because we have three assigns to drill into.
-for $paper in dataset('DBLP')
-let $paper_tokens := gram-tokens($paper.nested.title, 3, false)
-let $query_tokens := gram-tokens("Transactions for Cooperative Environments", 3, false)
-let $jacc := similarity-jaccard-check($paper_tokens, $query_tokens, 0.5f)
-where $jacc[0]
-return {"Paper": $paper_tokens, "Query": $query_tokens }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.aql
deleted file mode 100644
index ea22e19..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.aql
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on lists.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_olist-edit-distance-check-let-panic.adm";
-
-for $c in dataset('Customers')
-let $ed := edit-distance-check($c.nested.interests, ["computers", "wine", "walking"], 3)
-where $ed[0]
-order by $c.nested.cid
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/olist-edit-distance-check-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/olist-edit-distance-check-let.aql
deleted file mode 100644
index e88a673..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/olist-edit-distance-check-let.aql
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on lists.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_olist-edit-distance-check-let.adm";
-
-for $c in dataset('Customers')
-let $ed := edit-distance-check($c.nested.interests, ["computers", "wine", "walking"], 1)
-where $ed[0]
-order by $c.nested.cid
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/olist-jaccard-check-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/olist-jaccard-check-let.aql
deleted file mode 100644
index bd7245f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/olist-jaccard-check-let.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard-check function on lists.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_olist-jaccard-check-let.adm";
-
-for $c in dataset('Customers')
-let $jacc := similarity-jaccard-check($c.nested.interests, ["databases", "computers", "wine"], 0.7f)
-where $jacc[0]
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ulist-jaccard-check-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ulist-jaccard-check-let.aql
deleted file mode 100644
index c4093dc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/ulist-jaccard-check-let.aql
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard-check function on lists.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ulist-jaccard-check-let.adm";
-
-for $c in dataset('Customers')
-let $jacc := similarity-jaccard-check($c.nested.interests, ["databases", "computers", "wine"], 0.7f)
-where $jacc[0]
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/word-jaccard-check-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/word-jaccard-check-let.aql
deleted file mode 100644
index 4a416b8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/word-jaccard-check-let.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard-check function on word tokens.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-let.adm";
-
-for $o in dataset('DBLP')
-let $jacc := similarity-jaccard-check(word-tokens($o.nested.title), word-tokens("Transactions for Cooperative Environments"), 0.5f)
-where $jacc[0]
-return $o
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/word-jaccard-check-multi-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/word-jaccard-check-multi-let.aql
deleted file mode 100644
index 7183115..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-complex/word-jaccard-check-multi-let.aql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard-check function on word tokens.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-multi-let.adm";
-
-// This test is complex because we have three assigns to drill into.
-for $paper in dataset('DBLP')
-let $paper_tokens := word-tokens($paper.nested.title)
-let $query_tokens := word-tokens("Transactions for Cooperative Environments")
-let $jacc := similarity-jaccard-check($paper_tokens, $query_tokens, 0.8f)
-where $jacc[0]
-return {"Paper": $paper_tokens, "Query": $query_tokens }
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.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.aql
deleted file mode 100644
index 90e7cb9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create type TweetMessageType as closed {
-    nested: TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-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";
-
-for $t1 in dataset('TweetMessages')
-where $t1.nested.tweetid > int64("240")
-order by $t1.nested.tweetid
-return {
-    "tweet": {"id": $t1.nested.tweetid, "topics" : $t1.nested.message-text} ,
-    "similar-tweets": for $t2 in dataset('TweetMessages')
-                      let $sim := edit-distance-check($t1.nested.message-text, $t2.nested.message-text, 7)
-              where $sim[0] and
-                      $t2.nested.tweetid != $t1.nested.tweetid
-                      order by $t2.nested.tweetid
-                      return {"id": $t2.nested.tweetid, "topics" : $t2.nested.message-text}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.aql
deleted file mode 100644
index 128b068..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create type TweetMessageType as closed {
-    nested: TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index topicKeywordIx on TweetMessages(nested.referred-topics) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-jaccard-check_idx_01.adm";
-
-for $t1 in dataset('TweetMessages')
-where $t1.nested.tweetid > int64("240")
-order by $t1.nested.tweetid
-return {
-    "tweet": {"id": $t1.nested.tweetid, "topics" : $t1.nested.referred-topics} ,
-    "similar-tweets": for $t2 in dataset('TweetMessages')
-                      let $sim := similarity-jaccard-check($t1.nested.referred-topics, $t2.nested.referred-topics, 0.5f)
-              where $sim[0] and
-                      $t2.nested.tweetid != $t1.nested.tweetid
-                      order by $t2.nested.tweetid
-                      return {"id": $t2.nested.tweetid, "topics" : $t2.nested.referred-topics}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-edit-distance-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-edit-distance-check_01.aql
deleted file mode 100644
index defd28d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-edit-distance-check_01.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance-check function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where edit-distance-check($a.nested.authors, $b.nested.authors, 3)[0] and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-edit-distance-contains.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-edit-distance-contains.aql
deleted file mode 100644
index 3190e66..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-edit-distance-contains.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance-contains function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-contains.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where edit-distance-contains($a.nested.authors, $b.nested.authors, 3)[0] and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-edit-distance-inline.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-edit-distance-inline.aql
deleted file mode 100644
index 44a8430..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-edit-distance-inline.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the edit-distance function of its authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-edit-distance-inline.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-let $ed := edit-distance($a.nested.authors, $b.nested.authors)
-where $ed < 3 and $a.nested.id < $b.nested.id
-return {"aauthors": $a.nested.authors, "bauthors": $b.nested.authors, "ed": $ed}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-edit-distance_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-edit-distance_01.aql
deleted file mode 100644
index e7e6dc7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-edit-distance_01.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where edit-distance($a.nested.authors, $b.nested.authors) < 3 and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.aql
deleted file mode 100644
index e188ff1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using edit distance of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on CSX(nested.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';
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where $a.nested.authors ~= $b.nested.authors and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.aql
deleted file mode 100644
index 56e0094..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.aql
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on CSX(nested.title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where gram-tokens($a.nested.title, 3, false) ~= gram-tokens($b.nested.title, 3, false) and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-jaccard-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-jaccard-check_01.aql
deleted file mode 100644
index 482e8c9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-jaccard-check_01.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard-check function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on CSX(nested.title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where similarity-jaccard-check(gram-tokens($a.nested.title, 3, false), gram-tokens($b.nested.title, 3, false), 0.5f)[0]
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-jaccard-inline.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-jaccard-inline.aql
deleted file mode 100644
index 7448a06..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-jaccard-inline.aql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the similarity-jaccard function of its titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-jaccard-inline.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-let $jacc := similarity-jaccard(gram-tokens($a.nested.title, 3, false), gram-tokens($b.nested.title, 3, false))
-where $jacc >= 0.5f and $a.nested.id < $b.nested.id
-return {"atitle": $a.nested.title, "btitle": $b.nested.title, "jacc": $jacc}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-jaccard_01.aql
deleted file mode 100644
index a0f751d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ngram-jaccard_01.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on CSX(nested.title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where similarity-jaccard(gram-tokens($a.nested.title, 3, false), gram-tokens($b.nested.title, 3, false)) >= 0.5f
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-edit-distance-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-edit-distance-check_01.aql
deleted file mode 100644
index 354b943..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-edit-distance-check_01.aql
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the edit-distance-check function of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance-check_01.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where edit-distance-check($a.nested.interests, $b.nested.interests, 3)[0] and $a.nested.cid < $b.nested.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-edit-distance-inline.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-edit-distance-inline.aql
deleted file mode 100644
index 542361b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-edit-distance-inline.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, Customers, based on the edit-distance function of its interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-edit-distance-inline.adm";
-
-for $a in dataset('Customers')
-for $b in dataset('Customers')
-let $ed := edit-distance($a.nested.interests, $b.nested.interests)
-where $ed <= 2 and $a.nested.cid < $b.nested.cid
-return {"ainterests": $a.nested.interests, "binterests": $b.nested.interests, "ed": $ed}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-edit-distance_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-edit-distance_01.aql
deleted file mode 100644
index 2b375fd..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-edit-distance_01.aql
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the edit-distance function of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance_01.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where edit-distance($a.nested.interests, $b.nested.interests) <= 2 and $a.nested.cid < $b.nested.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.aql
deleted file mode 100644
index a235f67..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on ~= using edit distance of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '3';
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where $a.nested.interests ~= $b.nested.interests and $a.nested.cid < $b.nested.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.aql
deleted file mode 100644
index 06ade10..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on ~= using Jaccard of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.7f';
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where $a.nested.interests /*+ indexnl */ ~= $b.nested.interests and $a.nested.cid < $b.nested.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-jaccard-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-jaccard-check_01.aql
deleted file mode 100644
index 153ea02..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-jaccard-check_01.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the similarity-jaccard-check function of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard-check_01.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where /*+ indexnl */ similarity-jaccard-check($a.nested.interests, $b.nested.interests, 0.7f)[0] and $a.nested.cid < $b.nested.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-jaccard-inline.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-jaccard-inline.aql
deleted file mode 100644
index adbe0e5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-jaccard-inline.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, Customers, based on the similarity-jaccard function of its interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-jaccard-inline.adm";
-
-for $a in dataset('Customers')
-for $b in dataset('Customers')
-let $jacc := /*+ indexnl */ similarity-jaccard($a.nested.interests, $b.nested.interests)
-where $jacc >= 0.7f and $a.nested.cid < $b.nested.cid
-return {"ainterests": $a.nested.interests, "binterests": $b.nested.interests, "jacc": $jacc }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-jaccard_01.aql
deleted file mode 100644
index fb51eff..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/olist-jaccard_01.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the similarity-jaccard function of their interest lists.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: [string],
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard_01.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where /*+ indexnl */ similarity-jaccard($a.nested.interests, $b.nested.interests) >= 0.7f and $a.nested.cid < $b.nested.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.aql
deleted file mode 100644
index 998e29c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on ~= using Jaccard of their interest sets.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.7f';
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where $a.nested.interests /*+ indexnl */ ~= $b.nested.interests and $a.nested.cid < $b.nested.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ulist-jaccard-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ulist-jaccard-check_01.aql
deleted file mode 100644
index 4493a40..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ulist-jaccard-check_01.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the similarity-jaccard-check function of their interest sets.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard-check_01.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where /*+ indexnl */ similarity-jaccard-check($a.nested.interests, $b.nested.interests, 0.7f)[0] and $a.nested.cid < $b.nested.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ulist-jaccard-inline.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ulist-jaccard-inline.aql
deleted file mode 100644
index 5e3a563..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ulist-jaccard-inline.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, Customers, based on the similarity-jaccard function of its interest sets.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
- 
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ulist-jaccard-inline.adm";
-
-for $a in dataset('Customers')
-for $b in dataset('Customers')
-let $jacc := /*+ indexnl */ similarity-jaccard($a.nested.interests, $b.nested.interests)
-where $jacc >= 0.7f and $a.nested.cid < $b.nested.cid
-return {"ainterests": $a.nested.interests, "binterests": $b.nested.interests, "jacc": $jacc}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ulist-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ulist-jaccard_01.aql
deleted file mode 100644
index b39409e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/ulist-jaccard_01.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, Customer and Customer2, based on the similarity-jaccard function of their interest sets.
- *                  Customers has a keyword index on interests, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerTypetmp as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create type CustomerType as closed {
-  nested : CustomerTypetmp
-}
-
-create dataset Customers(CustomerType) primary key nested.cid;
-
-create dataset Customers2(CustomerType) primary key nested.cid;
-
-create index interests_index on Customers(nested.interests) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard_01.adm";
-
-for $b in dataset('Customers2')
-for $a in dataset('Customers')
-where /*+ indexnl */ similarity-jaccard($a.nested.interests, $b.nested.interests) >= 0.7f and $a.nested.cid < $b.nested.cid
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.aql
deleted file mode 100644
index e45b02d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where word-tokens($a.nested.title) ~= word-tokens($b.nested.title) and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.aql
deleted file mode 100644
index 0fd522d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.aql
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, TweetMessages, based on the similarity-jaccard-check function of its text-messages' word tokens.
- *                  TweetMessages has a keyword index on text-message and btree index on the primary key tweetid, and we expect the join to be
- *                    transformed into btree and inverted indexed nested-loop joins. We test whether the join condition can be transformed into
- *                    multiple indexed nested loop joins of various type of indexes.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as closed {
-    tweetid: int64,
-    user: TwitterUserType,
-    sender-location: point,
-    send-time: datetime,
-    referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create type TweetMessageType as closed {
-    nested: TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index twmSndLocIx on TweetMessages(nested.sender-location) type rtree;
-create index msgCountAIx on TweetMessages(nested.countA) type btree;
-create index msgCountBIx on TweetMessages(nested.countB) type btree;
-create index msgTextIx on TweetMessages(nested.message-text) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check-after-btree-access.adm";
-
-for $t1 in dataset('TweetMessages')
-for $t2 in dataset('TweetMessages')
-let $sim := similarity-jaccard-check(word-tokens($t1.nested.message-text), word-tokens($t2.nested.message-text), 0.6f)
-where $sim[0] and $t1.nested.tweetid < int64("20") and $t2.nested.tweetid != $t1.nested.tweetid
-return {
-    "t1": $t1.nested.tweetid,
-    "t2": $t2.nested.tweetid,
-    "sim": $sim[1]
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard-check_01.aql
deleted file mode 100644
index 55c2ff4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard-check_01.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard-check function of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard-check(word-tokens($a.nested.title), word-tokens($b.nested.title), 0.5f)[0]
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard-inline.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard-inline.aql
deleted file mode 100644
index 93bcc3e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard-inline.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the similarity-jaccard function of its titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_word-jaccard-inline.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-let $jacc := similarity-jaccard(word-tokens($a.nested.title), word-tokens($b.nested.title))
-where $jacc >= 0.5f and $a.nested.id < $b.nested.id
-return {"atitle": $a.nested.title, "btitle": $b.nested.title, "jacc": $jacc}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard_01.aql
deleted file mode 100644
index acbe3db..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard_01.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard(word-tokens($a.nested.title), word-tokens($b.nested.title)) >= 0.5f
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01-index-only.aql
deleted file mode 100644
index b259612..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01-index-only.aql
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as open {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create type TweetMessageType as open {
-    nested: TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index twmSndLocIx on TweetMessages(nested.sender-location) type rtree;
-create index msgCountAIx on TweetMessages(nested.countA) type btree;
-create index msgCountBIx on TweetMessages(nested.countB) type btree;
-create index msgTextIx on TweetMessages(nested.message-text) type keyword;
-
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_01.adm";
-
-for $t1 in dataset('TweetMessages')
-let $n :=  create-circle($t1.nested.sender-location, 0.5)
-where $t1.nested.tweetid < int64("10")
-order by $t1.nested.tweetid
-return {
-"tweetid1": $t1.nested.tweetid,
-"loc1":$t1.nested.sender-location,
-"nearby-message": for $t2 in dataset('TweetMessages')
-                             where spatial-intersect($t2.nested.sender-location, $n)
-                             order by $t2.tweetid
-                             return {"tweetid2":$t2.nested.tweetid, "loc2":$t2.nested.sender-location}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql
deleted file mode 100644
index b4cf594..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as open {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create type TweetMessageType as open {
-    nested: TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index twmSndLocIx on TweetMessages(nested.sender-location) type rtree;
-create index msgCountAIx on TweetMessages(nested.countA) type btree;
-create index msgCountBIx on TweetMessages(nested.countB) type btree;
-create index msgTextIx on TweetMessages(nested.message-text) type keyword;
-
-set 'compiler.indexonly' "false";
-
-for $t1 in dataset('TweetMessages')
-let $n :=  create-circle($t1.nested.sender-location, 0.5)
-where $t1.nested.tweetid < int64("10")
-order by $t1.nested.tweetid
-return {
-"tweetid1": $t1.nested.tweetid,
-"loc1":$t1.nested.sender-location,
-"nearby-message": for $t2 in dataset('TweetMessages')
-                             where spatial-intersect($t2.nested.sender-location, $n)
-                             order by $t2.tweetid
-                             return {"tweetid2":$t2.nested.tweetid, "loc2":$t2.nested.sender-location}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.aql
deleted file mode 100644
index 4fb3041..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.aql
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create type TweetMessageType as open {
-    nested: TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index twmSndLocIx on TweetMessages(nested.sender-location) type rtree;
-create index msgCountAIx on TweetMessages(nested.countA) type btree;
-create index msgCountBIx on TweetMessages(nested.countB) type btree;
-create index msgTextIx on TweetMessages(nested.message-text) type keyword;
-
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_02.adm";
-
-for $t1 in dataset('TweetMessages')
-let $n :=  create-circle($t1.nested.sender-location, 0.5)
-where $t1.nested.tweetid < int64("10")
-order by $t1.nested.tweetid
-return {
-"tweetid1": $t1.nested.tweetid,
-"loc1":$t1.nested.sender-location,
-"nearby-message": for $t2 in dataset('TweetMessages')
-                             where spatial-intersect($t2.nested.sender-location, $n) and $t1.nested.tweetid != $t2.nested.tweetid
-                             order by $t2.nested.tweetid
-                             return {"tweetid2":$t2.nested.tweetid, "loc2":$t2.nested.sender-location}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/spatial-intersect-point_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/spatial-intersect-point_01.aql
deleted file mode 100644
index 1812b3b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/spatial-intersect-point_01.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Joins two datasets on the intersection of their point attributes.
- *                  The dataset 'MyData1' has an enforced open RTree index?, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create type MyRecordNested as closed {
-  nested: MyRecord
-}
-
-create dataset MyData1(MyRecordNested) primary key nested.id;
-create dataset MyData2(MyRecord) primary key id;
-
-create index rtree_index on MyData1(nested.point) type rtree;
-
-write output to asterix_nc1:"rttest/index-join_rtree-spatial-intersect-point.adm";
-
-for $b in dataset('MyData2')
-for $a in dataset('MyData1')
-where spatial-intersect($a.nested.point, $b.point)
-return {"a": $a, "b": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/spatial-intersect-point_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/spatial-intersect-point_02.aql
deleted file mode 100644
index bed6626..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/spatial-intersect-point_02.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Joins two datasets on the intersection of their point attributes.
- *                  The dataset 'MyData2' has an enforced open RTree index?, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create type MyRecordNested as closed {
-  nested: MyRecord
-}
-
-create dataset MyData1(MyRecordNested) primary key nested.id;
-create dataset MyData2(MyRecord) primary key id;
-
-create index rtree_index on MyData2(point) type rtree;
-
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
-
-for $a in dataset('MyData1')
-for $b in dataset('MyData2')
-where spatial-intersect($a.nested.point, $b.point)
-return {"a": $a, "b": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/spatial-intersect-point_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/spatial-intersect-point_03.aql
deleted file mode 100644
index e991ee8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/spatial-intersect-point_03.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self-joins a dataset on the intersection of its point attribute.
- *                  The dataset has an enforced open RTree index?, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create type MyRecordNested as closed {
-  nested: MyRecord
-}
-create dataset MyData(MyRecordNested) primary key nested.id;
-
-create index rtree_index on MyData(nested.point) type rtree;
-
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_03.adm";
-
-for $a in dataset('MyData')
-for $b in dataset('MyData')
-where spatial-intersect($a.nested.point, $b.nested.point)
-return {"a": $a, "b": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/disjunction-to-join.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/disjunction-to-join.aql
deleted file mode 100644
index 707ba4d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/disjunction-to-join.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Disjunctive predicate should be transformed into collection scan.
- *                  Secondary index should be used to probe the values retrieved from collection.
- * Success        : Yes
- */
- 
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type NestedTestType as open {
-};
-
-create type TestType as open {
-  "id" : string,
-  "no-idx" : string,
-  "nested" : NestedTestType
-};
-
-
-create dataset TestSet(TestType) primary key "id";
-create index TestSetIndex on TestSet(nested.idx: string?) enforced;
-
-for $x in dataset TestSet 
-where $x.nested.idx = "one" or $x.nested.idx = "two"
-return $x
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.aql
deleted file mode 100644
index 20d8a7c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.aql
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as open {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-        message-text: string,
-    countA: int32
-}
-
-create type TweetMessageType as open {
-    nested:  TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index msgCountBIx on TweetMessages(nested.countB: int32?) type btree enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm";
-
-for $t1 in dataset('TweetMessages')
-where $t1.nested.tweetid < int64("10")
-order by $t1.nested.tweetid
-return {
-"tweetid1": $t1.nested.tweetid,
-"count1":$t1.nested.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-          where $t1.nested.countA /* +indexnl */= $t2.nested.countB
-          order by $t2.nested.tweetid
-          return {"tweetid2": $t2.nested.tweetid,
-                  "count2":$t2.nested.countB}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.aql
deleted file mode 100644
index 84d653f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.aql
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as open {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-        message-text: string
-}
-
-create type TweetMessageType as open {
-    nested:  TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index msgCountAIx on TweetMessages(nested.countA: int32?) type btree enforced;
-create index msgCountBIx on TweetMessages(nested.countB: int32?) type btree enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm";
-
-for $t1 in dataset('TweetMessages')
-where $t1.nested.tweetid < int64("10")
-order by $t1.nested.tweetid
-return {
-"tweetid1": $t1.nested.tweetid,
-"count1":$t1.nested.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-          where $t1.nested.countA /* +indexnl */= $t2.nested.countB
-          order by $t2.nested.tweetid
-          return {"tweetid2": $t2.nested.tweetid,
-                  "count2":$t2.nested.countB}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.aql
deleted file mode 100644
index 8cc857b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.aql
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as open {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-        message-text: string,
-    countA: int32
-}
-
-create type TweetMessageType as open {
-    nested: TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index msgCountBIx on TweetMessages(nested.countB: int32?) type btree enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm";
-
-for $t1 in dataset('TweetMessages')
-where $t1.nested.tweetid < int64("10")
-order by $t1.nested.tweetid
-return {
-"tweetid1": $t1.nested.tweetid,
-"count1":$t1.nested.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-                        where $t1.nested.countA /* +indexnl */= $t2.nested.countB and
-                        $t1.nested.tweetid != $t2.nested.tweetid
-                        order by $t2.nested.tweetid
-                        return {"tweetid2": $t2.nested.tweetid,
-                                       "count2":$t2.nested.countB}
-};
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.aql
deleted file mode 100644
index 7b7cb85..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.aql
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as open {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-        message-text: string
-}
-
-create type TweetMessageType as open {
-    nested: TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index msgCountAIx on TweetMessages(nested.countA: int32?) type btree enforced;
-create index msgCountBIx on TweetMessages(nested.countB: int32?) type btree enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm";
-
-for $t1 in dataset('TweetMessages')
-where $t1.nested.tweetid < int64("10")
-order by $t1.nested.tweetid
-return {
-"tweetid1": $t1.nested.tweetid,
-"count1":$t1.nested.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-                        where $t1.nested.countA /* +indexnl */= $t2.nested.countB and
-                        $t1.nested.tweetid != $t2.nested.tweetid
-                        order by $t2.nested.tweetid
-                        return {"tweetid2": $t2.nested.tweetid,
-                                       "count2":$t2.nested.countB}
-};
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-join_01.aql
deleted file mode 100644
index 6792ae4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-join_01.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    id : int32
-}
-
-create type NameType as open {
-    nested : Nametmp
-}
-
-create dataset Names(NameType) primary key nested.id;
-create index Name_idx on Names(nested.fname: string?,lnested.name: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_01.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/> $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/> $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-join_02.aql
deleted file mode 100644
index a4a2dbd..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-join_02.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    id : int32
-}
-
-create type NameType as open {
-    nested : Nametmp
-}
-
-create dataset Names(NameType) primary key nested.id;
-create index Name_idx on Names(nested.fname: string?,lnested.name: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_02.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/< $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/< $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-join_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-join_03.aql
deleted file mode 100644
index 6a1e4e9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-join_03.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    id : int32
-}
-
-create type NameType as open {
-    nested : Nametmp
-}
-
-create dataset Names(NameType) primary key nested.id;
-create index Name_idx on Names(nested.fname: string?,lnested.name: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_03.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/= $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/= $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_01.aql
deleted file mode 100644
index c92b4e5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_01.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    id : int32
-}
-
-create type NameType as open {
-    nested : Nametmp
-}
-
-create dataset Names(NameType) primary key nested.id;
-create index Name_idx on Names(nested.fname: string?,lnested.name: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_01.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/< $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/> $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_02.aql
deleted file mode 100644
index 064abc8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_02.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    id : int32
-}
-
-create type NameType as open {
-    nested : Nametmp
-}
-
-create dataset Names(NameType) primary key nested.id;
-create index Name_idx on Names(nested.fname: string?,lnested.name: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_02.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/> $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/< $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_03.aql
deleted file mode 100644
index ec9520c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_03.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    id : int32
-}
-
-create type NameType as open {
-    nested : Nametmp
-}
-
-create dataset Names(NameType) primary key nested.id;
-create index Name_idx on Names(nested.fname: string?,lnested.name: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_03.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/> $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/= $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_04.aql
deleted file mode 100644
index 0370ad9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_04.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    id : int32
-}
-
-create type NameType as open {
-    nested : Nametmp
-}
-
-create dataset Names(NameType) primary key nested.id;
-create index Name_idx on Names(nested.fname: string?,lnested.name: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_04.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/< $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/= $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_05.aql
deleted file mode 100644
index 4911f67..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_05.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    id : int32
-}
-
-create type NameType as open {
-    nested : Nametmp
-}
-
-create dataset Names(NameType) primary key nested.id;
-create index Name_idx on Names(nested.fname: string?,lnested.name: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_05.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/= $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/> $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_06.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_06.aql
deleted file mode 100644
index 67a8e12..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_06.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Nametmp as open {
-    id : int32
-}
-
-create type NameType as open {
-    nested : Nametmp
-}
-
-create dataset Names(NameType) primary key nested.id;
-create index Name_idx on Names(nested.fname: string?,lnested.name: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_06.adm";
-
-for $emp1 in dataset('Names') 
-for $emp2 in dataset('Names') 
-where $emp1.nested.fname /*+ indexnl*/= $emp2.nested.fname and $emp1.nested.lname /*+ indexnl*/< $emp2.nested.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join-multiindex.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join-multiindex.aql
deleted file mode 100644
index 4c2e45c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join-multiindex.aql
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, FacebookUsers and FacebookMessages, based on their user's id.
- *                  We first expect FacebookUsers' primary index to be used
- *                  to satisfy the range condition on it's primary key.
- *                  FacebookMessages has a secondary btree index on author-id-copy, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type EmploymentType as closed {
-  organization-name: string,
-  start-date: date,
-  end-date: date?
-}
-
-create type FacebookUserTypetmp as closed {
-  id: int32,
-  id-copy: int32,
-  alias: string,
-  name: string,
-  user-since: datetime,
-  user-since-copy: datetime,
-  friend-ids: {{ int32 }},
-  employment: [EmploymentType]
-}
-
-create type FacebookMessageTypetmp as open {
-  message-id: int32,
-  message-id-copy: int32,
-  author-id: int32,
-  in-response-to: int32?,
-  sender-location: point?,
-  message: string
-}
-
-create type FacebookUserType as closed {
-  nested : FacebookUserTypetmp
-}
-
-create type FacebookMessageType as closed {
-  nested : FacebookMessageTypetmp
-}
-
-create dataset FacebookUsers(FacebookUserType)
-primary key nested.id;
-
-create dataset FacebookMessages(FacebookMessageType)
-primary key nested.message-id;
-
-create index fbmIdxAutId if not exists on FacebookMessages(nested.author-id-copy: int32?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multiindex.adm";
-
-for $user in dataset('FacebookUsers')
-for $message in dataset('FacebookMessages')
-where $user.nested.id /*+ indexnl */ = $message.nested.author-id-copy
-and $user.nested.id >= 11000 and $user.nested.id <= 12000
-return {
-  "fbu-ID": $user.nested.id,
-  "fbm-auth-ID": $message.nested.author-id,
-  "uname": $user.nested.name,
-  "message": $message.nested.message
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join-multipred.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join-multipred.aql
deleted file mode 100644
index c46530c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join-multipred.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, DBLP and CSX, based on their title.
- *                  DBLP has a secondary btree index on title, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the additional predicates to be put into a select above the
- *                  primary index search.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index title_index on DBLP(nested.title:string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multipred.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where $a.nested.title /*+ indexnl */ = $b.nested.title and $a.nested.authors < $b.nested.authors and $a.nested.misc > $b.nested.misc
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_01.aql
deleted file mode 100644
index 1306f66..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_01.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, DBLP and CSX, based on their title.
- *                  DBLP has a secondary btree index on title, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index title_index on DBLP(nested.title: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where $a.nested.title /*+ indexnl */ = $b.nested.title
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_02.aql
deleted file mode 100644
index bf3fdb3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_02.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, closed DBLP and open CSX, based on their title.
- *                  DBLP has a secondary btree index on title, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index title_index on CSX(nested.title: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where $a.nested.title /*+ indexnl */ = $b.nested.title
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_03.aql
deleted file mode 100644
index 6447343..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_03.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two open datasets, DBLP and CSX, based on their title.
- *                  DBLP has a secondary btree index on title, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index title_index_DBLP on DBLP(nested.title: string?) enforced;
-
-create index title_index_CSX on CSX(nested.title: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_03.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where $a.nested.title /*+ indexnl */ = $b.nested.title
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_04.aql
deleted file mode 100644
index 5b77bb4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_04.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self-joins dataset DBLP, based on it's title.
- *                  DBLP has a secondary btree index on title, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as open {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index title_index on DBLP(nested.title: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_04.adm";
-
-for $a in dataset('DBLP')
-for $a2 in dataset('DBLP')
-where $a.nested.title /*+ indexnl */ = $a2.nested.title
-return {"arec": $a, "arec2": $a2}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_05.aql
deleted file mode 100644
index 83ed7b0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/secondary-equi-join_05.aql
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two open datasets, open DBLP and closed CSX, based on their title.
- *                  DBLP has a secondary btree index on title, and given the 'indexnl' hint
- *                  we *do not* expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index title_index on DBLP(nested.title: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_05.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where $a.nested.title /*+ indexnl */ = $b.nested.title
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-33.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-33.aql
deleted file mode 100644
index a73ec15..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-33.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Please note this is a Negative test and the BTree index should NOT be used in the plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-39.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname: string?,nested.lname: string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Roger"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-34.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-34.aql
deleted file mode 100644
index 351b6f3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-34.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// This is a Negative test - prefix search, BTree index should not be used in the plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-32.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Susan"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-35.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-35.aql
deleted file mode 100644
index d20add6..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-35.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification (usage) test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search, BTree index should not be used.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-33.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname < "Isa"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-36.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-36.aql
deleted file mode 100644
index 447d73a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-36.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search, BTree index should not be used in query plan
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-34.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname <= "Vanpatten"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-37.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-37.aql
deleted file mode 100644
index 9ca4ae4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-37.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - BTree index should NOT be used in query plan
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-35.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname != "Max"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-38.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-38.aql
deleted file mode 100644
index 2ace4f2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-38.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search, BTree index should NOT be used in the query plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-36.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname = "Julio"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-39.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-39.aql
deleted file mode 100644
index a183169..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-39.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// THE BTREE INDEX IN THIS CASE SHOULD NOT BE PICKED UP!!!!
-// Verify that the optimized query plan does not have the BTree search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-37.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.lname = "Kim"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-40.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-40.aql
deleted file mode 100644
index 78e672d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-40.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used in the optimized query plan
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-38.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname = "Young Seok" and $emp.nested.lname = "Kim"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-41.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-41.aql
deleted file mode 100644
index bc4c70e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-41.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-39.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname = "Julio" or $emp.nested.lname = "Malaika"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-42.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-42.aql
deleted file mode 100644
index 47c86fd..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-42.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-40.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Alex" and $emp.nested.lname < "Zach"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-43.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-43.aql
deleted file mode 100644
index 8b0d920..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-43.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-41.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Allan" and $emp.nested.lname < "Zubi"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-44.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-44.aql
deleted file mode 100644
index c5a2ed6..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-44.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-42.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Allan" and $emp.nested.lname = "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-45.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-45.aql
deleted file mode 100644
index 68fe56c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-45.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-// Negative test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-43.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname = "Julio" and $emp.nested.lname < "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-46.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-46.aql
deleted file mode 100644
index bd52b20..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-46.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-44.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Michael" and $emp.nested.lname <= "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-47.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-47.aql
deleted file mode 100644
index d611ab5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-47.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-45.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Craig" and $emp.nested.lname > "Kevin" and $emp.nested.fname < "Mary" and $emp.nested.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-48.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-48.aql
deleted file mode 100644
index 2e95662..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-48.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-46.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Craig" and $emp.nested.lname >= "Kevin" and $emp.nested.fname <= "Mary" and $emp.nested.lname <= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-49.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-49.aql
deleted file mode 100644
index 49ebe6e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-49.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-47.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname <= "Craig" and $emp.nested.lname > "Kevin"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-50.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-50.aql
deleted file mode 100644
index 0aa3e55..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-50.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-48.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname != "Michael" and $emp.nested.lname != "Carey"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-51.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-51.aql
deleted file mode 100644
index 1beb7a1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-51.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-49.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Craig" and $emp.nested.lname > "Kevin" and $emp.nested.fname <= "Mary" and $emp.nested.lname <= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-52.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-52.aql
deleted file mode 100644
index a923d50..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-52.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-50.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Craig" and $emp.nested.lname >= "Kevin" and $emp.nested.fname < "Mary" and $emp.nested.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-53.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-53.aql
deleted file mode 100644
index d688ca0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-53.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-51.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname:string?,nested.lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Craig" and $emp.nested.lname <= "Kevin" and $emp.nested.fname <= "Mary" and $emp.nested.lname >= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-54.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-54.aql
deleted file mode 100644
index ec20642..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-54.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-52.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname: string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Max"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-55.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-55.aql
deleted file mode 100644
index f06f66b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-55.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-53.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname: string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Sofia"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-56.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-56.aql
deleted file mode 100644
index 7767eae..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-56.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-54.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname: string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname < "Chen"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-57.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-57.aql
deleted file mode 100644
index ad37e48..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-57.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-55.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname: string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname <= "Julio"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-58.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-58.aql
deleted file mode 100644
index 54d5620..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-58.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-56.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname: string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Neil" and $emp.nested.fname < "Roger"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-59.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-59.aql
deleted file mode 100644
index 31de2dc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-59.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname: string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname >= "Max" and $emp.nested.fname <= "Roger"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-60.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-60.aql
deleted file mode 100644
index 90ac78d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-60.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-58.adm";
-
-create type TestTypetmp as open {
-    id : int32,
-    lname : string
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname: string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname = "Max"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-61.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-61.aql
deleted file mode 100644
index 468ff65..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-61.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 13th Aug 2012
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-59.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname: string?,nested.lname: string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.nested.fname > "Craig" and $emp.nested.lname > "Kevin" and $emp.nested.fname <= "Mary" and $emp.nested.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-62.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-62.aql
deleted file mode 100644
index 9d4747a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-62.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 11th Nov 2014
- */
-
-// Positive test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-62.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname: string?,nested.lname: string?) enforced;
-
-for $emp in dataset('testdst') 
-where $emp.nested.fname = "Julio" and $emp.nested.lname > "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-63.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-63.aql
deleted file mode 100644
index 3d7f09d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index/btree-secondary-63.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 11th Nov 2014
- */
-
-// Positive test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-63.adm";
-
-create type TestTypetmp as open {
-    id : int32
-}
-
-create type TestType as open {
-    nested : TestTypetmp
-}
-
-create dataset testdst(TestType) primary key nested.id;
-
-create index sec_Idx on testdst(nested.fname: string?,nested.lname: string?) enforced;
-
-for $emp in dataset('testdst') 
-where $emp.nested.fname < "Julio" and $emp.nested.lname = "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-contains-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-contains-panic.aql
deleted file mode 100644
index 5deef93..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-contains-panic.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the contains function.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains-panic.adm";
-
-// Cannot optimize this query because the string constant is shorter than the gram length.
-for $o in dataset('DBLP')
-where contains($o.nested.title, "Mu")
-order by $o.nested.id
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-contains.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-contains.aql
deleted file mode 100644
index 91dea54..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-contains.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the contains function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm";
-
-for $o in dataset('DBLP')
-where contains($o.nested.title, "Multimedia")
-order by $o.nested.id
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.aql
deleted file mode 100644
index a777e3b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on strings.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check-panic.adm";
-
-// This query cannot be optimized with an index, based on the high edit distance.
-for $o in dataset('DBLP')
-let $ed := edit-distance-check($o.nested.authors, "Amihay Motro", 5)
-where $ed[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-edit-distance-check.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-edit-distance-check.aql
deleted file mode 100644
index 601b5d4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-edit-distance-check.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on strings.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check.adm";
-
-for $o in dataset('DBLP')
-where edit-distance-check($o.nested.authors, "Amihay Motro", 1)[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.aql
deleted file mode 100644
index 7955abb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance function on strings.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-panic.adm";
-
-// This query cannot be optimized with an index, based on the high edit distance.
-for $o in dataset('DBLP')
-where edit-distance($o.nested.authors, "Amihay Motro") <= 5
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-edit-distance.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-edit-distance.aql
deleted file mode 100644
index 98aca8b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-edit-distance.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance function on strings.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance.adm";
-
-for $o in dataset('DBLP')
-where edit-distance($o.nested.authors, "Amihay Motro") <= 1
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.aql
deleted file mode 100644
index c73d0cf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query with ~= using edit-distance on strings.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-edit-distance.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '1';
-
-for $o in dataset('DBLP')
-where $o.nested.authors ~= "Amihay Motro"
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.aql
deleted file mode 100644
index 02740e0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query with ~= using Jaccard on 3-gram tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-jaccard.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.8f';
-
-for $o in dataset('DBLP')
-where gram-tokens($o.nested.title, 3, false) ~= gram-tokens("Transactions for Cooperative Environments", 3, false)
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-jaccard-check.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-jaccard-check.aql
deleted file mode 100644
index 36a1ecf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-jaccard-check.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the similarity-jaccard-check function on 3-gram tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard-check.adm";
-
-for $o in dataset('DBLP')
-where similarity-jaccard-check(gram-tokens($o.nested.title, 3, false), gram-tokens("Transactions for Cooperative Environments", 3, false), 0.5f)[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-jaccard.aql
deleted file mode 100644
index 5c3ec7e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/ngram-jaccard.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the similarity-jaccard function on 3-gram tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard.adm";
-
-for $o in dataset('DBLP')
-where similarity-jaccard(gram-tokens($o.nested.title, 3, false), gram-tokens("Transactions for Cooperative Environments", 3, false)) >= 0.5f
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/word-contains.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/word-contains.aql
deleted file mode 100644
index 229ee52..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/word-contains.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the contains function.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_word-contains.adm";
-
-// Contains cannot be answered with a word inverted index.
-for $o in dataset('DBLP')
-where contains($o.nested.title, "Multimedia")
-order by $o.nested.id
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.aql
deleted file mode 100644
index 3dd9b51..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword is applied to optimize a selection query with ~= using Jaccard on word tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_word-fuzzyeq-jaccard.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $o in dataset('DBLP')
-where word-tokens($o.nested.title) ~= word-tokens("Transactions for Cooperative Environments")
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/word-jaccard-check.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/word-jaccard-check.aql
deleted file mode 100644
index f5d9a78..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/word-jaccard-check.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard-check function on word tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard-check.adm";
-
-for $o in dataset('DBLP')
-where similarity-jaccard-check(word-tokens($o.nested.title), word-tokens("Transactions for Cooperative Environments"), 0.5f)[0]
-return $o
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/word-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/word-jaccard.aql
deleted file mode 100644
index fafbf71..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-basic/word-jaccard.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard function on word tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm";
-
-for $o in dataset('DBLP')
-where similarity-jaccard(word-tokens($o.nested.title), word-tokens("Transactions for Cooperative Environments")) >= 0.5f
-return $o
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.aql
deleted file mode 100644
index 71381ee..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using
- *                  two edit-distance-check function of which only the first can be optimized with an index.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
-
-// Only the first edit-distance-check can be optimized with an index.
-for $o in dataset('DBLP')
-let $eda := edit-distance-check($o.nested.authors, "Amihay Motro", 3)
-let $edb := edit-distance-check($o.nested.authors, "Amihay Motro", 5)
-where $eda[0] and $edb[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.aql
deleted file mode 100644
index cf14fd7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using
- *                  two edit-distance-check function of which only the second can be optimized with an index.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
-
-// Only the second edit-distance-check can be optimized with an index.
-for $o in dataset('DBLP')
-let $edb := edit-distance-check($o.nested.authors, "Amihay Motro", 5)
-let $eda := edit-distance-check($o.nested.authors, "Amihay Motro", 3)
-where $edb[0] and $eda[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.aql
deleted file mode 100644
index d34e8b4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on strings.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic.adm";
-
-// This query cannot be optimized with an index, based on the high edit distance.
-for $o in dataset('DBLP')
-let $ed := edit-distance-check($o.nested.authors, "Amihay Motro", 5)
-where $ed[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.aql
deleted file mode 100644
index b54f365..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on strings.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let.adm";
-
-for $o in dataset('DBLP')
-let $ed := edit-distance-check($o.nested.authors, "Amihay Motro", 1)
-where $ed[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.aql
deleted file mode 100644
index 7fd8079..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index index is applied to optimize a selection query using the similarity-edit-distance-check function on the substring of the field.
- *                  Tests that the optimizer rule correctly drills through the substring function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPNestedType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested: DBLPNestedType
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-substring.adm";
-
-for $paper in dataset('DBLP')
-where edit-distance-check(substring($paper.nested.title, 0, 8), "datbase", 1)[0]
-return {
-  "id" : $paper.nested.id,
-  "title" : $paper.nested.title
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql
deleted file mode 100644
index f839c2e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index index is applied to optimize a selection query using the similarity-edit-distance-check function on individual word tokens.
- *                  Tests that the optimizer rule correctly drills through the word-tokens function and existential query.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPNestedType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested: DBLPNestedType
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-word-tokens.adm";
-
-for $paper in dataset('DBLP')
-for $word in word-tokens($paper.nested.title)
-where edit-distance-check($word, "Multmedia", 1)[0]
-distinct by $paper.nested.id
-return {
-  "id" : $paper.nested.id,
-  "title" : $paper.nested.title
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.aql
deleted file mode 100644
index 8c70a1c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the similarity-jaccard-check function on 3-gram tokens.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-let.adm";
-
-for $o in dataset('DBLP')
-let $jacc := similarity-jaccard-check(gram-tokens($o.nested.title, 3, false), gram-tokens("Transactions for Cooperative Environments", 3, false), 0.5f)
-where $jacc[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.aql
deleted file mode 100644
index cfa6247..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.aql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the similarity-jaccard-check function on 3-gram tokens.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-multi-let.adm";
-
-// This test is complex because we have three assigns to drill into.
-for $paper in dataset('DBLP')
-let $paper_tokens := gram-tokens($paper.nested.title, 3, false)
-let $query_tokens := gram-tokens("Transactions for Cooperative Environments", 3, false)
-let $jacc := similarity-jaccard-check($paper_tokens, $query_tokens, 0.5f)
-where $jacc[0]
-return {"Paper": $paper_tokens, "Query": $query_tokens }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/word-jaccard-check-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/word-jaccard-check-let.aql
deleted file mode 100644
index 82b1cd5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/word-jaccard-check-let.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard-check function on word tokens.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-let.adm";
-
-for $o in dataset('DBLP')
-let $jacc := similarity-jaccard-check(word-tokens($o.nested.title), word-tokens("Transactions for Cooperative Environments"), 0.5f)
-where $jacc[0]
-return $o
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.aql
deleted file mode 100644
index 26b42ed..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard-check function on word tokens.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-multi-let.adm";
-
-// This test is complex because we have three assigns to drill into.
-for $paper in dataset('DBLP')
-let $paper_tokens := word-tokens($paper.nested.title)
-let $query_tokens := word-tokens("Transactions for Cooperative Environments")
-let $jacc := similarity-jaccard-check($paper_tokens, $query_tokens, 0.8f)
-where $jacc[0]
-return {"Paper": $paper_tokens, "Query": $query_tokens }
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.aql 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.aql
deleted file mode 100644
index d24c284..0000000
--- 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.aql
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as open {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    countA: int32,
-    countB: int32
-}
-
-create type TweetMessageType as open {
-    nested: TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index msgNgramIx on TweetMessages(nested.message-text: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm";
-
-for $t1 in dataset('TweetMessages')
-where $t1.nested.tweetid > int64("240")
-order by $t1.nested.tweetid
-return {
-    "tweet": {"id": $t1.nested.tweetid, "topics" : $t1.nested.message-text} ,
-    "similar-tweets": for $t2 in dataset('TweetMessages')
-                      let $sim := edit-distance-check($t1.nested.message-text, $t2.nested.message-text, 7)
-              where $sim[0] and
-                      $t2.nested.tweetid != $t1.nested.tweetid
-                      order by $t2.nested.tweetid
-                      return {"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/ngram-contains_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-contains_01.aql
deleted file mode 100644
index 38bbdb3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-contains_01.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a join query using the contains function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-01.adm";
-
-for $o2 in dataset('CSX')
-for $o1 in dataset('DBLP')
-where contains($o1.title, $o2.title) and $o1.id < $o2.id
-order by $o1.id, $o2.id
-return {"title1":$o1.title, "title2":$o2.title}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-contains_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-contains_02.aql
deleted file mode 100644
index 577d415..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-contains_02.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a join query using the contains function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on CSX(title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-02.adm";
-
-for $o2 in dataset('DBLP')
-for $o1 in dataset('CSX')
-where contains($o1.title, $o2.title) and $o1.id < $o2.id
-order by $o1.id, $o2.id
-return {"title1":$o1.title, "title2":$o2.title}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-contains_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-contains_03.aql
deleted file mode 100644
index 5721955..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-contains_03.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a join query using the contains function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-03.adm";
-
-for $o1 in dataset('DBLP')
-for $o2 in dataset('DBLP')
-where contains($o1.title, $o2.title) and $o1.id < $o2.id
-order by $o1.id, $o2.id
-return {"title1":$o1.title, "title2":$o2.title}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-contains_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-contains_04.aql
deleted file mode 100644
index b4daaa8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-contains_04.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a join query using the contains function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index_DBLP on DBLP(title: string?) type ngram(3) enforced;
-
-create index ngram_index_CSX on CSX(title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-04.adm";
-
-for $o1 in dataset('DBLP')
-for $o2 in dataset('CSX')
-where contains($o1.title, $o2.title) and $o1.id < $o2.id
-order by $o1.id, $o2.id
-return {"title1":$o1.title, "title2":$o2.title}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.aql
deleted file mode 100644
index f7a6eb5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.aql
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance-check function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where edit-distance-check($a.nested.authors, $b.nested.authors, 3)[0] and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.aql
deleted file mode 100644
index 5fc32d5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.aql
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance-check function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on CSX(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
-
-for $b in dataset('DBLP')
-for $a in dataset('CSX')
-where edit-distance-check($a.nested.authors, $b.nested.authors, 3)[0] and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.aql
deleted file mode 100644
index 9758b48..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self joins dataset DBLP, based on the edit-distance-check function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where edit-distance-check($a.nested.authors, $b.nested.authors, 3)[0] and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.aql
deleted file mode 100644
index 3291f52..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance-check function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index_DBLP on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-create index ngram_index_CSX on CSX(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where edit-distance-check($a.nested.authors, $b.nested.authors, 3)[0] and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.aql
deleted file mode 100644
index e1eb262..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance-check function of their authors.
- *                  DBLP has a 3-gram index on authors, and we *do not* expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where edit-distance-check($a.nested.authors, $b.nested.authors, 3)[0] and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-contains.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-contains.aql
deleted file mode 100644
index 2d3f392..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-contains.aql
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance-contains function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-contains.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where edit-distance-contains($a.nested.authors, $b.nested.authors, 3)[0] and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-inline.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-inline.aql
deleted file mode 100644
index b7ffdd4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance-inline.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the edit-distance function of its authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-edit-distance-inline.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-let $ed := edit-distance($a.nested.authors, $b.nested.authors)
-where $ed < 3 and $a.nested.id < $b.nested.id
-return {"aauthors": $a.nested.authors, "bauthors": $b.nested.authors, "ed": $ed}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_01.aql
deleted file mode 100644
index b6546e7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_01.aql
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where edit-distance($a.nested.authors, $b.nested.authors) < 3 and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_02.aql
deleted file mode 100644
index 4d1010a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_02.aql
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on CSX(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
-
-for $b in dataset('DBLP')
-for $a in dataset('CSX')
-where edit-distance($a.nested.authors, $b.nested.authors) < 3 and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_03.aql
deleted file mode 100644
index eb55bb1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_03.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self joins dataset DBLP, based on the edit-distance function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where edit-distance($a.nested.authors, $b.nested.authors) < 3 and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_04.aql
deleted file mode 100644
index e546740..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_04.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index_DBLP on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-create index ngram_index_CSX on CSX(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where edit-distance($a.nested.authors, $b.nested.authors) < 3 and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_05.aql
deleted file mode 100644
index 5e2f4c0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-edit-distance_05.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance function of their authors.
- *                  DBLP has a 3-gram index on authors, and we *do not* expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where edit-distance($a.nested.authors, $b.nested.authors) < 3 and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.aql
deleted file mode 100644
index 081f022..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using edit distance of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '3';
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where $a.nested.authors ~= $b.nested.authors and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.aql
deleted file mode 100644
index 2ba5e18..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using edit distance of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on CSX(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '3';
-
-for $b in dataset('DBLP')
-for $a in dataset('CSX')
-where $a.nested.authors ~= $b.nested.authors and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.aql
deleted file mode 100644
index cd29e65..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self joins dataset DBLP, based on ~= using edit distance of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '3';
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where $a.nested.authors ~= $b.nested.authors and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.aql
deleted file mode 100644
index 830fb8e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using edit distance of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index_DBLP on DBLP(nested.authors: string?) type ngram(3) enforced;
-
-create index ngram_index_CSX on CSX(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '3';
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where $a.nested.authors ~= $b.nested.authors and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.aql
deleted file mode 100644
index 8fb8287..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using edit distance of their authors.
- *                  DBLP has a 3-gram index on authors, and we *do not* expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on CSX(nested.authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '3';
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where $a.nested.authors ~= $b.nested.authors and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.aql
deleted file mode 100644
index 24dab1c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where gram-tokens($a.nested.title, 3, false) ~= gram-tokens($b.nested.title, 3, false) and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.aql
deleted file mode 100644
index 2f7c560..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on CSX(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $b in dataset('DBLP')
-for $a in dataset('CSX')
-where gram-tokens($a.nested.title, 3, false) ~= gram-tokens($b.nested.title, 3, false) and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.aql
deleted file mode 100644
index 5e12569..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self joins dataset DBLP, based on ~= using Jaccard of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where gram-tokens($a.nested.title, 3, false) ~= gram-tokens($b.nested.title, 3, false) and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.aql
deleted file mode 100644
index cc2f6cc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.aql
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index_DBLP on DBLP(nested.title: string?) type ngram(3) enforced;
-
-create index ngram_index_CSX on CSX(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where gram-tokens($a.nested.title, 3, false) ~= gram-tokens($b.nested.title, 3, false) and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-check_01.aql
deleted file mode 100644
index da4d914..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-check_01.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard-check function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard-check(gram-tokens($a.nested.title, 3, false), gram-tokens($b.nested.title, 3, false), 0.5f)[0]
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-check_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-check_02.aql
deleted file mode 100644
index 5576768..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-check_02.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard-check function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on CSX(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm";
-
-for $b in dataset('DBLP')
-for $a in dataset('CSX')
-where similarity-jaccard-check(gram-tokens($a.nested.title, 3, false), gram-tokens($b.nested.title, 3, false), 0.5f)[0]
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-check_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-check_03.aql
deleted file mode 100644
index 32829fb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-check_03.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self joins dataset DBLP, based on the similarity-jaccard-check function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where similarity-jaccard-check(gram-tokens($a.nested.title, 3, false), gram-tokens($b.nested.title, 3, false), 0.5f)[0]
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-check_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-check_04.aql
deleted file mode 100644
index dc4c210..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-check_04.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard-check function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index_DBLP on DBLP(nested.title: string?) type ngram(3) enforced;
-
-create index ngram_index_CSX on CSX(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where similarity-jaccard-check(gram-tokens($a.nested.title, 3, false), gram-tokens($b.nested.title, 3, false), 0.5f)[0]
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-inline.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-inline.aql
deleted file mode 100644
index bd599b4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard-inline.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the similarity-jaccard function of its titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-jaccard-inline.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-let $jacc := similarity-jaccard(gram-tokens($a.nested.title, 3, false), gram-tokens($b.nested.title, 3, false))
-where $jacc >= 0.5f and $a.nested.id < $b.nested.id
-return {"atitle": $a.nested.title, "btitle": $b.nested.title, "jacc": $jacc}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard_01.aql
deleted file mode 100644
index 0106176..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard_01.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard(gram-tokens($a.nested.title, 3, false), gram-tokens($b.nested.title, 3, false)) >= 0.5f
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard_02.aql
deleted file mode 100644
index e9f491b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard_02.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index on CSX(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm";
-
-for $b in dataset('DBLP')
-for $a in dataset('CSX')
-where similarity-jaccard(gram-tokens($a.nested.title, 3, false), gram-tokens($b.nested.title, 3, false)) >= 0.5f
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard_03.aql
deleted file mode 100644
index e064c03..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard_03.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self joins dataset DBLP, based on the similarity-jaccard function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index ngram_index on DBLP(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where similarity-jaccard(gram-tokens($a.nested.title, 3, false), gram-tokens($b.nested.title, 3, false)) >= 0.5f
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard_04.aql
deleted file mode 100644
index b08eabf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/ngram-jaccard_04.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index ngram_index_DBLP on DBLP(nested.title: string?) type ngram(3) enforced;
-
-create index ngram_index_CSX on CSX(nested.title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where similarity-jaccard(gram-tokens($a.nested.title, 3, false), gram-tokens($b.nested.title, 3, false)) >= 0.5f
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.aql
deleted file mode 100644
index 287b338..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where word-tokens($a.nested.title) ~= word-tokens($b.nested.title) and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.aql
deleted file mode 100644
index e19b4af..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index keyword_index on CSX(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $b in dataset('DBLP')
-for $a in dataset('CSX')
-where word-tokens($a.nested.title) ~= word-tokens($b.nested.title) and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.aql
deleted file mode 100644
index 5fd64c9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self joins dataset DBLP, based on ~= using Jaccard of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where word-tokens($a.nested.title) ~= word-tokens($b.nested.title) and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.aql
deleted file mode 100644
index cad00d1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index keyword_index_DBLP on DBLP(nested.title: string?) type keyword enforced;
-
-create index keyword_index_CSX on CSX(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where word-tokens($a.nested.title) ~= word-tokens($b.nested.title) and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.aql
deleted file mode 100644
index 9ef8bb2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, TweetMessages, based on the similarity-jaccard-check function of its text-messages' word tokens.
- *                  TweetMessages has a keyword index on text-message and btree index on the primary key tweetid, and we expect the join to be
- *                    transformed into btree and inverted indexed nested-loop joins. We test whether the join condition can be transformed into
- *                    multiple indexed nested loop joins of various type of indexes.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as open {
-    tweetid: int64,
-    user: TwitterUserType,
-    sender-location: point,
-    send-time: datetime,
-    referred-topics: {{ string }},
-    countA: int32,
-    countB: int32
-}
-
-create type TweetMessageType as closed {
-    nested:  TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index twmSndLocIx on TweetMessages(nested.sender-location) type rtree;
-create index msgCountAIx on TweetMessages(nested.countA) type btree;
-create index msgCountBIx on TweetMessages(nested.countB) type btree;
-create index msgTextIx on TweetMessages(nested.message-text: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check-after-btree-access.adm";
-
-for $t1 in dataset('TweetMessages')
-for $t2 in dataset('TweetMessages')
-let $sim := similarity-jaccard-check(word-tokens($t1.nested.message-text), word-tokens($t2.nested.message-text), 0.6f)
-where $sim[0] and $t1.nested.tweetid < int64("20") and $t2.nested.tweetid != $t1.nested.tweetid
-return {
-    "t1": $t1.nested.tweetid,
-    "t2": $t2.nested.tweetid,
-    "sim": $sim[1]
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check_01.aql
deleted file mode 100644
index 682a754..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check_01.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard-check function of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard-check(word-tokens($a.nested.title), word-tokens($b.nested.title), 0.5f)[0]
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check_02.aql
deleted file mode 100644
index 583dda6..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check_02.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard-check function of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index keyword_index on CSX(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
-
-for $b in dataset('DBLP')
-for $a in dataset('CSX')
-where similarity-jaccard-check(word-tokens($a.nested.title), word-tokens($b.nested.title), 0.5f)[0]
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check_03.aql
deleted file mode 100644
index 2cff649..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check_03.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Selg joins dataset DBLP, based on the similarity-jaccard-check function of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index_DBLP on DBLP(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where similarity-jaccard-check(word-tokens($a.nested.title), word-tokens($b.nested.title), 0.5f)[0]
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check_04.aql
deleted file mode 100644
index fe7b2f9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-check_04.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard-check function of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title: string?) type keyword enforced;
-
-create index keyword_index on CSX(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where similarity-jaccard-check(word-tokens($a.nested.title), word-tokens($b.nested.title), 0.5f)[0]
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-inline.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-inline.aql
deleted file mode 100644
index 2ec1846..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard-inline.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the similarity-jaccard function of its titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- *                  We expect the top-level equi join introduced because of surrogate optimization to be removed, since it is not necessary.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_word-jaccard-inline.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-let $jacc := similarity-jaccard(word-tokens($a.nested.title), word-tokens($b.nested.title))
-where $jacc >= 0.5f and $a.nested.id < $b.nested.id
-return {"atitle": $a.nested.title, "btitle": $b.nested.title, "jacc": $jacc}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard_01.aql
deleted file mode 100644
index c255829..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard_01.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard(word-tokens($a.nested.title), word-tokens($b.nested.title)) >= 0.5f
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard_02.aql
deleted file mode 100644
index 2d52ae9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard_02.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index keyword_index on CSX(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
-
-for $b in dataset('DBLP')
-for $a in dataset('CSX')
-where similarity-jaccard(word-tokens($a.nested.title), word-tokens($b.nested.title)) >= 0.5f
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard_03.aql
deleted file mode 100644
index 456ad8c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard_03.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self joins dataset DBLP, based on the similarity-jaccard function of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where similarity-jaccard(word-tokens($a.nested.title), word-tokens($b.nested.title)) >= 0.5f
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard_04.aql
deleted file mode 100644
index 8812d81..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/inverted-index-join/word-jaccard_04.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' word tokens.
- *                  DBLP has a keyword index on title, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPTypetmp as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXTypetmp as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create type DBLPType as closed {
-  nested : DBLPTypetmp
-}
-
-create type CSXType as closed {
-  nested : CSXTypetmp
-}
-
-create dataset DBLP(DBLPType) primary key nested.id;
-
-create dataset CSX(CSXType) primary key nested.id;
-
-create index keyword_index on DBLP(nested.title: string?) type keyword enforced;
-
-create index keyword_index on CSX(nested.title: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where similarity-jaccard(word-tokens($a.nested.title), word-tokens($b.nested.title)) >= 0.5f
-      and $a.nested.id < $b.nested.id
-return {"arec": $a, "brec": $b }
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql
deleted file mode 100644
index 8fa81da..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as open {
-    tweetid: int64,
-        user: TwitterUserType,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create type TweetMessageType as open {
-    nested: TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index twmSndLocIx on TweetMessages(nested.sender-location: point?) type rtree enforced;
-create index msgCountAIx on TweetMessages(nested.countA) type btree;
-create index msgCountBIx on TweetMessages(nested.countB) type btree;
-create index msgTextIx on TweetMessages(nested.message-text) type keyword;
-
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_01.adm";
-
-for $t1 in dataset('TweetMessages')
-let $n :=  create-circle($t1.nested.sender-location, 0.5)
-where $t1.nested.tweetid < int64("10")
-order by $t1.nested.tweetid
-return {
-"tweetid1": $t1.nested.tweetid,
-"loc1":$t1.nested.sender-location,
-"nearby-message": for $t2 in dataset('TweetMessages')
-                             where spatial-intersect($t2.nested.sender-location, $n)
-                             order by $t2.tweetid
-                             return {"tweetid2":$t2.nested.tweetid, "loc2":$t2.nested.sender-location}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.aql
deleted file mode 100644
index 8499c9a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.aql
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageNestedType as open {
-    tweetid: int64,
-        user: TwitterUserType,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create type TweetMessageType as open {
-    nested: TweetMessageNestedType
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key nested.tweetid;
-
-create index twmSndLocIx on TweetMessages(nested.sender-location: point?) type rtree enforced;
-create index msgCountAIx on TweetMessages(nested.countA) type btree;
-create index msgCountBIx on TweetMessages(nested.countB) type btree;
-create index msgTextIx on TweetMessages(nested.message-text) type keyword;
-
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_02.adm";
-
-for $t1 in dataset('TweetMessages')
-let $n :=  create-circle($t1.nested.sender-location, 0.5)
-where $t1.nested.tweetid < int64("10")
-order by $t1.nested.tweetid
-return {
-"tweetid1": $t1.nested.tweetid,
-"loc1":$t1.nested.sender-location,
-"nearby-message": for $t2 in dataset('TweetMessages')
-                             where spatial-intersect($t2.nested.sender-location, $n) and $t1.nested.tweetid != $t2.nested.tweetid
-                             order by $t2.nested.tweetid
-                             return {"tweetid2":$t2.nested.tweetid, "loc2":$t2.nested.sender-location}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_01.aql
deleted file mode 100644
index 1812b3b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_01.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Joins two datasets on the intersection of their point attributes.
- *                  The dataset 'MyData1' has an enforced open RTree index?, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create type MyRecordNested as closed {
-  nested: MyRecord
-}
-
-create dataset MyData1(MyRecordNested) primary key nested.id;
-create dataset MyData2(MyRecord) primary key id;
-
-create index rtree_index on MyData1(nested.point) type rtree;
-
-write output to asterix_nc1:"rttest/index-join_rtree-spatial-intersect-point.adm";
-
-for $b in dataset('MyData2')
-for $a in dataset('MyData1')
-where spatial-intersect($a.nested.point, $b.point)
-return {"a": $a, "b": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_02.aql
deleted file mode 100644
index bed6626..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_02.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Joins two datasets on the intersection of their point attributes.
- *                  The dataset 'MyData2' has an enforced open RTree index?, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create type MyRecordNested as closed {
-  nested: MyRecord
-}
-
-create dataset MyData1(MyRecordNested) primary key nested.id;
-create dataset MyData2(MyRecord) primary key id;
-
-create index rtree_index on MyData2(point) type rtree;
-
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
-
-for $a in dataset('MyData1')
-for $b in dataset('MyData2')
-where spatial-intersect($a.nested.point, $b.point)
-return {"a": $a, "b": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_03.aql
deleted file mode 100644
index e991ee8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_03.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self-joins a dataset on the intersection of its point attribute.
- *                  The dataset has an enforced open RTree index?, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create type MyRecordNested as closed {
-  nested: MyRecord
-}
-create dataset MyData(MyRecordNested) primary key nested.id;
-
-create index rtree_index on MyData(nested.point) type rtree;
-
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_03.adm";
-
-for $a in dataset('MyData')
-for $b in dataset('MyData')
-where spatial-intersect($a.nested.point, $b.nested.point)
-return {"a": $a, "b": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_04.aql
deleted file mode 100644
index 06a30b4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_04.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Joins two datasets on the intersection of their point attributes.
- *                  Both datasets 'MyData' and 'MyData2' have an enforced open RTree index?, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecordNestedOpen as open {
-  id: int32,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create type MyRecordOpen as closed {
-  nested: MyRecordNestedOpen
-}
-
-create dataset MyData1(MyRecordOpen) primary key nested.id;
-create dataset MyData2(MyRecordOpen) primary key nested.id;
-
-create index rtree_index on MyData1(nested.point:point?) type rtree enforced;
-
-create index rtree_index2 on MyData2(nested.point:point?) type rtree enforced;
-
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
-
-for $a in dataset('MyData1')
-for $b in dataset('MyData2')
-where spatial-intersect($a.nested.point, $b.nested.point)
-return {"a": $a, "b": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_05.aql
deleted file mode 100644
index 22a3905..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/rtree-index-join/spatial-intersect-point_05.aql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Joins two datasets on the intersection of their point attributes.
- *                  Only dataset 'MyData1' has an enforced open RTree index?, hence we
- *                  *do not* expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecordNestedOpen as open {
-  id: int32,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create type MyRecordOpen as closed {
-  nested: MyRecordNestedOpen
-}
-
-create dataset MyData1(MyRecordOpen) primary key nested.id;
-create dataset MyData2(MyRecordOpen) primary key nested.id;
-
-create index rtree_index on MyData1(nested.point:point?) type rtree enforced;
-
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
-
-for $a in dataset('MyData1')
-for $b in dataset('MyData2')
-where spatial-intersect($a.nested.point, $b.nested.point)
-return {"a": $a, "b": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested_loj3.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested_loj3.aql
deleted file mode 100644
index 4022e84..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested_loj3.aql
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse tpch if exists;
-create dataverse tpch;
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-create type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-create type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-
-create type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-create dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-create dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/nested_loj.adm";
-
-for $c in dataset('Customers')
-let $orders := 
-  for $o in dataset('Orders')
-  where $o.o_custkey = $c.c_custkey
-  let $items := 
-    for $l in dataset('LineItems')
-    where $l.l_orderkey = $o.o_orderkey
-    let $partsupp := 
-      for $ps in dataset('PartSupp')
-      where $ps.ps_partkey = $l.l_partkey and $ps.ps_suppkey = $l.l_suppkey
-      return $ps     
-    return {
-        "item": $l,
-        "part_supplier": $partsupp
-    }    
-  return {
-     "order": $o,
-     "items": $items
-  }  
-return {
-  "cust": $c,
-  "orders": $orders
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested_loj4.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested_loj4.aql
deleted file mode 100644
index 7b6c014..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested_loj4.aql
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse tpch if exists;
-create dataverse tpch;
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int32,
-  l_partkey: int32,
-  l_suppkey: int32,
-  l_linenumber: int32,
-  l_quantity: double,
-  l_extendedprice: double,
-  l_discount: double,
-  l_tax: double,
-  l_returnflag: string,
-  l_linestatus: string,
-  l_shipdate: string,
-  l_commitdate: string,
-  l_receiptdate: string,
-  l_shipinstruct: string,
-  l_shipmode: string,
-  l_comment: string
-}
-
-create type OrderType as closed {
-  o_orderkey: int32,
-  o_custkey: int32,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int32,
-  o_comment: string
-}
-
-create type CustomerType as closed {
-  c_custkey: int32,
-  c_name: string,
-  c_address: string,
-  c_nationkey: int32,
-  c_phone: string,
-  c_acctbal: double,
-  c_mktsegment: string,
-  c_comment: string
-}
-
-create dataset Orders(OrderType)
-  primary key o_orderkey;
-create dataset Customers(CustomerType)
-  primary key c_custkey;
-
-for $c in dataset('Customers')
-let $orders :=
-  for $o in dataset('Orders')
-  where $c.c_nationkey = 5 and $o.o_$o.o_custkey = $c.c_custkey
-  return $o
-return {
-  "cust": $c,
-  "orders": $orders
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/global-datetime-no-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/global-datetime-no-index.aql
deleted file mode 100644
index bd3f019..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/global-datetime-no-index.aql
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /*
- *  Description     : Time should be unpartitioned and Broadcast to nodes
- *  Expected Result : Success
- *  Date            : 20th Oct 2016
- */
-
-drop dataverse channels if exists;
-create dataverse channels;
-use dataverse channels;
-
-create type userLocation as {
-  userId: int,
-  stamp: datetime
-}
-
-create dataset Users(userLocation)
-primary key userId;
-
-let $time := current-datetime()
-for $result in dataset Users
-where $result.stamp = $time
-return $time
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/global-datetime-use-index-return-time.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/global-datetime-use-index-return-time.aql
deleted file mode 100644
index 34c4e30..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/global-datetime-use-index-return-time.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Time should be unpartitioned
- *                  : but used by index and returned
- *  Expected Result : Success
- *  Date            : 20th Oct 2016
- */
-
-drop dataverse channels if exists;
-create dataverse channels;
-use dataverse channels;
-
-create type userLocation as {
-  userId: int,
-  stamp: datetime
-}
-
-create dataset Users(userLocation)
-primary key stamp;
-
-let $time := current-datetime()
-for $result in dataset Users
-where $result.stamp = $time
-return {
-  "date":$time,
-  "result":$result
-}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/global-datetime-use-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/global-datetime-use-index.aql
deleted file mode 100644
index 010ad6f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/global-datetime-use-index.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /*
- *  Description     : Time should be unpartitioned
- *                  : but used by index
- *  Expected Result : Success
- *  Date            : 20th Oct 2016
- */
-
-drop dataverse channels if exists;
-create dataverse channels;
-use dataverse channels;
-
-create type userLocation as {
-  userId: int,
-  stamp: datetime
-}
-
-create dataset Users(userLocation)
-primary key stamp;
-
-let $time := current-datetime()
-for $result in dataset Users
-where $result.stamp = $time
-return $result
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/keep-datetime-local-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/keep-datetime-local-index-only.aql
deleted file mode 100644
index bb0ffc1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/keep-datetime-local-index-only.aql
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Time should remain partitoned
- *                  : and be returned
- *  Expected Result : Success
- *  Date            : 20th Oct 2016
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender-location) type rtree;
-create index msgCountAIx on TweetMessages(countA) type btree;
-create index msgCountBIx on TweetMessages(countB) type btree;
-create index msgTextIx on TweetMessages(message-text) type keyword;
-
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm";
-
-for $t1 in dataset('TweetMessages')
-let $time := current-datetime()
-where $t1.tweetid < int64("10")
-order by $t1.tweetid
-return {
-"time": $time,
-"tweetid1": $t1.tweetid,
-"count1":$t1.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-          where $t1.countA /* +indexnl */= $t2.countB
-          order by $t2.tweetid
-          return {"tweetid2": $t2.tweetid,
-                  "count2":$t2.countB}
-};
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/keep-datetime-local.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/keep-datetime-local.aql
deleted file mode 100644
index 840836a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/keep-datetime-local.aql
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Time should remain partitoned
- *                  : and be returned
- *  Expected Result : Success
- *  Date            : 20th Oct 2016
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender-location) type rtree;
-create index msgCountAIx on TweetMessages(countA) type btree;
-create index msgCountBIx on TweetMessages(countB) type btree;
-create index msgTextIx on TweetMessages(message-text) type keyword;
-
-set 'compiler.indexonly' "false";
-
-for $t1 in dataset('TweetMessages')
-let $time := current-datetime()
-where $t1.tweetid < int64("10")
-order by $t1.tweetid
-return {
-"time": $time,
-"tweetid1": $t1.tweetid,
-"count1":$t1.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-          where $t1.countA /* +indexnl */= $t2.countB
-          order by $t2.tweetid
-          return {"tweetid2": $t2.tweetid,
-                  "count2":$t2.countB}
-};
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/local-datetime-ignore-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/local-datetime-ignore-index.aql
deleted file mode 100644
index 1077257..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/local-datetime-ignore-index.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /*
- *  Description     : Time should remain partitoned
- *                  : and therefore unusable by index
- *  Expected Result : Success
- *  Date            : 20th Oct 2016
- */
-
-drop dataverse channels if exists;
-create dataverse channels;
-use dataverse channels;
-
-create type userLocation as {
-  userId: int,
-  stamp: datetime
-}
-
-create dataset Users(userLocation)
-primary key stamp;
-
-for $result in dataset Users
-let $time := current-datetime()
-where $result.stamp = $time
-return $result
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/local-datetime-no-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/local-datetime-no-index.aql
deleted file mode 100644
index 5083aaa..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/local-datetime-no-index.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Time should remain partitoned
- *                  : and be returned
- *  Expected Result : Success
- *  Date            : 20th Oct 2016
- */
-
-drop dataverse channels if exists;
-create dataverse channels;
-use dataverse channels;
-
-create type userLocation as {
-  userId: int,
-  stamp: datetime
-}
-
-create dataset Users(userLocation)
-primary key userId;
-
-for $result in dataset Users
-let $time := current-datetime()
-where $result.stamp = $time
-return $time
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/maintain-nonpure-location-in-join-cannot-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/maintain-nonpure-location-in-join-cannot-index.aql
deleted file mode 100644
index 4a7b695..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/maintain-nonpure-location-in-join-cannot-index.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /*
- *  Description     : Time should remain partitoned
- *  Expected Result : Success
- *  Date            : 20th Oct 2016
- */
-
-drop dataverse channels if exists;
-create dataverse channels;
-use dataverse channels;
-
-create type userLocation as {
-  id: int,
-  stamp: time
-}
-
-create dataset Users1(userLocation)
-primary key stamp;
-
-create dataset Users2(userLocation)
-primary key stamp;
-
-for $x in dataset Users1
-let $time := current-time()
-for $y in dataset Users2
-where $y.stamp > $time-time("123045678+0800")
-return {
-   "x_id": $x.id,
-   "y_id": $y.id
-}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/query-ASTERIXDB-1608.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/query-ASTERIXDB-1608.aql
deleted file mode 100644
index 04620bd..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nonpure/query-ASTERIXDB-1608.aql
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Check fix for ASTERIXDB-1608
- *  Expected Result : Success
- *  Date            : 20th Oct 2016
- */
-
-
-drop dataverse test if exists;
-create dataverse test;
-
-for $x in range(1, 3)
-for $y in range(1, 3)
-return
-{"id": create-uuid(), "x": $x}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/disjunction-to-join.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/disjunction-to-join.aql
deleted file mode 100644
index 1c95319..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/disjunction-to-join.aql
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Disjunctive predicate should be transformed into collection scan.
- *                  Secondary index should be used to probe the values retrieved from collection.
- * Success        : Yes
- */
- 
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TestType as open {
-  "id" : string,
-  "no-idx" : string
-};
-
-create dataset TestSet(TestType) primary key "id";
-create index TestSetIndex on TestSet(idx: string?) enforced;
-
-for $x in dataset TestSet 
-where $x.idx = "one" or $x.idx = "two"
-return $x
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.aql
deleted file mode 100644
index 325063b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageType as open {
-    tweetid: int64,
-    user: TwitterUserType,
-    sender-location: point,
-    send-time: datetime,
-    referred-topics: {{ string }},
-    message-text: string,
-    countA: int32
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index msgCountBIx on TweetMessages(countB: int32?) type btree enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm";
-
-for $t1 in dataset('TweetMessages')
-where $t1.tweetid < int64("10")
-order by $t1.tweetid
-return {
-"tweetid1": $t1.tweetid,
-"count1":$t1.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-          where $t1.countA /* +indexnl */= $t2.countB
-          order by $t2.tweetid
-          return {"tweetid2": $t2.tweetid,
-                  "count2":$t2.countB}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.aql
deleted file mode 100644
index bb1552a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageType as open {
-    tweetid: int64,
-    user: TwitterUserType,
-    sender-location: point,
-    send-time: datetime,
-    referred-topics: {{ string }},
-    message-text: string
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index msgCountAIx on TweetMessages(countA: int32?) type btree enforced;
-create index msgCountBIx on TweetMessages(countB: int32?) type btree enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm";
-
-for $t1 in dataset('TweetMessages')
-where $t1.tweetid < int64("10")
-order by $t1.tweetid
-return {
-"tweetid1": $t1.tweetid,
-"count1":$t1.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-          where $t1.countA /* +indexnl */= $t2.countB
-          order by $t2.tweetid
-          return {"tweetid2": $t2.tweetid,
-                  "count2":$t2.countB}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.aql
deleted file mode 100644
index 78673c3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.aql
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageType as open {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index msgCountBIx on TweetMessages(countB: int32?) type btree enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm";
-
-for $t1 in dataset('TweetMessages')
-where $t1.tweetid < int64("10")
-order by $t1.tweetid
-return {
-"tweetid1": $t1.tweetid,
-"count1":$t1.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-                        where $t1.countA /* +indexnl */= $t2.countB and
-                        $t1.tweetid != $t2.tweetid
-                        order by $t2.tweetid
-                        return {"tweetid2": $t2.tweetid,
-                                       "count2":$t2.countB}
-};
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.aql
deleted file mode 100644
index 07f4a07..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.aql
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageType as open {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index msgCountAIx on TweetMessages(countA: int32?) type btree enforced;
-create index msgCountBIx on TweetMessages(countB: int32?) type btree enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm";
-
-for $t1 in dataset('TweetMessages')
-where $t1.tweetid < int64("10")
-order by $t1.tweetid
-return {
-"tweetid1": $t1.tweetid,
-"count1":$t1.countA,
-"t2info": for $t2 in dataset('TweetMessages')
-                        where $t1.countA /* +indexnl */= $t2.countB and
-                        $t1.tweetid != $t2.tweetid
-                        order by $t2.tweetid
-                        return {"tweetid2": $t2.tweetid,
-                                       "count2":$t2.countB}
-};
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-join_01.aql
deleted file mode 100644
index 9e07c8d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-join_01.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    id: int32
-}
-
-create dataset Names(Name) primary key id;
-create index Name_idx on Names(fname: string?,lname: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_01.adm";
-
-for $emp1 in dataset('Names')
-for $emp2 in dataset('Names')
-where $emp1.fname /*+ indexnl*/> $emp2.fname and $emp1.lname /*+ indexnl*/> $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-join_02.aql
deleted file mode 100644
index 50963e2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-join_02.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    id: int32
-}
-
-create dataset Names(Name) primary key id;
-create index Name_idx on Names(fname: string?,lname: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_02.adm";
-
-for $emp1 in dataset('Names')
-for $emp2 in dataset('Names')
-where $emp1.fname /*+ indexnl*/< $emp2.fname and $emp1.lname /*+ indexnl*/< $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-join_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-join_03.aql
deleted file mode 100644
index 52d113e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-join_03.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    id: int32
-}
-
-create dataset Names(Name) primary key id;
-create index Name_idx on Names(fname: string?,lname: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_03.adm";
-
-for $emp1 in dataset('Names')
-for $emp2 in dataset('Names')
-where $emp1.fname /*+ indexnl*/= $emp2.fname and $emp1.lname /*+ indexnl*/= $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.aql
deleted file mode 100644
index 05f4d74..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    id: int32
-}
-
-create dataset Names(Name) primary key id;
-create index Name_idx on Names(fname: string?,lname: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_01.adm";
-
-for $emp1 in dataset('Names')
-for $emp2 in dataset('Names')
-where $emp1.fname /*+ indexnl*/< $emp2.fname and $emp1.lname /*+ indexnl*/> $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.aql
deleted file mode 100644
index b41c3b0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    id: int32
-}
-
-create dataset Names(Name) primary key id;
-create index Name_idx on Names(fname: string?,lname: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_02.adm";
-
-for $emp1 in dataset('Names')
-for $emp2 in dataset('Names')
-where $emp1.fname /*+ indexnl*/> $emp2.fname and $emp1.lname /*+ indexnl*/< $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.aql
deleted file mode 100644
index 196347a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    id: int32
-}
-
-create dataset Names(Name) primary key id;
-create index Name_idx on Names(fname: string?,lname: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_03.adm";
-
-for $emp1 in dataset('Names')
-for $emp2 in dataset('Names')
-where $emp1.fname /*+ indexnl*/> $emp2.fname and $emp1.lname /*+ indexnl*/= $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.aql
deleted file mode 100644
index 559650e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    id: int32
-}
-
-create dataset Names(Name) primary key id;
-create index Name_idx on Names(fname: string?,lname: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_04.adm";
-
-for $emp1 in dataset('Names')
-for $emp2 in dataset('Names')
-where $emp1.fname /*+ indexnl*/< $emp2.fname and $emp1.lname /*+ indexnl*/= $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.aql
deleted file mode 100644
index 15fc889..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    id: int32
-}
-
-create dataset Names(Name) primary key id;
-create index Name_idx on Names(fname: string?,lname: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_05.adm";
-
-for $emp1 in dataset('Names')
-for $emp2 in dataset('Names')
-where $emp1.fname /*+ indexnl*/= $emp2.fname and $emp1.lname /*+ indexnl*/> $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.aql
deleted file mode 100644
index 551fdb7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to use an indexed nested-loops join plan in both predicates.
- *              : We expect a plan to have a self-join, which probes dataset Names’s with a prefix of its secondary index.
- * Expected Res : Success
- * Date         : 11th November 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type Name as open {
-    id: int32
-}
-
-create dataset Names(Name) primary key id;
-create index Name_idx on Names(fname: string?,lname: string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_06.adm";
-
-for $emp1 in dataset('Names')
-for $emp2 in dataset('Names')
-where $emp1.fname /*+ indexnl*/= $emp2.fname and $emp1.lname /*+ indexnl*/< $emp2.lname
-return {"emp1": $emp1, "emp2": $emp2 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.aql
deleted file mode 100644
index af51a69..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.aql
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, FacebookUsers and FacebookMessages, based on their user's id.
- *                  We first expect FacebookUsers' primary index to be used
- *                  to satisfy the range condition on it's primary key.
- *                  FacebookMessages has a secondary btree open index on author-id-copy, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type EmploymentType as closed {
-  organization-name: string,
-  start-date: date,
-  end-date: date?
-}
-
-create type FacebookUserType as closed {
-  id: int32,
-  id-copy: int32,
-  alias: string,
-  name: string,
-  user-since: datetime,
-  user-since-copy: datetime,
-  friend-ids: {{ int32 }},
-  employment: [EmploymentType]
-}
-
-create type FacebookMessageType as open {
-  message-id: int32,
-  message-id-copy: int32,
-  author-id: int32,
-  in-response-to: int32?,
-  sender-location: point?,
-  message: string
-}
-
-create dataset FacebookUsers(FacebookUserType)
-primary key id;
-
-create dataset FacebookMessages(FacebookMessageType)
-primary key message-id;
-
-create index fbmIdxAutId if not exists on FacebookMessages(author-id-copy:int32?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multiindex.adm";
-
-for $user in dataset('FacebookUsers')
-for $message in dataset('FacebookMessages')
-where $user.id /*+ indexnl */ = $message.author-id-copy
-and $user.id >= 11000 and $user.id <= 12000
-return {
-  "fbu-ID": $user.id,
-  "fbm-auth-ID": $message.author-id,
-  "uname": $user.name,
-  "message": $message.message
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join-multipred.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join-multipred.aql
deleted file mode 100644
index 046d664..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join-multipred.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, DBLP and CSX, based on their title.
- *                  DBLP has a secondary btree index on title, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- *                  We expect the additional predicates to be put into a select above the
- *                  primary index search.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index title_index on DBLP(title:string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multipred.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where $a.title /*+ indexnl */ = $b.title and $a.authors < $b.authors and $a.misc > $b.misc
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_01.aql
deleted file mode 100644
index 5170257..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_01.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, DBLP and CSX, based on their title.
- *                  DBLP has a secondary btree open index on title, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index title_index on DBLP(title:string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where $a.title /*+ indexnl */ = $b.title
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_02.aql
deleted file mode 100644
index 247b5e0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_02.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, DBLP and CSX, based on their title.
- *                  CSX has a secondary btree open index on title, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index title_index on CSX(title:string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where $a.title /*+ indexnl */ = $b.title
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_03.aql
deleted file mode 100644
index a414ba3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_03.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi self-joins a dataset, DBLP, based on its title.
- *                  DBLP has a secondary btree open index on title, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index title_index on DBLP(title:string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_03.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where $a.title /*+ indexnl */ = $b.title
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_04.aql
deleted file mode 100644
index 8b78831..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_04.aql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, DBLP and CSX, based on their title.
- *                  Both DBLP and CSX have secondary btree open index on title, and given the 'indexnl' hint
- *                  we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index title_index_DBLP on DBLP(title:string?) enforced;
-
-create index title_index on CSX(title:string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where $a.title /*+ indexnl */ = $b.title
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_05.aql
deleted file mode 100644
index 85a4495..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index-join/secondary-equi-join_05.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, DBLP and CSX, based on their title.
- *                  DBLP has a secondary btree open index on title, and given the 'indexnl' hint
- *                  we *do not* expect the join to be transformed into an indexed nested-loop join,
- *                  because CSX does not declare an enforced open index on field title.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index title_index on DBLP(title:string?) enforced;
-
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where $a.title /*+ indexnl */ = $b.title
-return {"arec": $a, "brec": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-33.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-33.aql
deleted file mode 100644
index 4c5c2b8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-33.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-// Please note this is a Negative test and the BTree index should NOT be used in the plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-31.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname > "Roger"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-34.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-34.aql
deleted file mode 100644
index 4aee42a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-34.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-// This is a Negative test - prefix search, BTree index should not be used in the plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-32.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname >= "Susan"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-35.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-35.aql
deleted file mode 100644
index 549db84..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-35.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification (usage) test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-// Negative test - prefix search, BTree index should not be used.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-33.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname < "Isa"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-36.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-36.aql
deleted file mode 100644
index 5d181fc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-36.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-// Negative test - prefix search, BTree index should not be used in query plan
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-34.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname <= "Vanpatten"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-37.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-37.aql
deleted file mode 100644
index 75804ea..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-37.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-// Negative test - BTree index should NOT be used in query plan
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-35.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname != "Max"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-38.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-38.aql
deleted file mode 100644
index 711e68f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-38.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-// Negative test - prefix search, BTree index should NOT be used in the query plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-36.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname = "Julio"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-39.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-39.aql
deleted file mode 100644
index fb3b93d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-39.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-// THE BTREE INDEX IN THIS CASE SHOULD NOT BE PICKED UP!!!!
-// Verify that the optimized query plan does not have the BTree search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-37.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.lname = "Kim"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-40.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-40.aql
deleted file mode 100644
index 0f42145..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-40.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used in the optimized query plan
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-38.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname = "Young Seok" and $emp.lname = "Kim"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-41.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-41.aql
deleted file mode 100644
index d05ac9f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-41.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-// Negative test
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-39.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname = "Julio" or $emp.lname = "Malaika"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-42.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-42.aql
deleted file mode 100644
index 63daef0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-42.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-40.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname > "Alex" and $emp.lname < "Zach"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-43.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-43.aql
deleted file mode 100644
index b584eee..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-43.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-41.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname > "Allan" and $emp.lname < "Zubi"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-44.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-44.aql
deleted file mode 100644
index 05b92c0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-44.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-// Negative test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-42.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname > "Allan" and $emp.lname = "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-45.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-45.aql
deleted file mode 100644
index a732af4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-45.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-// Negative test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-43.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname = "Julio" and $emp.lname < "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-46.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-46.aql
deleted file mode 100644
index efdae0a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-46.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-44.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname >= "Michael" and $emp.lname <= "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-47.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-47.aql
deleted file mode 100644
index 4cd35eb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-47.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-45.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname > "Craig" and $emp.lname > "Kevin" and $emp.fname < "Mary" and $emp.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-48.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-48.aql
deleted file mode 100644
index 83ab8e6..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-48.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-46.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname >= "Craig" and $emp.lname >= "Kevin" and $emp.fname <= "Mary" and $emp.lname <= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-49.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-49.aql
deleted file mode 100644
index b255913..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-49.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-47.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname <= "Craig" and $emp.lname > "Kevin"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-50.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-50.aql
deleted file mode 100644
index 427e29a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-50.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is NOT used
- *                  : in the optimized query plan
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-48.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname != "Michael" and $emp.lname != "Carey"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-51.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-51.aql
deleted file mode 100644
index 99baf52..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-51.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-49.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname > "Craig" and $emp.lname > "Kevin" and $emp.fname <= "Mary" and $emp.lname <= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-52.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-52.aql
deleted file mode 100644
index 9d9f6f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-52.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-50.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname >= "Craig" and $emp.lname >= "Kevin" and $emp.fname < "Mary" and $emp.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-53.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-53.aql
deleted file mode 100644
index 9c70884..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-53.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-51.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname >= "Craig" and $emp.lname <= "Kevin" and $emp.fname <= "Mary" and $emp.lname >= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-54.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-54.aql
deleted file mode 100644
index c8c9ae2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-54.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-52.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname > "Max"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-55.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-55.aql
deleted file mode 100644
index 1497453..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-55.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-53.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname >= "Sofia"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-56.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-56.aql
deleted file mode 100644
index bfb9b8b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-56.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-54.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname < "Chen"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-57.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-57.aql
deleted file mode 100644
index bca543b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-57.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-55.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname <= "Julio"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-58.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-58.aql
deleted file mode 100644
index 0a0b69f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-58.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-56.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname > "Neil" and $emp.fname < "Roger"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-59.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-59.aql
deleted file mode 100644
index c7e41e5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-59.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname >= "Max" and $emp.fname <= "Roger"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-60.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-60.aql
deleted file mode 100644
index 38c265c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-60.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-58.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname = "Max"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-61.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-61.aql
deleted file mode 100644
index 840c227..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-61.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 26th Mar 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-49.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst')
-where $emp.fname > "Craig" and $emp.lname > "Kevin" and $emp.fname <= "Mary" and $emp.lname < "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-62.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-62.aql
deleted file mode 100644
index cf06de7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-62.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 11th Nov 2014
- */
-
-// Positive test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-62.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst') 
-where $emp.fname = "Julio" and $emp.lname > "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-63.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-63.aql
deleted file mode 100644
index c34770b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/btree-index/btree-secondary-63.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : BTree Index verification test
- *                  : This test is intended to verify that the secondary BTree index is used 
- *                  : in the optimized query plan.
- *  Expected Result : Success
- *  Date            : 11th Nov 2014
- */
-
-// Positive test - prefix search
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-63.adm";
-
-create type TestType as open {
-    id : int32
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname:string?,lname:string?) enforced;
-
-for $emp in dataset('testdst') 
-where $emp.fname < "Julio" and $emp.lname = "Xu"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-contains-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-contains-panic.aql
deleted file mode 100644
index 842f7af..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-contains-panic.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the contains function.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains-panic.adm";
-
-// Cannot optimize this query because the string constant is shorter than the gram length.
-for $o in dataset('DBLP')
-where contains($o.title, "Mu")
-order by $o.id
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-contains.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-contains.aql
deleted file mode 100644
index f5aa09f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-contains.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the contains function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm";
-
-for $o in dataset('DBLP')
-where contains($o.title, "Multimedia")
-order by $o.id
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.aql
deleted file mode 100644
index 233375d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on strings.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check-panic.adm";
-
-// This query cannot be optimized with an index, based on the high edit distance.
-for $o in dataset('DBLP')
-let $ed := edit-distance-check($o.authors, "Amihay Motro", 5)
-where $ed[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.aql
deleted file mode 100644
index 78ab408..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on strings.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check.adm";
-
-for $o in dataset('DBLP')
-where edit-distance-check($o.authors, "Amihay Motro", 1)[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.aql
deleted file mode 100644
index b090de0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance function on strings.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-panic.adm";
-
-// This query cannot be optimized with an index, based on the high edit distance.
-for $o in dataset('DBLP')
-where edit-distance($o.authors, "Amihay Motro") <= 5
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-edit-distance.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-edit-distance.aql
deleted file mode 100644
index e88bdc8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-edit-distance.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance function on strings.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance.adm";
-
-for $o in dataset('DBLP')
-where edit-distance($o.authors, "Amihay Motro") <= 1
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-edit-distance.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-edit-distance.aql
deleted file mode 100644
index 5392b22..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-edit-distance.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query with ~= using edit-distance on strings.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-edit-distance.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '1';
-
-for $o in dataset('DBLP')
-where $o.authors ~= "Amihay Motro"
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.aql
deleted file mode 100644
index fe8b831..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query with ~= using Jaccard on 3-gram tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-jaccard.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.8f';
-
-for $o in dataset('DBLP')
-where gram-tokens($o.title, 3, false) ~= gram-tokens("Transactions for Cooperative Environments", 3, false)
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-jaccard-check.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-jaccard-check.aql
deleted file mode 100644
index fe471d9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-jaccard-check.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the similarity-jaccard-check function on 3-gram tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard-check.adm";
-
-for $o in dataset('DBLP')
-where similarity-jaccard-check(gram-tokens($o.title, 3, false), gram-tokens("Transactions for Cooperative Environments", 3, false), 0.5f)[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-jaccard.aql
deleted file mode 100644
index 60b95d5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/ngram-jaccard.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the similarity-jaccard function on 3-gram tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard.adm";
-
-for $o in dataset('DBLP')
-where similarity-jaccard(gram-tokens($o.title, 3, false), gram-tokens("Transactions for Cooperative Environments", 3, false)) >= 0.5f
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/word-contains.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/word-contains.aql
deleted file mode 100644
index 24844f8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/word-contains.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the contains function.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index keyword_index on DBLP(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_word-contains.adm";
-
-// Contains cannot be answered with a word inverted index.
-for $o in dataset('DBLP')
-where contains($o.title, "Multimedia")
-order by $o.id
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.aql
deleted file mode 100644
index f83c315..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword is applied to optimize a selection query with ~= using Jaccard on word tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index keyword_index on DBLP(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_word-fuzzyeq-jaccard.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $o in dataset('DBLP')
-where word-tokens($o.title) ~= word-tokens("Transactions for Cooperative Environments")
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/word-jaccard-check.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/word-jaccard-check.aql
deleted file mode 100644
index 90d11be..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/word-jaccard-check.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard-check function on word tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index keyword_index on DBLP(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard-check.adm";
-
-for $o in dataset('DBLP')
-where similarity-jaccard-check(word-tokens($o.title), word-tokens("Transactions for Cooperative Environments"), 0.5f)[0]
-return $o
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/word-jaccard.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/word-jaccard.aql
deleted file mode 100644
index 2f29131..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-basic/word-jaccard.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard function on word tokens.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index keyword_index on DBLP(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm";
-
-for $o in dataset('DBLP')
-where similarity-jaccard(word-tokens($o.title), word-tokens("Transactions for Cooperative Environments")) >= 0.5f
-return $o
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.aql
deleted file mode 100644
index 2d89001..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using
- *                  two edit-distance-check function of which only the first can be optimized with an index.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
-
-// Only the first edit-distance-check can be optimized with an index.
-for $o in dataset('DBLP')
-let $eda := edit-distance-check($o.authors, "Amihay Motro", 3)
-let $edb := edit-distance-check($o.authors, "Amihay Motro", 5)
-where $eda[0] and $edb[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.aql
deleted file mode 100644
index 361f722..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using
- *                  two edit-distance-check function of which only the second can be optimized with an index.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
-
-// Only the second edit-distance-check can be optimized with an index.
-for $o in dataset('DBLP')
-let $edb := edit-distance-check($o.authors, "Amihay Motro", 5)
-let $eda := edit-distance-check($o.authors, "Amihay Motro", 3)
-where $edb[0] and $eda[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.aql
deleted file mode 100644
index a59182d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on strings.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should *not* be applied (see below).
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic.adm";
-
-// This query cannot be optimized with an index, based on the high edit distance.
-for $o in dataset('DBLP')
-let $ed := edit-distance-check($o.authors, "Amihay Motro", 5)
-where $ed[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.aql
deleted file mode 100644
index a438fe6..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the edit-distance-check function on strings.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let.adm";
-
-for $o in dataset('DBLP')
-let $ed := edit-distance-check($o.authors, "Amihay Motro", 1)
-where $ed[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.aql
deleted file mode 100644
index 0693557..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index index is applied to optimize a selection query using the similarity-edit-distance-check function on the substring of the field.
- *                  Tests that the optimizer rule correctly drills through the substring function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-substring.adm";
-
-for $paper in dataset('DBLP')
-where edit-distance-check(substring($paper.title, 0, 8), "datbase", 1)[0]
-return {
-  "id" : $paper.id,
-  "title" : $paper.title
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql
deleted file mode 100644
index 33e4021..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index index is applied to optimize a selection query using the similarity-edit-distance-check function on individual word tokens.
- *                  Tests that the optimizer rule correctly drills through the word-tokens function and existential query.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-word-tokens.adm";
-
-for $paper in dataset('DBLP')
-for $word in word-tokens($paper.title)
-where edit-distance-check($word, "Multmedia", 1)[0]
-distinct by $paper.id
-return {
-  "id" : $paper.id,
-  "title" : $paper.title
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.aql
deleted file mode 100644
index e9ab5af..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the similarity-jaccard-check function on 3-gram tokens.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-let.adm";
-
-for $o in dataset('DBLP')
-let $jacc := similarity-jaccard-check(gram-tokens($o.title, 3, false), gram-tokens("Transactions for Cooperative Environments", 3, false), 0.5f)
-where $jacc[0]
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.aql
deleted file mode 100644
index 0d1e304..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a selection query using the similarity-jaccard-check function on 3-gram tokens.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-multi-let.adm";
-
-// This test is complex because we have three assigns to drill into.
-for $paper in dataset('DBLP')
-let $paper_tokens := gram-tokens($paper.title, 3, false)
-let $query_tokens := gram-tokens("Transactions for Cooperative Environments", 3, false)
-let $jacc := similarity-jaccard-check($paper_tokens, $query_tokens, 0.5f)
-where $jacc[0]
-return {"Paper": $paper_tokens, "Query": $query_tokens }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/word-jaccard-check-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/word-jaccard-check-let.aql
deleted file mode 100644
index bc1fe5d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/word-jaccard-check-let.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard-check function on word tokens.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index keyword_index on DBLP(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-let.adm";
-
-for $o in dataset('DBLP')
-let $jacc := similarity-jaccard-check(word-tokens($o.title), word-tokens("Transactions for Cooperative Environments"), 0.5f)
-where $jacc[0]
-return $o
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.aql
deleted file mode 100644
index 47ffce4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether a keyword index is applied to optimize a selection query using the similarity-jaccard-check function on word tokens.
- *                  Tests that the optimizer rule correctly drills through the let clauses.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index keyword_index on DBLP(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-multi-let.adm";
-
-// This test is complex because we have three assigns to drill into.
-for $paper in dataset('DBLP')
-let $paper_tokens := word-tokens($paper.title)
-let $query_tokens := word-tokens("Transactions for Cooperative Environments")
-let $jacc := similarity-jaccard-check($paper_tokens, $query_tokens, 0.8f)
-where $jacc[0]
-return {"Paper": $paper_tokens, "Query": $query_tokens }
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.aql 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.aql
deleted file mode 100644
index b482b48..0000000
--- 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.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageType as open {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    countA: int32,
-    countB: int32
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index msgNgramIx on TweetMessages(message-text: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm";
-
-for $t1 in dataset('TweetMessages')
-where $t1.tweetid > int64("240")
-order by $t1.tweetid
-return {
-    "tweet": {"id": $t1.tweetid, "topics" : $t1.message-text} ,
-    "similar-tweets": for $t2 in dataset('TweetMessages')
-                      let $sim := edit-distance-check($t1.message-text, $t2.message-text, 7)
-              where $sim[0] and
-                      $t2.tweetid != $t1.tweetid
-                      order by $t2.tweetid
-                      return {"id": $t2.tweetid, "topics" : $t2.message-text}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-contains_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-contains_01.aql
deleted file mode 100644
index 38bbdb3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-contains_01.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a join query using the contains function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-01.adm";
-
-for $o2 in dataset('CSX')
-for $o1 in dataset('DBLP')
-where contains($o1.title, $o2.title) and $o1.id < $o2.id
-order by $o1.id, $o2.id
-return {"title1":$o1.title, "title2":$o2.title}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-contains_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-contains_02.aql
deleted file mode 100644
index 1dcd503..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-contains_02.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a join query using the contains function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on CSX(title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-02.adm";
-
-for $o1 in dataset('DBLP')
-for $o2 in dataset('CSX')
-where contains($o1.title, $o2.title) and $o1.id < $o2.id
-order by $o1.id, $o2.id
-return {"title1":$o1.title, "title2":$o2.title}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-contains_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-contains_03.aql
deleted file mode 100644
index 5721955..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-contains_03.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a join query using the contains function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-03.adm";
-
-for $o1 in dataset('DBLP')
-for $o2 in dataset('DBLP')
-where contains($o1.title, $o2.title) and $o1.id < $o2.id
-order by $o1.id, $o2.id
-return {"title1":$o1.title, "title2":$o2.title}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-contains_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-contains_04.aql
deleted file mode 100644
index b4daaa8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-contains_04.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests whether an ngram_index is applied to optimize a join query using the contains function.
- *                  The index should be applied.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index_DBLP on DBLP(title: string?) type ngram(3) enforced;
-
-create index ngram_index_CSX on CSX(title: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-04.adm";
-
-for $o1 in dataset('DBLP')
-for $o2 in dataset('CSX')
-where contains($o1.title, $o2.title) and $o1.id < $o2.id
-order by $o1.id, $o2.id
-return {"title1":$o1.title, "title2":$o2.title}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.aql
deleted file mode 100644
index 0f0a673..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance-check function of their authors.
- *                  DBLP has a 3-gram enforced open index on authors?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where edit-distance-check($a.authors, $b.authors, 3)[0] and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.aql
deleted file mode 100644
index a5cb417..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance-check function of their authors.
- *                  CSX has a 3-gram enforced open index on authors?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on CSX(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_02.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where edit-distance-check($a.authors, $b.authors, 3)[0] and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.aql
deleted file mode 100644
index c689120..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the edit-distance-check function of its authors.
- *                  DBLP has a 3-gram enforced open index on authors?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_03.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where edit-distance-check($a.authors, $b.authors, 3)[0] and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.aql
deleted file mode 100644
index 68c255e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance-check function of their authors.
- *                  DBLP and CSX both have a 3-gram enforced open index on authors?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index_DBLP on DBLP(authors:string?) type ngram(3) enforced;
-
-create index ngram_index_CSX on CSX(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where edit-distance-check($a.authors, $b.authors, 3)[0] and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.aql
deleted file mode 100644
index 1980bce..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance-check function of their authors.
- *                  DBLP has a 3-gram enforced open index on authors?, and we *do not* expect the join to be transformed
- *                  into an indexed nested-loop join?, because CSX does not declare an enforced open index on field authors.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where edit-distance-check($a.authors, $b.authors, 3)[0] and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.aql
deleted file mode 100644
index 72027fe..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the edit-distance-check function of its authors.
- *                  DBLP has a 3-gram enforced open index on authors?, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_04.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-let $ed := edit-distance-check($a.authors, $b.authors, 3)
-where $ed[0] and $a.id < $b.id
-return {"arec": $a, "brec": $b, "ed": $ed[1] }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.aql
deleted file mode 100644
index 49baed1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance-contains function of their authors.
- *                  DBLP has a 3-gram index on authors, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(authors: string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-contains.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where edit-distance-contains($a.authors, $b.authors, 3)[0] and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_01.aql
deleted file mode 100644
index ec6378b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_01.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance function of their authors.
- *                  DBLP has a 3-gram enforced open index on authors?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where edit-distance($a.authors, $b.authors) < 3 and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_02.aql
deleted file mode 100644
index 860461d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_02.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance function of their authors.
- *                  CSX has a 3-gram enforced open index on authors?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on CSX(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_02.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where edit-distance($a.authors, $b.authors) < 3 and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_03.aql
deleted file mode 100644
index 19a2cfa..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_03.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the edit-distance function of its authors.
- *                  DBLP has a 3-gram enforced open index on authors?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_03.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where edit-distance($a.authors, $b.authors) < 3 and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_04.aql
deleted file mode 100644
index b2bf9cf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_04.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance function of their authors.
- *                  DBLP and CSX both have a 3-gram enforced open index on authors?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index_DBLP on DBLP(authors:string?) type ngram(3) enforced;
-
-create index ngram_index_CSX on CSX(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where edit-distance($a.authors, $b.authors) < 3 and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_05.aql
deleted file mode 100644
index d884025..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_05.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the edit-distance function of their authors.
- *                  DBLP has a 3-gram enforced open index on authors?, and we *do not* expect the join to be transformed
- *                  into an indexed nested-loop join?, because CSX does not declare an enforced open index on field authors.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where edit-distance($a.authors, $b.authors) < 3 and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.aql
deleted file mode 100644
index 050b507..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the edit-distance function of its authors.
- *                  DBLP has a 3-gram enforced open index on authors?, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_03.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-let $ed := edit-distance($a.authors, $b.authors)
-where $ed < 3 and $a.id < $b.id
-return {"arec": $a, "brec": $b, "ed": $ed}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_01.aql
deleted file mode 100644
index 7cc50d1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_01.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using edit distance of their authors.
- *                  DBLP has a 3-gram enforced open index on authors?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on CSX(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '3';
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where $a.authors ~= $b.authors and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_02.aql
deleted file mode 100644
index 7c7322c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_02.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using edit distance of their authors.
- *                  CSX has a 3-gram enforced open index on authors?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '3';
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where $a.authors ~= $b.authors and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_03.aql
deleted file mode 100644
index 956913d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_03.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on ~= using edit distance of its authors.
- *                  DBLP has a 3-gram enforced open index on authors?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_03.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '3';
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where $a.authors ~= $b.authors and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_04.aql
deleted file mode 100644
index 6ddb3ef..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_04.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using edit distance of their authors.
- *                  DBLP and CSX both have a 3-gram enforced open index on authors?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index_DBLP on DBLP(authors:string?) type ngram(3) enforced;
-
-create index ngram_index_CSX on CSX(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '3';
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where $a.authors ~= $b.authors and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_05.aql
deleted file mode 100644
index 1680143..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_05.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using edit distance of their authors.
- *                  DBLP has a 3-gram enforced open index on authors?, and we *do not* expect the join to be transformed
- *                  into an indexed nested-loop join?, because CSX does not declare an enforced open index on field authors.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  title: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  title: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(authors:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '3';
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where $a.authors ~= $b.authors and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.aql
deleted file mode 100644
index 114167e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, open DBLP and closed CSX, based on ~= using Jaccard of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram enforced open index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where gram-tokens($a.title, 3, false) ~= gram-tokens($b.title, 3, false) and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.aql
deleted file mode 100644
index 237ac57..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, closed DBLP and open CSX, based on ~= using Jaccard their titles' 3-gram tokens.
- *                  CSX has a 3-gram enforced open index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on CSX(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_02.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where gram-tokens($a.title, 3, false) ~= gram-tokens($b.title, 3, false) and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.aql
deleted file mode 100644
index 6ef70de..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on ~= using Jaccard of its titles' 3-gram tokens.
- *                  DBLP has a 3-gram enforced open index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_03.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where gram-tokens($a.title, 3, false) ~= gram-tokens($b.title, 3, false) and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.aql
deleted file mode 100644
index 4ddb71f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.aql
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' 3-gram tokens.
- *                  DBLP and CSX both have a 3-gram enforced open index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index_DBLP on DBLP(title:string?) type ngram(3) enforced;
-
-create index ngram_index_CSX on CSX(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where gram-tokens($a.title, 3, false) ~= gram-tokens($b.title, 3, false) and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.aql
deleted file mode 100644
index 1277050..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.aql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, open DBLP and closed CSX, based on the similarity-jaccard-check function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram enforced open index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard-check(gram-tokens($a.title, 3, false), gram-tokens($b.title, 3, false), 0.5f)[0]
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.aql
deleted file mode 100644
index bbaa284..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.aql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, closed DBLP and open CSX, based the similarity-jaccard-check function of their titles' 3-gram tokens.
- *                  CSX has a 3-gram enforced open index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on CSX(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_02.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where similarity-jaccard-check(gram-tokens($a.title, 3, false), gram-tokens($b.title, 3, false), 0.5f)[0]
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.aql
deleted file mode 100644
index a0f8683..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins an open dataset DBLP, based on the similarity-jaccard-check function of its titles' 3-gram tokens.
- *                  DBLP has a 3-gram enforced open index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_03.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where similarity-jaccard-check(gram-tokens($a.title, 3, false), gram-tokens($b.title, 3, false), 0.5f)[0]
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.aql
deleted file mode 100644
index 26e2504..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based the similarity-jaccard-check function of their titles' 3-gram tokens.
- *                  DBLP and CSX both have a 3-gram enforced open index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index_DBLP on DBLP(title:string?) type ngram(3) enforced;
-
-create index ngram_index_CSX on CSX(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_02.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where similarity-jaccard-check(gram-tokens($a.title, 3, false), gram-tokens($b.title, 3, false), 0.5f)[0]
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.aql
deleted file mode 100644
index f061fcf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the similarity-jaccard-check function of its titles' 3-gram tokens.
- *                  DBLP has a 3-gram enforced open index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_04.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-let $jacc := similarity-jaccard-check(gram-tokens($a.title, 3, false), gram-tokens($b.title, 3, false), 0.5f)
-where $jacc[0] and $a.id < $b.id
-return {"arec": $a, "brec": $b, "jacc": $jacc[1] }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_01.aql
deleted file mode 100644
index 9f4bd45..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_01.aql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' 3-gram tokens.
- *                  DBLP has a 3-gram enforced open index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard(gram-tokens($a.title, 3, false), gram-tokens($b.title, 3, false)) >= 0.5f
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_02.aql
deleted file mode 100644
index 82b31c3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_02.aql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based the similarity-jaccard function of their titles' 3-gram tokens.
- *                  CSX has a 3-gram enforced open index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index on CSX(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_02.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where similarity-jaccard(gram-tokens($a.title, 3, false), gram-tokens($b.title, 3, false)) >= 0.5f
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_03.aql
deleted file mode 100644
index e702d56..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_03.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the similarity-jaccard function of its titles' 3-gram tokens.
- *                  DBLP has a 3-gram enforced open index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_03.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where similarity-jaccard(gram-tokens($a.title, 3, false), gram-tokens($b.title, 3, false)) >= 0.5f
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_04.aql
deleted file mode 100644
index e1a9164..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_04.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based the similarity-jaccard function of their titles' 3-gram tokens.
- *                  DBLP and CSX both have a 3-gram enforced open index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index ngram_index_DBLP on DBLP(title:string?) type ngram(3) enforced;
-
-create index ngram_index_CSX on CSX(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_02.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where similarity-jaccard(gram-tokens($a.title, 3, false), gram-tokens($b.title, 3, false)) >= 0.5f
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.aql
deleted file mode 100644
index b634cbf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the similarity-jaccard function of its titles' 3-gram tokens.
- *                  DBLP has a 3-gram enforced open index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-set import-private-functions 'true';
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title:string?) type ngram(3) enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_04.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-let $jacc := similarity-jaccard(gram-tokens($a.title, 3, false), gram-tokens($b.title, 3, false))
-where $jacc >= 0.5f and $a.id < $b.id
-return {"arec": $a, "brec": $b, "jacc": $jacc }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.aql
deleted file mode 100644
index 3361405..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' word tokens.
- *                  DBLP has an enforced open keyword index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index keyword_index on DBLP(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where word-tokens($a.title) ~= word-tokens($b.title) and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.aql
deleted file mode 100644
index 3990354..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' word tokens.
- *                  CSX has an enforced open keyword index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index keyword_index on CSX(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_02.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where word-tokens($a.title) ~= word-tokens($b.title) and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.aql
deleted file mode 100644
index 9cccbf0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on ~= using Jaccard of its titles' word tokens.
- *                  DBLP has an enforced open keyword index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index keyword_index on DBLP(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_03.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where word-tokens($a.title) ~= word-tokens($b.title) and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.aql
deleted file mode 100644
index 0a0eb66..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on ~= using Jaccard of their titles' word tokens.
- *                  DBLP and CSX both have an enforced open keyword index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index keyword_index_DBLP on DBLP(title:string?) type keyword enforced;
-
-create index keyword_index_CSX on CSX(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.5f';
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where word-tokens($a.title) ~= word-tokens($b.title) and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.aql
deleted file mode 100644
index d090e0b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.aql
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, TweetMessages, based on the similarity-jaccard-check function of its text-messages' word tokens.
- *                  TweetMessages has a keyword index on text-message and btree index on the primary key tweetid, and we expect the join to be
- *                    transformed into btree and inverted indexed nested-loop joins. We test whether the join condition can be transformed into
- *                    multiple indexed nested loop joins of various type of indexes.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageType as open {
-    tweetid: int64,
-    user: TwitterUserType,
-    sender-location: point,
-    send-time: datetime,
-    referred-topics: {{ string }},
-    countA: int32,
-    countB: int32
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender-location) type rtree;
-create index msgCountAIx on TweetMessages(countA) type btree;
-create index msgCountBIx on TweetMessages(countB) type btree;
-create index msgTextIx on TweetMessages(message-text: string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check-after-btree-access.adm";
-
-for $t1 in dataset('TweetMessages')
-for $t2 in dataset('TweetMessages')
-let $sim := similarity-jaccard-check(word-tokens($t1.message-text), word-tokens($t2.message-text), 0.6f)
-where $sim[0] and $t1.tweetid < int64("20") and $t2.tweetid != $t1.tweetid
-return {
-    "t1": $t1.tweetid,
-    "t2": $t2.tweetid,
-    "sim": $sim[1]
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_01.aql
deleted file mode 100644
index e784002..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_01.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard-check function of their titles' word tokens.
- *                  DBLP has an enforced open keyword index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index keyword_index on DBLP(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard-check(word-tokens($a.title), word-tokens($b.title), 0.5f)[0]
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_02.aql
deleted file mode 100644
index 27a170d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_02.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard-check function of their titles' word tokens.
- *                  CSX has an enforced open keyword index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index keyword_index on CSX(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_02.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where similarity-jaccard-check(word-tokens($a.title), word-tokens($b.title), 0.5f)[0]
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_03.aql
deleted file mode 100644
index 7fca777..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_03.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the similarity-jaccard-check function of its titles' word tokens.
- *                  DBLP has an enforced open keyword index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index keyword_index on DBLP(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_03.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where similarity-jaccard-check(word-tokens($a.title), word-tokens($b.title), 0.5f)[0]
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_04.aql
deleted file mode 100644
index 294732f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_04.aql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard-check function of their titles' word tokens.
- *                  DBLP and CSX both have an enforced open keyword index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index keyword_index_DBLP on DBLP(title:string?) type keyword enforced;
-
-create index keyword_index_CSX on CSX(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where similarity-jaccard-check(word-tokens($a.title), word-tokens($b.title), 0.5f)[0]
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.aql
deleted file mode 100644
index e2f32f3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the similarity-jaccard-check function of its titles' word tokens.
- *                  DBLP has an enforced open keyword index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index keyword_index on DBLP(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_04.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-let $jacc := similarity-jaccard-check(word-tokens($a.title), word-tokens($b.title), 0.5f)
-where $jacc[0] and $a.id < $b.id
-return {"arec": $a, "brec": $b, "jacc": $jacc[1] }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_01.aql
deleted file mode 100644
index 7f2ac1c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_01.aql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' word tokens.
- *                  DBLP has an enforced open keyword index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as closed {
-  id: int32,
-  csxid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index keyword_index on DBLP(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
-
-for $b in dataset('CSX')
-for $a in dataset('DBLP')
-where similarity-jaccard(word-tokens($a.title), word-tokens($b.title)) >= 0.5f
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_02.aql
deleted file mode 100644
index a143cff..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_02.aql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' word tokens.
- *                  CSX has an enforced open keyword index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index keyword_index on CSX(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_02.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where similarity-jaccard(word-tokens($a.title), word-tokens($b.title)) >= 0.5f
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_03.aql
deleted file mode 100644
index 744505b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_03.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the similarity-jaccard function of its titles' word tokens.
- *                  DBLP has an enforced open keyword index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index keyword_index on DBLP(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_03.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-where similarity-jaccard(word-tokens($a.title), word-tokens($b.title)) >= 0.5f
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_04.aql
deleted file mode 100644
index f49113a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_04.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy joins two datasets, DBLP and CSX, based on the similarity-jaccard function of their titles' word tokens.
- *                  DBLP and CSX both have an enforced open keyword index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create type CSXType as open {
-  id: int32,
-  csxid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create dataset CSX(CSXType) primary key id;
-
-create index keyword_index_DBLP on DBLP(title:string?) type keyword enforced;
-
-create index keyword_index_CSX on CSX(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('CSX')
-where similarity-jaccard(word-tokens($a.title), word-tokens($b.title)) >= 0.5f
-      and $a.id < $b.id
-return {"arec": $a, "brec": $b }
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_inline_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_inline_03.aql
deleted file mode 100644
index 81f0a77..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/inverted-index-join/word-jaccard_inline_03.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Fuzzy self joins a dataset, DBLP, based on the similarity-jaccard function of its titles' word tokens.
- *                  DBLP has an enforced open keyword index on title?, and we expect the join to be transformed into an indexed nested-loop join.
- *                  We test the inlining of variables that enable the select to be pushed into the join for subsequent optimization with an index.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int32,
-  dblpid: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index keyword_index on DBLP(title:string?) type keyword enforced;
-
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_04.adm";
-
-for $a in dataset('DBLP')
-for $b in dataset('DBLP')
-let $jacc := similarity-jaccard(word-tokens($a.title), word-tokens($b.title))
-where $jacc >= 0.5f and $a.id < $b.id
-return {"arec": $a, "brec": $b, "jacc": $jacc }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql
deleted file mode 100644
index 090783e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageType as open {
-    tweetid: int64,
-        user: TwitterUserType,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender-location: point?) type rtree enforced;
-create index msgCountAIx on TweetMessages(countA) type btree;
-create index msgCountBIx on TweetMessages(countB) type btree;
-create index msgTextIx on TweetMessages(message-text) type keyword;
-
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_01.adm";
-
-for $t1 in dataset('TweetMessages')
-let $n :=  create-circle($t1.sender-location, 0.5)
-where $t1.tweetid < int64("10")
-order by $t1.tweetid
-return {
-"tweetid1": $t1.tweetid,
-"loc1":$t1.sender-location,
-"nearby-message": for $t2 in dataset('TweetMessages')
-                             where spatial-intersect($t2.sender-location, $n)
-                             order by $t2.tweetid
-                             return {"tweetid2":$t2.tweetid, "loc2":$t2.sender-location}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.aql
deleted file mode 100644
index eaab1cb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.aql
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageType as open {
-    tweetid: int64,
-        user: TwitterUserType,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender-location: point?) type rtree enforced;
-create index msgCountAIx on TweetMessages(countA) type btree;
-create index msgCountBIx on TweetMessages(countB) type btree;
-create index msgTextIx on TweetMessages(message-text) type keyword;
-
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_02.adm";
-
-for $t1 in dataset('TweetMessages')
-let $n :=  create-circle($t1.sender-location, 0.5)
-where $t1.tweetid < int64("10")
-order by $t1.tweetid
-return {
-"tweetid1": $t1.tweetid,
-"loc1":$t1.sender-location,
-"nearby-message": for $t2 in dataset('TweetMessages')
-                             where spatial-intersect($t2.sender-location, $n) and $t1.tweetid != $t2.tweetid
-                             order by $t2.tweetid
-                             return {"tweetid2":$t2.tweetid, "loc2":$t2.sender-location}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_01.aql
deleted file mode 100644
index 112ece4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_01.aql
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Joins two datasets on the intersection of their point attributes.
- *                  The dataset 'MyData1' has an enforced open RTree index?, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create type MyRecordOpen as open {
-  id: int32,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create dataset MyData1(MyRecordOpen) primary key id;
-create dataset MyData2(MyRecord) primary key id;
-
-create index rtree_index on MyData1(point:point?) type rtree enforced;
-
-write output to asterix_nc1:"rttest/index-join_rtree-spatial-intersect-point.adm";
-
-for $b in dataset('MyData2')
-for $a in dataset('MyData1')
-where spatial-intersect($a.point, $b.point)
-return {"a": $a, "b": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_02.aql
deleted file mode 100644
index 50ef2b0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_02.aql
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Joins two datasets on the intersection of their point attributes.
- *                  The dataset 'MyData2' has an enforced open RTree index?, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create type MyRecordOpen as open {
-  id: int32,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create dataset MyData1(MyRecord) primary key id;
-create dataset MyData2(MyRecordOpen) primary key id;
-
-create index rtree_index on MyData2(point:point?) type rtree enforced;
-
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
-
-for $a in dataset('MyData1')
-for $b in dataset('MyData2')
-where spatial-intersect($a.point, $b.point)
-return {"a": $a, "b": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_03.aql
deleted file mode 100644
index fe80eaa..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_03.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self-joins a dataset on the intersection of its point attribute.
- *                  The dataset has an enforced open RTree index?, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create dataset MyData(MyRecord) primary key id;
-
-create index rtree_index on MyData(point:point?) type rtree enforced;
-
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_03.adm";
-
-for $a in dataset('MyData')
-for $b in dataset('MyData')
-where spatial-intersect($a.point, $b.point)
-return {"a": $a, "b": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_04.aql
deleted file mode 100644
index 7bcd06d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_04.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Joins two datasets on the intersection of their point attributes.
- *                  Both datasets 'MyData' and 'MyData2' have an enforced open RTree index?, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create dataset MyData1(MyRecord) primary key id;
-create dataset MyData2(MyRecord) primary key id;
-
-create index rtree_index on MyData1(point:point?) type rtree enforced;
-
-create index rtree_index2 on MyData2(point:point?) type rtree enforced;
-
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
-
-for $a in dataset('MyData1')
-for $b in dataset('MyData2')
-where spatial-intersect($a.point, $b.point)
-return {"a": $a, "b": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_05.aql
deleted file mode 100644
index c5b839a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-enforced/rtree-index-join/spatial-intersect-point_05.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Joins two datasets on the intersection of their point attributes.
- *                  Only dataset 'MyData1' has an enforced open RTree index?, hence we
- *                  *do not* expect the join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create dataset MyData1(MyRecord) primary key id;
-create dataset MyData2(MyRecord) primary key id;
-
-create index rtree_index on MyData1(point:point?) type rtree enforced;
-
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
-
-for $a in dataset('MyData1')
-for $b in dataset('MyData2')
-where spatial-intersect($a.point, $b.point)
-return {"a": $a, "b": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby-desc-using-gby.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby-desc-using-gby.aql
deleted file mode 100644
index 4ed67ae..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby-desc-using-gby.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse gby-using-orderby-desc if exists;
-
-create dataverse gby-using-orderby-desc;
-
-use dataverse gby-using-orderby-desc;
-
-create type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-  
-write output to asterix_nc1:"rttest/gby-using-orderby-desc.adm";
-
-for $c in dataset('Customers')
-group by $name := $c.name decor $age := $c.age with $c
-order by $name desc, $age asc
-return { "name": $name, "age": $age }
-  
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby_limit_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby_limit_01.aql
deleted file mode 100644
index bf9aea3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby_limit_01.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan and LIMIT push-down is applied on an external sort with a non primary key field.
- *  Expected Result : Success
- */
-
-// Please note this is a Positive test and the BTree index should be used in the plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/orderby_limit_01.adm";
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-for $o in dataset('MyData')
-where $o.id < 50
-order by $o.docid
-limit 2
-return {"pk":$o.id, "sk":$o.docid}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby_limit_offset_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby_limit_offset_01.aql
deleted file mode 100644
index 9059c35..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby_limit_offset_01.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan and LIMIT with an offset push-down is applied on an external sort with a non primary key field..
- *  Expected Result : Success
- */
-
-// Please note this is a Positive test and the BTree index should be used in the plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/orderby_limit_offset_01.adm";
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-for $o in dataset('MyData')
-where $o.id < 50
-order by $o.docid
-limit 2 offset 2
-return {"pk":$o.id, "sk":$o.docid}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby_limit_primary_index_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby_limit_primary_index_01.aql
deleted file mode 100644
index 429cf09..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby_limit_primary_index_01.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : This test is intended to verify that the primary BTree index is used
- *                  : in the optimized query plan and LIMIT push-down is applied on an external sort.
- *  Expected Result : Success
- */
-
-// Please note this is a Positive test and the BTree index should be used in the plan.
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/orderby_limit_primary_index_01.adm";
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-for $o in dataset('MyData')
-where $o.id < 50
-order by $o.id
-limit 2
-return {"pk":$o.id, "sk":$o.docid}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-aggreg.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-aggreg.aql
deleted file mode 100644
index cd18239..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-aggreg.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse orders-aggreg if exists;
-
-create dataverse orders-aggreg;
-
-use dataverse orders-aggreg;
-
-create type OrderType as closed {
-  oid: int32,
-  cid: int32,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Orders(OrderType)
-  primary key oid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/orders-aggreg.adm";
-
-for $o in dataset('Orders')
-group by $cid := $o.cid with $o
-return { "cid": $cid , "ordpercust": count($o),  
-         "totalcust": sum(for $i in $o return $i.total), 
-         "avgcust": avg(for $i in $o return $i.total) } 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-composite-index-search-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-composite-index-search-index-only.aql
deleted file mode 100644
index 2815fc2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-composite-index-search-index-only.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse index_search if exists;
-create dataverse index_search;
-use dataverse index_search;
-
-create type OrderType as closed {
-  o_orderkey: int32,
-  o_custkey: int32,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int32,
-  o_comment: string
-}
-
-create dataset Orders(OrderType) primary key o_orderkey;
-
-create index idx_Custkey_Orderstatus on Orders(o_custkey, o_orderstatus);
-
-for $o in dataset('Orders')
-where
-  $o.o_custkey = 40 and $o.o_orderstatus = "P"
-return {
-  "o_orderkey": $o.o_orderkey,
-  "o_custkey": $o.o_custkey,
-  "o_orderstatus": $o.o_orderstatus
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-composite-index-search.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-composite-index-search.aql
deleted file mode 100644
index 9fd94b3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-composite-index-search.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse index_search if exists;
-create dataverse index_search;
-use dataverse index_search;
-
-create type OrderType as closed {
-  o_orderkey: int32,
-  o_custkey: int32,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int32,
-  o_comment: string
-}
-
-create dataset Orders(OrderType) primary key o_orderkey;
-
-create index idx_Custkey_Orderstatus on Orders(o_custkey, o_orderstatus);
-
-set 'compiler.indexonly' "false";
-
-for $o in dataset('Orders')
-where
-  $o.o_custkey = 40 and $o.o_orderstatus = "P"
-return {
-  "o_orderkey": $o.o_orderkey,
-  "o_custkey": $o.o_custkey,
-  "o_orderstatus": $o.o_orderstatus
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-index-only.aql
deleted file mode 100644
index df3f03e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-index-only.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse index_search if exists;
-
-create dataverse index_search;
-
-use dataverse index_search;
-
-create type OrderType as closed {
-  o_orderkey: int32,
-  o_custkey: int32,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int32,
-  o_comment: string
-}
-
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-
-create index idx_Orders_Custkey on Orders(o_custkey);
-
-write output to asterix_nc1:"/tmp/index_search.adm";
-
-for $o in dataset('Orders')
-where
-  $o.o_custkey = 40
-return {
-  "o_orderkey": $o.o_orderkey,
-  "o_custkey": $o.o_custkey
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-open-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-open-index-only.aql
deleted file mode 100644
index 2857ed4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-open-index-only.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse index_search if exists;
-
-create dataverse index_search;
-
-use dataverse index_search;
-
-create type OrderType as open {
-  o_orderkey: int32,
-  o_custkey: int32,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int32,
-  o_comment: string
-}
-
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-
-create index idx_Orders_Custkey on Orders(o_custkey);
-
-for $o in dataset('Orders')
-where
-  $o.o_custkey = 40
-return {
-  "o_orderkey": $o.o_orderkey,
-  "o_custkey": $o.o_custkey
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-open.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-open.aql
deleted file mode 100644
index 8780af2..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-open.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse index_search if exists;
-
-create dataverse index_search;
-
-use dataverse index_search;
-
-create type OrderType as open {
-  o_orderkey: int32,
-  o_custkey: int32,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int32,
-  o_comment: string
-}
-
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-
-create index idx_Orders_Custkey on Orders(o_custkey);
-
-set 'compiler.indexonly' "false";
-
-for $o in dataset('Orders')
-where
-  $o.o_custkey = 40
-return {
-  "o_orderkey": $o.o_orderkey,
-  "o_custkey": $o.o_custkey
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search.aql
deleted file mode 100644
index c464258..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse index_search if exists;
-
-create dataverse index_search;
-
-use dataverse index_search;
-
-create type OrderType as closed {
-  o_orderkey: int32,
-  o_custkey: int32,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int32,
-  o_comment: string
-}
-
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-
-create index idx_Orders_Custkey on Orders(o_custkey);
-
-set 'compiler.indexonly' "false";
-
-for $o in dataset('Orders')
-where
-  $o.o_custkey = 40
-return {
-  "o_orderkey": $o.o_orderkey,
-  "o_custkey": $o.o_custkey
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/prim-idx-search-open.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/prim-idx-search-open.aql
deleted file mode 100644
index de8dc87..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/prim-idx-search-open.aql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse prim_index_search if exists;
-
-create dataverse prim_index_search;
-
-use dataverse prim_index_search;
-
-
-create type OrderType as open {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-
-
-write output to asterix_nc1:"/tmp/prim_index_search.adm";
-
-
-for $o in dataset('Orders')
-where
-  $o.o_orderkey = 34
-return {  
-  "o_orderkey": $o.o_orderkey,
-  "o_custkey": $o.o_custkey 
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/prim-idx-search.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/prim-idx-search.aql
deleted file mode 100644
index 2d2f79c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/prim-idx-search.aql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse prim_index_search if exists;
-
-create dataverse prim_index_search;
-
-use dataverse prim_index_search;
-
-
-create type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-
-
-write output to asterix_nc1:"/tmp/prim_index_search.adm";
-
-
-for $o in dataset('Orders')
-where
-  $o.o_orderkey = 34
-return {  
-  "o_orderkey": $o.o_orderkey,
-  "o_custkey": $o.o_custkey 
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/push_limit.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/push_limit.aql
deleted file mode 100644
index 6198c45..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/push_limit.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse tpch if exists;
-create dataverse tpch;
-use dataverse tpch;
-
-create type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/push_limit.adm";
-
-for $o in dataset('Orders')
-where $o.o_totalprice > 100
-order by $o.o_orderkey
-limit 10 offset 5
-return { "price": $o.o_totalprice, "date": $o.o_orderdate }
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q01_pricing_summary_report_nt.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q01_pricing_summary_report_nt.aql
deleted file mode 100644
index f8774de..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q01_pricing_summary_report_nt.aql
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse tpch if exists;
-create dataverse tpch;
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber;
-
-load dataset LineItem 
-using localfs
-(("path"="asterix_nc1://data/tpch0.001/lineitem.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-write output to asterix_nc1:"rttest/tpch_q1_pricing_summary_report_nt.adm";
- 
-for $l in dataset('LineItem')
-where $l.l_shipdate <= '1998-09-02'
-/*+ hash*/
-group by $l_returnflag := $l.l_returnflag, $l_linestatus := $l.l_linestatus  
-  with $l
-order by $l_returnflag, $l_linestatus
-return {
-  "l_returnflag": $l_returnflag,
-  "l_linestatus": $l_linestatus,
-  "sum_qty": sum(for $i in $l return $i.l_quantity),
-  "sum_base_price": sum(for $i in $l return $i.l_extendedprice),
-  "sum_disc_price": sum(for $i in $l return $i.l_extendedprice * (1 - $i.l_discount)),
-  "sum_charge": sum(for $i in $l return $i.l_extendedprice * (1 - $i.l_discount) * (1 + $i.l_tax)),
-  "ave_qty": avg(for $i in $l return $i.l_quantity),  
-  "ave_price": avg(for $i in $l return $i.l_extendedprice),
-  "ave_disc": avg(for $i in $l return $i.l_discount),
-  "count_order": count($l)
-}   
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q03_shipping_priority.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q03_shipping_priority.aql
deleted file mode 100644
index 3002280..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q03_shipping_priority.aql
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse q3_shipping_priority if exists;
-
-create dataverse q3_shipping_priority;
-
-use dataverse q3_shipping_priority;
-
-create type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-create type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-create type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-create dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/q3_shipping_priority.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where
-  $c.c_mktsegment = 'BUILDING' and $c.c_custkey = $o.o_custkey 
-for $l in dataset('LineItems')
-where
-  $l.l_orderkey = $o.o_orderkey and
-  $o.o_orderdate < '1995-03-15' and $l.l_shipdate > '1995-03-15'
-  /*+ hash */
-group by $l_orderkey := $l.l_orderkey, $o_orderdate := $o.o_orderdate, $o_shippriority := $o.o_shippriority
-  with $l
-let $revenue := sum (
-  for $i in $l 
-  return 
-    $i.l_extendedprice * (1 - $i.l_discount)
-)
-order by $revenue desc, $o_orderdate
-limit 10
-return {  
-  "l_orderkey": $l_orderkey,
-  "revenue": $revenue,
-  "o_orderdate": $o_orderdate,
-  "o_shippriority": $o_shippriority 
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q05_local_supplier_volume.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q05_local_supplier_volume.aql
deleted file mode 100644
index 7868fcc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q05_local_supplier_volume.aql
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse q5_local_supplier if exists;
-
-create dataverse q5_local_supplier;
-
-use dataverse q5_local_supplier;
-
-create type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-create type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-create type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-create type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-create type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-create type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-create dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-create dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-create dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-create dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-  
-write output to asterix_nc1:"/tmp/q5_local_supplier.adm";
-
-
-for $c in dataset('Customers')
-for $o1 in 
-(  for $o in dataset('Orders')
-   for $l1 in (
-     for $l in dataset('LineItems')
-     for $s1 in 
-     (  for $s in dataset('Suppliers')
-        for $n1 in 
-        (  for $n in dataset('Nations')
-           for $r in dataset('Regions')
-             where $n.n_regionkey = $r.r_regionkey and $r.r_name = 'ASIA'
-           return 
-              {"n_name": $n.n_name, "n_nationkey": $n.n_nationkey}  )
-        where $s.s_nationkey = $n1.n_nationkey
-        return 
-           { "n_name": $n1.n_name, "s_suppkey": $s.s_suppkey, "s_nationkey": $s.s_nationkey }  )
-     where $l.l_suppkey = $s1.s_suppkey      
-     return 
-        { "n_name": $s1.n_name, "l_extendedprice": $l.l_extendedprice, "l_discount": $l.l_discount, "l_orderkey": $l.l_orderkey, "s_nationkey": $s1.s_nationkey }  )
-   where $l1.l_orderkey = $o.o_orderkey and $o.o_orderdate >= '1994-01-01' and $o.o_orderdate < '1995-01-01'
-   return 
-     { "n_name": $l1.n_name, "l_extendedprice": $l1.l_extendedprice, "l_discount": $l1.l_discount, "s_nationkey": $l1.s_nationkey, "o_custkey": $o.o_custkey }  )
-where $c.c_nationkey = $o1.s_nationkey and $c.c_custkey = $o1.o_custkey     
-/*+ hash*/
-group by $n_name := $o1.n_name with $o1
-let $revenue := sum (
-  for $i in $o1 
-  return 
-    $i.l_extendedprice * (1 - $i.l_discount)
-)
-order by $revenue desc
-return 
-  { "n_name": $n_name, "revenue": $revenue }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q1.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q1.aql
deleted file mode 100644
index 17734e3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q1.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse events if exists;
-create dataverse events;
-use dataverse events;
-
-
-create type AddressType as closed {
-  street: string,
-  city: string,
-  zip: string,
-  latlong: point
-}
-
-create type UserType as open {
-  name: string,
-  email: string,
-  interests: {{string}},
-  address: AddressType,
-  member_of: {{
-    {
-      sig_name: string,
-      chapter_name: string,
-      member_since: date
-    }
-  }}
-}
-
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset User(UserType) primary key name with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/q1.adm";
-
-for $user in dataset('User')
-where some $i in $user.interests
-  satisfies $i = "movies"
-return {"name": $user.name}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q2.aql
deleted file mode 100644
index 5e8018a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q2.aql
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse events if exists;
-create dataverse events;
-use dataverse events;
-
-
-create type AddressType as closed {
-  street: string,
-  city: string,
-  zip: string
- //, latlong: point
-}
-
-create type EventType as closed {
-  name: string,
-  location: AddressType    ?,
-  organizers: {{
-   {
-     name: string,
-     role: string
-   }
-  }},
-  sponsoring_sigs: [
-    {
-      sig_name: string,
-      chapter_name: string
-    }
-  ],
-  interest_keywords: {{string}},
-  price: double?,
-  start_time: datetime,
-  end_time: datetime
-}
-
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Event(EventType) primary key name with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/q2.adm";
-
-for $event in dataset('Event')
-for $sponsor in $event.sponsoring_sigs
-let $es := { "event": $event, "sponsor": $sponsor }
-group by $sig_name := $sponsor.sig_name with $es
-let $sig_sponsorship_count := count($es)
-let $by_chapter :=
-   for $e in $es
-   group by $chapter_name := $e.sponsor.chapter_name with $e
-   return { "chapter_name": $chapter_name, "escount" : count($e) }
-order by $sig_sponsorship_count desc
-limit 5
-return { "sig_name": $sig_name, "total_count": $sig_sponsorship_count, "chapter_breakdown": $by_chapter }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1005.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1005.aql
deleted file mode 100644
index 98cd634..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1005.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description     : This test case is to verify the fix for ASTERIXDB-1005
- * https://issues.apache.org/jira/browse/ASTERIXDB-1005
- * Expected Result : Success
- * Date            : 10th January 2016
- */
-
-drop dataverse deliber if exists;
-create dataverse deliber;
-use dataverse deliber;
-
-// Dish served by a restaurant
-create type DishesType as open
-{ name: string, price: double }
-
-// Bank account type
-create type BankAccountType as open{
- bank_account_number: string,
- bank_account_routing_number: string
-}
-
-// Restaurant's information
-create type RestaurantsType as open {
-restr_id: int64,
-name: string,
-address: string,
-bank_account: BankAccountType,
-last_bank_transaction_datetime: datetime,
-cuisine: {{ string }},
-dish: {{ DishesType }}
-}
-
-// Creating datasets for Users, Restaurants, and Orders
-create dataset Restaurants(RestaurantsType)
-primary key restr_id;
-
-for $r in dataset Restaurants
-where some $c in $r.cuisine satisfies $c = "Mexican" or $c = "Italian"
-order by $r.name
-return
-{"name":$r.name, "cuisines":$r.cuisine}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1127.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1127.aql
deleted file mode 100644
index f957889..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1127.aql
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse tpch if exists;
-create dataverse tpch;
-use dataverse tpch;
-
-create type LineItemType as
-{ l_orderkey: int64, l_partkey: int64, l_suppkey: int64, l_linenumber: int32, l_quantity: int32, l_extendedprice: double, l_discount: double, l_tax: double, l_returnflag: string, l_linestatus: string, l_shipdate: string, l_commitdate: string, l_receiptdate: string, l_shipinstruct: string, l_shipmode: string, l_comment: string }
-
-create type OrderType as
-{ o_orderkey: int64, o_custkey: int64, o_orderstatus: string, o_totalprice: double, o_orderdate: string, o_orderpriority: string, o_clerk: string, o_shippriority: int32, o_comment: string }
-
-create type CustomerType as
-{ c_custkey: int64, c_name: string, c_address: string, c_nationkey: int32, c_phone: string, c_acctbal: double, c_mktsegment: string, c_comment: string }
-
-create type PartType as
-{ p_partkey: int64, p_name: string, p_mfgr: string, p_brand: string, p_type: string, p_size: int32, p_container: string, p_retailprice: double, p_comment: string }
-
-create type PartSuppType as
-{ ps_partkey: int64, ps_suppkey: int64, ps_availqty: int32, ps_supplycost: double, ps_comment: string }
-
-create type SupplierType as
-{ s_suppkey: int64, s_name: string, s_address: string, s_nationkey: int32, s_phone: string, s_acctbal: double, s_comment: string }
-
-create type NationType as
-{ n_nationkey: int32, n_name: string, n_regionkey: int32, n_comment: string }
-
-create type RegionType as
-{ r_regionkey: int32, r_name: string, r_comment: string }
-
-create dataset LineItem(LineItemType) primary key l_orderkey, l_linenumber;
-create dataset Orders(OrderType) primary key o_orderkey;
-create dataset Customer(CustomerType) primary key c_custkey;
-create dataset Part(PartType) primary key p_partkey;
-create dataset Partsupp(PartSuppType) primary key ps_partkey, ps_suppkey;
-create dataset Supplier(SupplierType) primary key s_suppkey;
-create dataset Region(RegionType) primary key r_regionkey;
-create dataset Nation(NationType) primary key n_nationkey;
-
-
-create index nation_fk_region on Nation(n_regionkey);
-create index supplier_fk_nation on Supplier (s_nationkey);
-create index partsupp_fk_part on Partsupp (ps_partkey);
-create index partsupp_fk_supplier on Partsupp (ps_suppkey);
-create index customer_fk_nation on Customer (c_nationkey);
-create index orders_fk_customer on Orders (o_custkey);
-create index lineitem_fk_orders on LineItem (l_orderkey);
-create index lineitem_fk_part on LineItem (l_partkey);
-create index lineitem_fk_supplier on LineItem (l_suppkey);
-create index orders_orderdateIx on Orders (o_orderdate);
-create index lineitem_shipdateIx on LineItem (l_shipdate);
-create index lineitem_receiptdateIx on LineItem (l_receiptdate);
-
-
-
-for $c in dataset('Customer')
-for $o in dataset('Orders')
-    where $c.c_mktsegment = 'BUILDING' and $c.c_custkey = $o.o_custkey
-    for $l in dataset('LineItem')
-    where $l.l_orderkey = $o.o_orderkey and $o.o_orderdate < '1995-03-15' and $l.l_shipdate > '1995-03-15'
-/*+ hash */
-group by $l_orderkey := $l.l_orderkey, $o_orderdate := $o.o_orderdate, $o_shippriority := $o.o_shippriority
-with $l
-let $revenue := sum (
-    for $i in $l
-    return $i.l_extendedprice * (1 - $i.l_discount)
-)
-order by $revenue desc, $o_orderdate
-limit 10
-return
-{ "l_orderkey": $l_orderkey, "revenue": $revenue, "o_orderdate": $o_orderdate, "o_shippriority": $o_shippriority }
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1168.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1168.aql
deleted file mode 100644
index 4df51c6..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1168.aql
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TType as closed
-{ id: int64, content: string }
-
-create dataset TData (TType) primary key id;
-
-
-let $ps := ["b","a", "b","c","c"]
-for $p in $ps
-return
-{ "p":$p, "match": for $x in dataset TData where $x.content = $p return $x.id }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1203.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1203.aql
deleted file mode 100644
index c3944b1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1203.aql
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/* This test is to verify the fix for ASTERIXDB-1203. */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type ifType as open
-{
-    id: int32
-}
-
-create dataset ifds(ifType)
-primary key id;
-
-for $x in dataset ifds
-where (
-if ($x.names.count = "1") then
-   $x.names.name.firstName = "Tom"
-else
-   (some $v in $x.names.name satisfies $v.firstName = "Tom")
-)
-return $x;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1263.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1263.aql
deleted file mode 100644
index c3cb9bf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1263.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse TinySocial if exists;
-create dataverse TinySocial;
-use dataverse TinySocial;
-
-create type TwitterUserType as open {
-        screen-name: string,
-        lang: string,
-        friends_count: int64,
-        statuses_count: int64,
-        name: string,
-        followers_count: int64
-}
-
-create type TweetMessageType as closed {
-        tweetid: string,
-        user: TwitterUserType,
-        sender-location: point?,
-        send-time: datetime,
-        referred-topics: {{ string }},
-        message-text: string
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-for $t in dataset TweetMessages
-group by $d:= get-hour($t.send-time) with $t
-return { "hour": $d,
-         "count": count($t),
-         "finer":  for $k in $t
-                   group by $min:= get-minute($k.create_at) with $k
-                   order by $min
-                   return {  "minute": $min, "sum": count($k)}
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-2.aql
deleted file mode 100644
index b5f85b0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-2.aql
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse tpch if exists;
-create dataverse tpch;
-
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int64,
-  l_partkey: int64,
-  l_suppkey: int64,
-  l_linenumber: int64,
-  l_quantity: int64,
-  l_extendedprice: double,
-  l_discount: double,
-  l_tax: double,
-  l_returnflag: string,
-  l_linestatus: string,
-  l_shipdate: string,
-  l_commitdate: string,
-  l_receiptdate: string,
-  l_shipinstruct: string,
-  l_shipmode: string,
-  l_comment: string
-}
-
-create type OrderType as closed {
-  o_orderkey: int64,
-  o_custkey: int64,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int64,
-  o_comment: string
-}
-
-drop nodegroup group_test if exists;
-create  nodegroup group_test on
-    asterix_nc2,
-    asterix_nc1;
-
-create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group_test"}};
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group_test"}};
-
-declare function tmp()
-{
-  for $l in dataset('LineItem')
-  where $l.l_commitdate < $l.l_receiptdate
-  distinct by $l.l_orderkey
-  return { "o_orderkey": $l.l_orderkey }
-}
-
-for $o in dataset('Orders')
-for $t in tmp()
-where $o.o_orderkey = $t.o_orderkey and
-  $o.o_orderdate >= '1993-07-01' and $o.o_orderdate < '1993-10-01'
-group by $o_orderpriority := $o.o_orderpriority with $o
-order by $o_orderpriority
-return {
-  "order_priority": $o_orderpriority,
-  "count": count($o)
-}
-
-drop dataverse tpch if exists;
-drop nodegroup group_test if exists;
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-3.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-3.aql
deleted file mode 100644
index e044e87..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-3.aql
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse tpch if exists;
-create dataverse tpch;
-
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int64,
-  l_partkey: int64,
-  l_suppkey: int64,
-  l_linenumber: int64,
-  l_quantity: int64,
-  l_extendedprice: double,
-  l_discount: double,
-  l_tax: double,
-  l_returnflag: string,
-  l_linestatus: string,
-  l_shipdate: string,
-  l_commitdate: string,
-  l_receiptdate: string,
-  l_shipinstruct: string,
-  l_shipmode: string,
-  l_comment: string
-}
-
-create type OrderType as closed {
-  o_orderkey: int64,
-  o_custkey: int64,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int64,
-  o_comment: string
-}
-
-drop nodegroup group_test if exists;
-create  nodegroup group_test on
-    asterix_nc1,
-    asterix_nc2;
-
-create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group_test"}};
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group_test"}};
-
-declare function tmp()
-{
-  for $l in dataset('LineItem')
-  where $l.l_commitdate < $l.l_receiptdate
-  distinct by $l.l_orderkey
-  return { "o_orderkey": $l.l_orderkey }
-}
-
-for $o in dataset('Orders')
-for $t in tmp()
-where $o.o_orderkey = $t.o_orderkey and
-  $o.o_orderdate >= '1993-07-01' and $o.o_orderdate < '1993-10-01'
-group by $o_orderpriority := $o.o_orderpriority with $o
-order by $o_orderpriority
-return {
-  "order_priority": $o_orderpriority,
-  "count": count($o)
-}
-
-
-drop dataverse tpch if exists;
-drop nodegroup group_test if exists;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-4.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-4.aql
deleted file mode 100644
index a811380..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-4.aql
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse tpch if exists;
-drop nodegroup group_test if exists;
-create dataverse tpch;
-
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int64,
-  l_partkey: int64,
-  l_suppkey: int64,
-  l_linenumber: int64,
-  l_quantity: int64,
-  l_extendedprice: double,
-  l_discount: double,
-  l_tax: double,
-  l_returnflag: string,
-  l_linestatus: string,
-  l_shipdate: string,
-  l_commitdate: string,
-  l_receiptdate: string,
-  l_shipinstruct: string,
-  l_shipmode: string,
-  l_comment: string
-}
-
-create type OrderType as closed {
-  o_orderkey: int64,
-  o_custkey: int64,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int64,
-  o_comment: string
-}
-
-create  nodegroup group_test  on
-    asterix_nc1;
-
-create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group_test"}};
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group_test"}};
-
-create index lineitem_shipdateIx on LineItem (l_shipdate);
-create index lineitem_receiptdateIx on LineItem (l_receiptdate);
-create index lineitem_fk_orders on LineItem (l_orderkey);
-create index lineitem_fk_part on LineItem (l_partkey);
-create index lineitem_fk_supplier on LineItem (l_suppkey);
-create index orders_fk_customer on Orders (o_custkey);
-create index orders_orderdateIx on Orders (o_orderdate);
-
-declare function tmp()
-{
-  for $l in dataset('LineItem')
-  where $l.l_commitdate < $l.l_receiptdate
-  distinct by $l.l_orderkey
-  return { "o_orderkey": $l.l_orderkey }
-}
-
-for $o in dataset('Orders')
-for $t in tmp()
-where $o.o_orderkey = $t.o_orderkey and
-  $o.o_orderdate >= '1993-07-01' and $o.o_orderdate < '1993-10-01'
-group by $o_orderpriority := $o.o_orderpriority with $o
-order by $o_orderpriority
-return {
-  "order_priority": $o_orderpriority,
-  "count": count($o)
-}
-
-
-drop dataverse tpch if exists;
-drop nodegroup group_test if exists;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343.aql
deleted file mode 100644
index d99210d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343.aql
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse tpch if exists;
-drop nodegroup group_test if exists;
-create dataverse tpch;
-
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int64,
-  l_partkey: int64,
-  l_suppkey: int64,
-  l_linenumber: int64,
-  l_quantity: int64,
-  l_extendedprice: double,
-  l_discount: double,
-  l_tax: double,
-  l_returnflag: string,
-  l_linestatus: string,
-  l_shipdate: string,
-  l_commitdate: string,
-  l_receiptdate: string,
-  l_shipinstruct: string,
-  l_shipmode: string,
-  l_comment: string
-}
-
-create type OrderType as closed {
-  o_orderkey: int64,
-  o_custkey: int64,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int64,
-  o_comment: string
-}
-
-create  nodegroup group_test  on
-    asterix_nc1;
-
-create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group_test"}};
-create dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group_test"}};
-
-declare function tmp()
-{
-  for $l in dataset('LineItem')
-  where $l.l_commitdate < $l.l_receiptdate
-  distinct by $l.l_orderkey
-  return { "o_orderkey": $l.l_orderkey }
-}
-
-for $o in dataset('Orders')
-for $t in tmp()
-where $o.o_orderkey = $t.o_orderkey and
-  $o.o_orderdate >= '1993-07-01' and $o.o_orderdate < '1993-10-01'
-group by $o_orderpriority := $o.o_orderpriority with $o
-order by $o_orderpriority
-return {
-  "order_priority": $o_orderpriority,
-  "count": count($o)
-}
-
-
-drop dataverse tpch if exists;
-drop nodegroup group_test if exists;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-2452.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-2452.aql
deleted file mode 100644
index f5eb928..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-2452.aql
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-set import-private-functions 'true'
-
-let $nullstring := [null, null, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-
-let $prefix1 := subset-collection($nullstring, 0, prefix-len-jaccard(len($nullstring), 0.1f))
-let $prefix4 := subset-collection($nullstring, 0, prefix-len-jaccard(len($nullstring), 0.4f))
-
-let $joinpair :=
-  for $s in $prefix4
-  for $r in $prefix1
-  where $s = $r
-  return $s
-
-return [$joinpair]
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-830.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-830.aql
deleted file mode 100644
index 2fc491a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-830.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type TweetMetadataType as {
-  id : string
-}
-
-create dataset TweetMetadata(TweetMetadataType) primary key id;
-
-for $m in dataset TweetMetadata
-let $p := $m.gender.MaleProb
-let $s := $m.sentiment
-where "not"(is-null($m.sentiment)) and "not"(is-null($m.gender))
-group by $g := $m.product_id[0] with $p, $s
-return
-{ "bucket": $g, "sentiment": avg($s), "male": avg($p) };
-
-for $m in dataset TweetMetadata
-where "not"(is-null($m.sentiment)) and "not"(is-null($m.gender))
-group by $g := $m.product_id[0] with $m
-return
-{
-  "bucket": $g,
-  "sentiment": avg(for $x in $m return $x.sentiment),
-  "male": avg(for $x in $m return $x.gender.MaleProb)
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-865.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-865.aql
deleted file mode 100644
index 185e74b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-865.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/* This test is to verify the fix for ASTERIXDB-865. */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type page_info_type as open {}
-
-create type page_views_type as closed {
-    user: string,
-    action: int32,
-    timespent: int32,
-    query_term: string,
-    ip_addr: int32,
-    timestamp: int32,
-    estimated_revenue: double,
-    page_info: page_info_type,
-    page_links: {{ page_info_type}}
-}
-
-create dataset page_views(page_views_type)
-primary key user;
-
-for $t in dataset page_views
-let $header := if ($t.action = 1)
-    then [ $t.page_info.a ]
-    else
-        for $pl in $t.page_links
-        return $pl.b
-for $h in $header
-return
-{ "user": $t.user, "header": $h }
-;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue550.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue550.aql
deleted file mode 100644
index 1366fc0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue550.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description     : This test case is to verify the fix for issue550
- * https://code.google.com/p/asterixdb/issues/detail?id=550
- * Expected Result : Success
- * Date            : 25th October 2014
- */
-
-let $sample :=
-{{ 
-   {"r": 1, "uid": "1a2b", "t": datetime("2000-01-01T01:00:00"), "event": "e1"},
-   {"r": 2, "uid": "1a2b", "t": datetime("2000-01-01T01:01:00"), "event": "e2"},
-   {"r": 3, "uid": "3c4d", "t": datetime("2000-01-01T01:02:00"), "event": "e1"},
-   {"r": 4, "uid": "3c4d", "t": datetime("2000-01-01T01:03:00"), "event": "e3"},
-   {"r": 5, "uid": "1a2b", "t": datetime("2000-01-01T01:04:00"), "event": "e1"},
-   {"r": 6, "uid": "1a2b", "t": datetime("2000-01-01T01:05:00"), "event": "e4"}
-}}
-for $s in $sample
-group by $u := $s.uid with $s
-return {
-   "u": $u,
-   "recs": ( for $srec in $s return $srec )
- };
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue562.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue562.aql
deleted file mode 100644
index 86e5d4c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue562.aql
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : This test case is to verify the fix for issue562
- * https://code.google.com/p/asterixdb/issues/detail?id=562
- * Expected Res : SUCCESS
- * Date         : 15th Jan. 2015
- */
-
-drop dataverse tpch if exists;
-create dataverse tpch;
-
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int32,
-  l_partkey: int32,
-  l_suppkey: int32,
-  l_linenumber: int32,
-  l_quantity: int32,
-  l_extendedprice: double,
-  l_discount: double,
-  l_tax: double,
-  l_returnflag: string,
-  l_linestatus: string,
-  l_shipdate: string,
-  l_commitdate: string,
-  l_receiptdate: string,
-  l_shipinstruct: string,
-  l_shipmode: string,
-  l_comment: string
-}
-
-create type OrderType as closed {
-  o_orderkey: int32,
-  o_custkey: int32,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int32,
-  o_comment: string
-}
-
-create type CustomerType as closed {
-  c_custkey: int32,
-  c_name: string,
-  c_address: string,
-  c_nationkey: int32,
-  c_phone: string,
-  c_acctbal: double,
-  c_mktsegment: string,
-  c_comment: string
-}
-
-create dataset Orders(OrderType)
-  primary key o_orderkey;
-create dataset Customer(CustomerType)
-  primary key c_custkey;
-
-declare function q22_customer_tmp() {
-  for $c in dataset('Customer')
-  let $phone_substr := substring($c.c_phone, 0, 2)
-  where $phone_substr = '13'
-    or $phone_substr = '31'
-    or $phone_substr = '23'
-    or $phone_substr = '29'
-    or $phone_substr = '30'
-    or $phone_substr = '18'
-    or $phone_substr = '17'
-  return {
-    "c_acctbal": $c.c_acctbal,
-    "c_custkey": $c.c_custkey,
-    "cntrycode": $phone_substr
-  }
-}
-
-let $avg := avg(
-  for $c in dataset('Customer')
-  let $phone_substr := substring($c.c_phone, 0, 2)
-  where $c.c_acctbal > 0.00
-    and ($phone_substr = '13'
-    or $phone_substr = '31'
-    or $phone_substr = '23'
-    or $phone_substr = '29'
-    or $phone_substr = '30'
-    or $phone_substr = '18'
-    or $phone_substr = '17')
-  return $c.c_acctbal
-)
-
-for $ct in q22_customer_tmp()
-where count(for $o in dataset('Orders') where $ct.c_custkey = $o.o_custkey return $o) = 0
-group by $cntrycode := $ct.cntrycode with $ct
-order by $cntrycode
-return {
-  "cntrycode": $cntrycode,
-  "numcust": count($ct),
-  "totacctbal": sum(for $i in $ct return $i.c_acctbal)
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue697.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue697.aql
deleted file mode 100644
index 75c9578..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue697.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description     : This test case is to verify the fix for issue697
- * https://code.google.com/p/asterixdb/issues/detail?id=697
- * Expected Result : Success
- * Date            : 16th Nov. 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type TestType as closed {
-  key1: int32,
-  value: int32
-}
-
-create dataset test(TestType)
-  primary key key1;
-
-
-for $i in dataset("test")
-group by $aid := $i.key1 with $i
-return {
-  "gid": $aid,
-  "avg": avg(for $j in $i where "not"(is-null($j.value)) return $j.value)
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue785.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue785.aql
deleted file mode 100644
index 6df0d5a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue785.aql
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : This test case is to verify the fix for issue785
- * https://code.google.com/p/asterixdb/issues/detail?id=785
- * Expected Res : SUCCESS
- * Date         : 2nd Oct. 2014
- */
-
-drop dataverse tpch if exists;
-create dataverse tpch;
-
-use dataverse tpch;
-
-create type OrderType as closed {
-  o_orderkey: int32,
-  o_custkey: int32,
-  o_orderstatus: string,
-  o_totalprice: double,
-  o_orderdate: string,
-  o_orderpriority: string,
-  o_clerk: string,
-  o_shippriority: int32,
-  o_comment: string
-}
-
-create type CustomerType as closed {
-  c_custkey: int32,
-  c_name: string,
-  c_address: string,
-  c_nationkey: int32,
-  c_phone: string,
-  c_acctbal: double,
-  c_mktsegment: string,
-  c_comment: string
-}
-
-create type SupplierType as closed {
-  s_suppkey: int32,
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-create type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-create type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-create dataset Orders(OrderType)
-  primary key o_orderkey;
-create dataset Supplier(SupplierType)
-  primary key s_suppkey;
-create dataset Region(RegionType)
-  primary key r_regionkey;
-create dataset Nation(NationType)
-  primary key n_nationkey;
-create dataset Customer(CustomerType)
-  primary key c_custkey;
-create dataset SelectedNation(NationType)
-  primary key n_nationkey;
-
-let $t := for $nation in dataset Nation
-for $sn in dataset SelectedNation
-where $nation.n_nationkey = $sn.n_nationkey  /*+ indexnl */
-return {
-    "n_nationkey": $nation.n_nationkey,
-    "n_name": $nation.n_name
-}
-
-let $X := (
-for $n in $t
-for $customer in dataset Customer
-for $order in dataset Orders
-where $order.o_custkey = $customer.c_custkey
-and  $customer.c_nationkey = $n.n_nationkey
-group by $orderdate := $order.o_orderdate, $nation_key := $n.n_nationkey with $order
-let $sum := sum(for $o in $order return $o.o_totalprice)
-return {
-    "nation_key": $nation_key,
-    "order_date": $orderdate,
-    "sum_price": $sum 
-})
-
-for $x in $X
-group by $nation_key := $x.nation_key with $x
-return {
-    "nation_key": $nation_key,
-    "sum_price": for $y in $x
-                  order by $y.sum_price desc
-                  limit 3
-                  return {
-                    "orderdate": $y.order_date,
-                    "sum_price": $y.sum_price
-                  }
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue810-2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue810-2.aql
deleted file mode 100644
index 1cd1b28..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue810-2.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : This test case is to verify the fix for issue810
- * https://code.google.com/p/asterixdb/issues/detail?id=810
- * Expected Res : SUCCESS
- * Date         : 24th Nov. 2014
- */
-
-drop dataverse tpch if exists;
-create dataverse tpch;
-
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int32,
-  l_partkey: int32,
-  l_suppkey: int32,
-  l_linenumber: int32,
-  l_quantity: double,
-  l_extendedprice: double,
-  l_discount: double,
-  l_tax: double,
-  l_returnflag: string,
-  l_linestatus: string,
-  l_shipdate: string,
-  l_commitdate: string,
-  l_receiptdate: string,
-  l_shipinstruct: string,
-  l_shipmode: string,
-  l_comment: string
-}
-
-create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber;
-
-
-for $l in dataset('LineItem')
-where $l.l_shipdate <= '1998-09-02'
-/*+ hash*/
-group by $l_returnflag := $l.l_returnflag,
-         $l_linestatus := $l.l_linestatus
-  with $l
- let $expensives := for $i in $l where ($i.l_discount<=0.05) return $i.l_discount
- let $cheaps := for $i in $l where ($i.l_discount>0.05) return $i
- let $charges := for $i in $l return $i.l_extendedprice * (1 - $i.l_discount) * (1 + $i.l_tax)
- let $disc_prices := for $i in $l return $i.l_extendedprice * (1 - $i.l_discount)
-order by $l_returnflag, $l_linestatus
-return {
-  "l_returnflag": $l_returnflag,
-  "l_linestatus": $l_linestatus,
-  "count_cheaps": count($cheaps),
-  "avg_expensive_discounts": avg($expensives),
-  "sum_disc_prices": sum($disc_prices),
-  "total_charges": sum($charges)
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue810.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue810.aql
deleted file mode 100644
index e023d43..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue810.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description     : This test case is to verify the fix for issue810
- * https://code.google.com/p/asterixdb/issues/detail?id=810
- * Expected Result : Success
- * Date            : 16th Nov. 2014
- */
-
-drop dataverse tpch if exists;
-create dataverse tpch;
-
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int32,
-  l_partkey: int32,
-  l_suppkey: int32,
-  l_linenumber: int32,
-  l_quantity: double,
-  l_extendedprice: double,
-  l_discount: double,
-  l_tax: double,
-  l_returnflag: string,
-  l_linestatus: string,
-  l_shipdate: string,
-  l_commitdate: string,
-  l_receiptdate: string,
-  l_shipinstruct: string,
-  l_shipmode: string,
-  l_comment: string
-}
-
-create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber;
-
-for $l in dataset('LineItem')
-where $l.l_shipdate <= '1998-09-02'
-/*+ hash*/
-group by $l_returnflag := $l.l_returnflag,
-         $l_linestatus := $l.l_linestatus
-  with $l
- let $cheap := for $m in $l where ($m.l_discount>0.05) return $m
- let $expensive := for $a in $l where ($a.l_discount<=0.05) return $a
-order by $l_returnflag, $l_linestatus
-return {
-  "l_returnflag": $l_returnflag,
-  "l_linestatus": $l_linestatus,
-  "count_cheaps": count($cheap),
-  "count_expensives": count($expensive)
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue827-2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue827-2.aql
deleted file mode 100644
index 2c8451c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-issue827-2.aql
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : This test case is to verify the fix for issue827
- * https://code.google.com/p/asterixdb/issues/detail?id=827
- * Expected Res : SUCCESS
- * Date         : 3rd Dec. 2014
- */
-
-drop dataverse tpch if exists;
-create dataverse tpch;
-
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int32,
-  l_partkey: int32,
-  l_suppkey: int32,
-  l_linenumber: int32,
-  l_quantity: double,
-  l_extendedprice: double,
-  l_discount: double,
-  l_tax: double,
-  l_returnflag: string,
-  l_linestatus: string,
-  l_shipdate: string,
-  l_commitdate: string,
-  l_receiptdate: string,
-  l_shipinstruct: string,
-  l_shipmode: string,
-  l_comment: string
-}
-
-create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber;
-
-let $qty := for $i in dataset('LineItem') where $i.l_shipdate <= '1998-09-02' return $i.l_quantity
-let $base_price := for $i in dataset('LineItem') return $i.l_extendedprice
-let $disc_price := for $i in dataset('LineItem') return $i.l_extendedprice * (1 - $i.l_discount)
-let $charge := for $i in dataset('LineItem') return $i.l_extendedprice * (1 - $i.l_discount) * (1 + $i.l_tax)
-let $price := for $i in dataset('LineItem') return $i.l_extendedprice
-let $disc := for $i in dataset('LineItem') return $i.l_discount
-let $order := for $l in dataset('LineItem') return $l
-return {
-  "sum_qty_partial": sum($qty),
-  "sum_base_price": sum($base_price),
-  "sum_disc_price": sum($disc_price),
-  "sum_charge": sum($charge),
-  "ave_qty": avg($qty),
-  "ave_price": avg($price),
-  "ave_disc": avg($disc),
-  "count_order": count($order)
-}
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/range-connector/sort-hint-on-closed-numeric-desc.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/range-connector/sort-hint-on-closed-numeric-desc.aql
deleted file mode 100644
index 0061a48..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/range-connector/sort-hint-on-closed-numeric-desc.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : The hint is to use the range connector
- *                  : This test is intended to verify that the range connector is used instead of single node merge.
- *  Expected Result : Success
- *  Date            : 1th May 2015
- */
-
-drop dataverse TinySocial if exists;
-create dataverse TinySocial;
-use dataverse TinySocial;
-
-create type TwitterUserType as open {
-        screen-name: string,
-        lang: string,
-        friends_count: int64,
-        statuses_count: int64,
-        name: string,
-        followers_count: int64
-}
-
-create dataset TwitterUsers(TwitterUserType)
-primary key screen-name;
-
-set "compiler.sort.parallel" "true"
-
-for $user in dataset TwitterUsers
-/*+ range [400, 150, 100] */
-order by $user.friends_count desc
-return $user;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/range-connector/sort-hint-on-closed-numeric.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/range-connector/sort-hint-on-closed-numeric.aql
deleted file mode 100644
index fdc9ee7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/range-connector/sort-hint-on-closed-numeric.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : The hint is to use the range connector
- *                  : This test is intended to verify that the range connector is used instead of single node merge.
- *  Expected Result : Success
- *  Date            : 1th May 2015
- */
-
-drop dataverse TinySocial if exists;
-create dataverse TinySocial;
-use dataverse TinySocial;
-
-create type TwitterUserType as open {
-        screen-name: string,
-        lang: string,
-        friends_count: int64,
-        statuses_count: int64,
-        name: string,
-        followers_count: int64
-}
-
-create dataset TwitterUsers(TwitterUserType)
-primary key screen-name;
-
-set "compiler.sort.parallel" "true"
-
-for $user in dataset TwitterUsers
-/*+ range [100, 150, 400] */
-order by $user.friends_count
-return $user;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/range-connector/sort-hint-on-closed-string-desc.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/range-connector/sort-hint-on-closed-string-desc.aql
deleted file mode 100644
index a338b7a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/range-connector/sort-hint-on-closed-string-desc.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : The hint is to use the range connector
- *                  : This test is intended to verify that the range connector is used instead of single node merge.
- *  Expected Result : Success
- *  Date            : 1th May 2015
- */
-
-drop dataverse TinySocial if exists;
-create dataverse TinySocial;
-use dataverse TinySocial;
-
-create type TwitterUserType as open {
-        screen-name: string,
-        lang: string,
-        friends_count: int64,
-        statuses_count: int64,
-        name: string,
-        followers_count: int64
-}
-
-create dataset TwitterUsers(TwitterUserType)
-primary key screen-name;
-
-set "compiler.sort.parallel" "true"
-
-for $user in dataset TwitterUsers
-/*+ range ["Nb", "F", "Ci"] */
-order by $user.screen-name desc
-return $user;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/range-connector/sort-hint-on-closed-string.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/range-connector/sort-hint-on-closed-string.aql
deleted file mode 100644
index 734f9d3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/range-connector/sort-hint-on-closed-string.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : The hint is to use the range connector
- *                  : This test is intended to verify that the range connector is used instead of single node merge.
- *  Expected Result : Success
- *  Date            : 1th May 2015
- */
-
-drop dataverse TinySocial if exists;
-create dataverse TinySocial;
-use dataverse TinySocial;
-
-create type TwitterUserType as open {
-        screen-name: string,
-        lang: string,
-        friends_count: int64,
-        statuses_count: int64,
-        name: string,
-        followers_count: int64
-}
-
-create dataset TwitterUsers(TwitterUserType)
-primary key screen-name;
-
-set "compiler.sort.parallel" "true"
-
-for $user in dataset TwitterUsers
-/*+ range ["Ci", "F", "Nb"] */
-order by $user.screen-name
-return $user;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/record_access.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/record_access.aql
deleted file mode 100644
index 1e29dec..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/record_access.aql
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"/tmp/rec_access.adm";
-
-let $r := { "a": 2 }
-let $a := $r.a
-return $a
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/issue730-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/issue730-index-only.aql
deleted file mode 100644
index 1bf2b2b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/issue730-index-only.aql
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use an available rtree index in index subtree.
- * Issue        : 730
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as {
-screen_name: string,
-lang: string,
-friends_count: int32,
-statuses_count: int32,
-name: string,
-followers_count: int32
-}
-
-create type TweetMessageType as {
-tweetid: int64,
-user: TwitterUserType,
-sender_location: point?,
-send_time: datetime,
-referred_topics: {{ string }},
-message_text: string
-}
-
-create dataset TweetMessages(TweetMessageType) primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender_location) type rtree;
-
-for $t1 in dataset('TweetMessages')
-where $t1.send_time >= datetime('2011-06-18T14:10:17') and $t1.send_time < datetime('2011-06-18T15:10:17')
-let $n :=  create-circle($t1.sender_location, 5.0)
-return {
-"message": $t1.tweetid,
-"nearby-message": for $t2 in dataset('TweetMessages')
-                             where spatial-intersect($t2.sender_location, $n)
-                             return $t2.tweetid
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/issue730.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/issue730.aql
deleted file mode 100644
index 5d8d7e9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/issue730.aql
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use an available rtree index in index subtree.
- * Issue        : 730
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as {
-screen_name: string,
-lang: string,
-friends_count: int32,
-statuses_count: int32,
-name: string,
-followers_count: int32
-}
-
-create type TweetMessageType as {
-tweetid: int64,
-user: TwitterUserType,
-sender_location: point?,
-send_time: datetime,
-referred_topics: {{ string }},
-message_text: string
-}
-
-create dataset TweetMessages(TweetMessageType) primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender_location) type rtree;
-
-set 'compiler.indexonly' "false";
-
-for $t1 in dataset('TweetMessages')
-where $t1.send_time >= datetime('2011-06-18T14:10:17') and $t1.send_time < datetime('2011-06-18T15:10:17')
-let $n :=  create-circle($t1.sender_location, 5.0)
-return {
-"message": $t1.tweetid,
-"nearby-message": for $t2 in dataset('TweetMessages')
-                             where spatial-intersect($t2.sender_location, $n)
-                             return $t2.tweetid
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01-index-only.aql
deleted file mode 100644
index 016edcb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01-index-only.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree
- *              : and another for secondary rtree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender-location) type rtree;
-create index msgCountAIx on TweetMessages(countA) type btree;
-create index msgCountBIx on TweetMessages(countB) type btree;
-create index msgTextIx on TweetMessages(message-text) type keyword;
-
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_01.adm";
-
-for $t1 in dataset('TweetMessages')
-let $n :=  create-circle($t1.sender-location, 0.5)
-where $t1.tweetid < int64("10")
-order by $t1.tweetid
-return {
-"tweetid1": $t1.tweetid,
-"loc1":$t1.sender-location,
-"nearby-message": for $t2 in dataset('TweetMessages')
-                             where spatial-intersect($t2.sender-location, $n)
-                             order by $t2.tweetid
-                             return {"tweetid2":$t2.tweetid, "loc2":$t2.sender-location}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql
deleted file mode 100644
index de11a36..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree
- *              : and another for secondary rtree index in index subtree.
- * Issue        : 730, 741
- * Expected Res : Success
- * Date         : 8th May 2014
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int32,
-    statuses-count: int32,
-    name: string,
-    followers-count: int32
-}
-
-create type TweetMessageType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int32,
-    countB: int32
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender-location) type rtree;
-create index msgCountAIx on TweetMessages(countA) type btree;
-create index msgCountBIx on TweetMessages(countB) type btree;
-create index msgTextIx on TweetMessages(message-text) type keyword;
-
-set 'compiler.indexonly' "false";
-
-for $t1 in dataset('TweetMessages')
-let $n :=  create-circle($t1.sender-location, 0.5)
-where $t1.tweetid < int64("10")
-order by $t1.tweetid
-return {
-"tweetid1": $t1.tweetid,
-"loc1":$t1.sender-location,
-"nearby-message": for $t2 in dataset('TweetMessages')
-                             where spatial-intersect($t2.sender-location, $n)
-                             order by $t2.tweetid
-                             return {"tweetid2":$t2.tweetid, "loc2":$t2.sender-location}
-};
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/query-issue838.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/query-issue838.aql
deleted file mode 100644
index c152f0d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/query-issue838.aql
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : This test case is to verify the fix for issue838
- * https://code.google.com/p/asterixdb/issues/detail?id=838
- * Expected Res : SUCCESS
- * Date         : 18 Dec. 2014
- */
-drop dataverse twitter if exists;
-create dataverse twitter;
-use dataverse twitter;
-
-create type TweetMessageType as closed {
-  tweetid: int64,
-  sender-location: point,
-  text: string
-}
-
-create type TweetHistorySubscription as open{
-  subscription-id: int32,
-  location: point
-}
-
-create dataset TweetHistorySubscriptions(TweetHistorySubscription)
-primary key subscription-id;
-create index testa on TweetHistorySubscriptions(location) type rtree;
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-create index locationIdx on TweetMessages(sender-location) type rtree;
-
-write output to asterix_nc1:"rttest/query-issue838.adm";
-
-for $sub in dataset TweetHistorySubscriptions
-let $location := $sub.location
-for $text in (
-  for $tweet in dataset TweetMessages
-    let $circle := create-circle($location,30.0)
-    where spatial-intersect($tweet.sender-location, $circle)
-    return $tweet
-)
-return {
-    "subscription-id":$sub.subscription-id,
-    "changeSet":1,
-    "execution-time":current-datetime(),
-    "message-text":$text
-}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-intersect-point_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-intersect-point_01.aql
deleted file mode 100644
index 4a82561..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-intersect-point_01.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Joins two datasets on the intersection of their point attributes.
- *                  The dataset 'MyData1' has an RTree index, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create dataset MyData1(MyRecord) primary key id;
-create dataset MyData2(MyRecord) primary key id;
-
-create index rtree_index on MyData1(point) type rtree;
-
-write output to asterix_nc1:"rttest/index-join_rtree-spatial-intersect-point.adm";
-
-for $b in dataset('MyData2')
-for $a in dataset('MyData1')
-where spatial-intersect($a.point, $b.point)
-return {"a": $a, "b": $b}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-intersect-point_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-intersect-point_04.aql
deleted file mode 100644
index 7d45139..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-intersect-point_04.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self-joins a dataset on the intersection of its point and rectangle attribute.
- *                  The dataset has an RTree index, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- *                : In fact, this is an index-only plan and the optimized plan should show two paths.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create dataset MyData(MyRecord) primary key id;
-
-create index rtree_rec_index on MyData(rec) type rtree;
-
-for $a in dataset('MyData')
-for $b in dataset('MyData')
-where spatial-intersect($a.point, $b.rec)
-return {"a": $a.id, "b": $b.rec}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-intersect-point_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-intersect-point_05.aql
deleted file mode 100644
index 6fde6ba..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-intersect-point_05.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self-joins a dataset on the intersection of its point attributes.
- *                  The dataset has an RTree index, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- *                : In fact, this is an index-only plan and the optimized plan should show two paths.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle
-}
-
-create dataset MyData(MyRecord) primary key id;
-
-create index rtree_point_index on MyData(point) type rtree;
-
-for $a in dataset('MyData')
-for $b in dataset('MyData')
-where spatial-intersect($a.point, $b.point)
-return {"a": $a.id, "b": $b.point}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-self-intersect-point-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-self-intersect-point-index-only.aql
deleted file mode 100644
index f47d4bd..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-self-intersect-point-index-only.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self-joins on a dataset on the intersection of a point attribute.
- *                  The dataset 'TweetMessages' has an RTree index, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int64,
-    statuses-count: int64,
-    name: string,
-    followers-count: int64
-}
-
-create type TweetMessageType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int64,
-    countB: int64
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender-location) type rtree;
-create index msgCountAIx on TweetMessages(countA) type btree;
-create index msgCountBIx on TweetMessages(countB) type btree;
-create index msgTextIx on TweetMessages(message-text) type keyword;
-
-for $t1 in dataset('TweetMessages')
-for $t2 in dataset('TweetMessages')
-let $n :=  create-circle($t1.sender-location, 0.5)
-where spatial-intersect($t2.sender-location, $n)
-order by $t2.tweetid
-return {"tweetid2":$t2.tweetid, "loc2":$t2.sender-location};
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-self-intersect-point.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-self-intersect-point.aql
deleted file mode 100644
index 473bc36..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index-join/spatial-self-intersect-point.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Self-joins on a dataset on the intersection of a point attribute.
- *                  The dataset 'TweetMessages' has an RTree index, and we expect the
- *                  join to be transformed into an indexed nested-loop join.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type TwitterUserType as closed {
-    screen-name: string,
-    lang: string,
-    friends-count: int64,
-    statuses-count: int64,
-    name: string,
-    followers-count: int64
-}
-
-create type TweetMessageType as closed {
-    tweetid: int64,
-        user: TwitterUserType,
-        sender-location: point,
-    send-time: datetime,
-        referred-topics: {{ string }},
-    message-text: string,
-    countA: int64,
-    countB: int64
-}
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid;
-
-create index twmSndLocIx on TweetMessages(sender-location) type rtree;
-create index msgCountAIx on TweetMessages(countA) type btree;
-create index msgCountBIx on TweetMessages(countB) type btree;
-create index msgTextIx on TweetMessages(message-text) type keyword;
-
-set 'compiler.indexonly' "false";
-
-for $t1 in dataset('TweetMessages')
-for $t2 in dataset('TweetMessages')
-let $n :=  create-circle($t1.sender-location, 0.5)
-where spatial-intersect($t2.sender-location, $n)
-order by $t2.tweetid
-return {"tweetid2":$t2.tweetid, "loc2":$t2.sender-location};
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-02.aql
deleted file mode 100644
index e82a527..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-02.aql
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary RTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary RTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                                union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
-  row_id: int32,
-  sid: int32,
-  date: string,
-  day: int32,
-  time: string,
-  bpm: int32,
-  RR: float,
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
-  row_id: int32,
-  sid: int32,
-  date: date,
-  day: int32,
-  time: time,
-  bpm: int32,
-  RR: float,
-
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-};
-
-/* Create dataset for loading raw Fragile data */
-create dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create dataset Fragile (FragileType)
-primary key row_id;
-
-
-/* Create rtree secondary index on dataset clean Fragile */
-create index cfLocation on Fragile(location) type rtree;
-create index cfLocation on Fragile_raw(location) type rtree;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-let $area:=create-rectangle(point("0.0,0.0"), point("4.0,4.0"))
-for $o in dataset('MyData')
-where spatial-intersect($o.point, $area)
-order by $o.id
-return {"id":$o.id}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-03.aql
deleted file mode 100644
index abb15e1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-03.aql
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary RTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary RTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                                union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
-  row_id: int32,
-  sid: int32,
-  date: string,
-  day: int32,
-  time: string,
-  bpm: int32,
-  RR: float,
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
-  row_id: int32,
-  sid: int32,
-  date: date,
-  day: int32,
-  time: time,
-  bpm: int32,
-  RR: float,
-
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-};
-
-/* Create dataset for loading raw Fragile data */
-create dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create dataset Fragile (FragileType)
-primary key row_id;
-
-
-/* Create rtree secondary index on dataset clean Fragile */
-create index cfLocation on Fragile(location) type rtree;
-create index cfLocation on Fragile_raw(location) type rtree;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-let $area:=create-rectangle(point("0.0,0.0"), point("4.0,4.0"))
-for $o in dataset('MyData')
-where spatial-intersect($o.point, $area)
-order by $o.id
-return {"point":$o.point}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-04.aql
deleted file mode 100644
index 27e9509..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-04.aql
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary RTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary RTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                                union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
-  row_id: int32,
-  sid: int32,
-  date: string,
-  day: int32,
-  time: string,
-  bpm: int32,
-  RR: float,
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
-  row_id: int32,
-  sid: int32,
-  date: date,
-  day: int32,
-  time: time,
-  bpm: int32,
-  RR: float,
-
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-};
-
-/* Create dataset for loading raw Fragile data */
-create dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create dataset Fragile (FragileType)
-primary key row_id;
-
-
-/* Create rtree secondary index on dataset clean Fragile */
-create index cfLocation on Fragile(location) type rtree;
-create index cfLocation on Fragile_raw(location) type rtree;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-let $area:=create-rectangle(point("0.0,0.0"), point("4.0,4.0"))
-for $o in dataset('MyData')
-where spatial-intersect($o.point, $area)
-order by $o.id
-return {"id":$o.id, "point":$o.point}
-);
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-05.aql
deleted file mode 100644
index ad94c18..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-05.aql
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary RTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary RTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                                union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
-  row_id: int32,
-  sid: int32,
-  date: string,
-  day: int32,
-  time: string,
-  bpm: int32,
-  RR: float,
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
-  row_id: int32,
-  sid: int32,
-  date: date,
-  day: int32,
-  time: time,
-  bpm: int32,
-  RR: float,
-
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-};
-
-/* Create dataset for loading raw Fragile data */
-create dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create dataset Fragile (FragileType)
-primary key row_id;
-
-
-/* Create rtree secondary index on dataset clean Fragile */
-create index cfLocation on Fragile(location) type rtree;
-create index cfLocation on Fragile_raw(location) type rtree;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-let $area:=create-rectangle(point("0.0,0.0"), point("4.0,4.0"))
-for $o in dataset('MyData')
-where spatial-intersect($o.point, $area)
-order by $o.id
-return {"id":$o.id}
-);
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-06.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-06.aql
deleted file mode 100644
index d4e4d46..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-06.aql
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary RTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary RTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                                union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
-  row_id: int32,
-  sid: int32,
-  date: string,
-  day: int32,
-  time: string,
-  bpm: int32,
-  RR: float,
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
-  row_id: int32,
-  sid: int32,
-  date: date,
-  day: int32,
-  time: time,
-  bpm: int32,
-  RR: float,
-
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-};
-
-/* Create dataset for loading raw Fragile data */
-create dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create dataset Fragile (FragileType)
-primary key row_id;
-
-
-/* Create rtree secondary index on dataset clean Fragile */
-create index cfLocation on Fragile(location) type rtree;
-create index cfLocation on Fragile_raw(location) type rtree;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-let $area:=create-rectangle(point("0.0,0.0"), point("4.0,4.0"))
-for $o in dataset('MyData')
-where spatial-intersect($o.point, $area)
-order by $o.id
-return {"point":$o.point}
-);
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-07.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-07.aql
deleted file mode 100644
index 6564565..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-07.aql
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary RTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary RTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                                union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
-  row_id: int32,
-  sid: int32,
-  date: string,
-  day: int32,
-  time: string,
-  bpm: int32,
-  RR: float,
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
-  row_id: int32,
-  sid: int32,
-  date: date,
-  day: int32,
-  time: time,
-  bpm: int32,
-  RR: float,
-
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-};
-
-/* Create dataset for loading raw Fragile data */
-create dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create dataset Fragile (FragileType)
-primary key row_id;
-
-
-/* Create rtree secondary index on dataset clean Fragile */
-create index cfLocation on Fragile(location) type rtree;
-create index cfLocation on Fragile_raw(location) type rtree;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-let $area:=create-rectangle(point("0.0,0.0"), point("4.0,4.0"))
-for $o in dataset('MyData')
-where spatial-intersect($o.point, $area)
-order by $o.id
-return {"rec":$o, "id":$o.id}
-);
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-08.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-08.aql
deleted file mode 100644
index 6c67c49..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-08.aql
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary RTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary RTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                                union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
-  row_id: int32,
-  sid: int32,
-  date: string,
-  day: int32,
-  time: string,
-  bpm: int32,
-  RR: float,
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
-  row_id: int32,
-  sid: int32,
-  date: date,
-  day: int32,
-  time: time,
-  bpm: int32,
-  RR: float,
-
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-};
-
-/* Create dataset for loading raw Fragile data */
-create dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create dataset Fragile (FragileType)
-primary key row_id;
-
-
-/* Create rtree secondary index on dataset clean Fragile */
-create index cfLocation on Fragile(location) type rtree;
-create index cfLocation on Fragile_raw(location) type rtree;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-let $area:=create-rectangle(point("0.0,0.0"), point("4.0,4.0"))
-for $o in dataset('MyData')
-where spatial-intersect($o.point, $area)
-order by $o.id
-return $o
-);
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-09.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-09.aql
deleted file mode 100644
index d6ec571..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-index/rtree-sidx-idxonly-09.aql
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary RTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary RTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                                union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
-  row_id: int32,
-  sid: int32,
-  date: string,
-  day: int32,
-  time: string,
-  bpm: int32,
-  RR: float,
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
-  row_id: int32,
-  sid: int32,
-  date: date,
-  day: int32,
-  time: time,
-  bpm: int32,
-  RR: float,
-
-  /* new string field and location field*/
-  text: string,
-  location: point,
-  text2: string
-};
-
-/* Create dataset for loading raw Fragile data */
-create dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create dataset Fragile (FragileType)
-primary key row_id;
-
-
-/* Create rtree secondary index on dataset clean Fragile */
-create index cfLocation on Fragile(location) type rtree;
-create index cfLocation on Fragile_raw(location) type rtree;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-let $area:=create-circle(create-point(4.0,3.0), 5.0)
-for $o in dataset('MyData')
-where spatial-intersect($o.point, $area)
-order by $o.id
-return {"id":$o.id}
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-index-only.aql
deleted file mode 100644
index 2c1deb3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-index-only.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
-
-create dataset MyData(MyRecord)
-  primary key id with {"node-group":{"name":"group1"}};
-
-load dataset MyData 
-using localfs
-(("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
-
-create index rtree_index_point on MyData(point) type rtree;
-
-
-write output to asterix_nc1:"rttest/index_rtree-secondary-index.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, create-polygon([4.0,1.0,4.0,4.0,12.0,4.0,12.0,1.0]))
-return {"id":$o.id}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-open-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-open-index-only.aql
deleted file mode 100644
index 03acb15..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-open-index-only.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
-
-create dataset MyData(MyRecord)
-  primary key id with {"node-group":{"name":"group1"}};
-
-load dataset MyData
-using localfs
-(("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
-
-create index rtree_index_point on MyData(point) type rtree;
-
-
-write output to asterix_nc1:"rttest/index_rtree-secondary-index-open.adm";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, create-polygon([4.0,1.0,4.0,4.0,12.0,4.0,12.0,1.0]))
-return {"id":$o.id}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-open.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-open.aql
deleted file mode 100644
index f0f2855..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-open.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
-
-create dataset MyData(MyRecord)
-  primary key id with {"node-group":{"name":"group1"}};
-
-load dataset MyData
-using localfs
-(("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
-
-create index rtree_index_point on MyData(point) type rtree;
-
-set 'compiler.indexonly' "false";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, create-polygon([4.0,1.0,4.0,4.0,12.0,4.0,12.0,1.0]))
-return {"id":$o.id}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index.aql
deleted file mode 100644
index 6a2b459..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
-
-create dataset MyData(MyRecord)
-  primary key id with {"node-group":{"name":"group1"}};
-
-load dataset MyData
-using localfs
-(("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
-
-create index rtree_index_point on MyData(point) type rtree;
-
-set 'compiler.indexonly' "false";
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, create-polygon([4.0,1.0,4.0,4.0,12.0,4.0,12.0,1.0]))
-return {"id":$o.id}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete-all.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete-all.aql
deleted file mode 100644
index 0e37727..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete-all.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse tpch if exists;
-create dataverse tpch;
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-create type LineIDType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset LineItems_q1(LineItemType)
-  primary key l_orderkey with {"node-group":{"name":"group1"}};
-
-create dataset LineID(LineIDType)
-  primary key l_orderkey with {"node-group":{"name":"group1"}};
-
-delete $l from dataset LineItems_q1;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete-rtree-secondary-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete-rtree-secondary-index.aql
deleted file mode 100644
index 06a8a9e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete-rtree-secondary-index.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
-
-create dataset MyData(MyRecord)
-  primary key id with {"node-group":{"name":"group1"}};
-
-load dataset MyData 
-using localfs
-(("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
-
-create index rtree_index_point on MyData(point) type rtree;
-
-delete $m from dataset MyData where $m.id>5;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete.aql
deleted file mode 100644
index 4247764..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete.aql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse tpch if exists;
-create dataverse tpch;
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-
-create type LineIDType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset LineItems_q1(LineItemType)
-  primary key l_orderkey with {"node-group":{"name":"group1"}};
-
-create dataset LineID(LineIDType)
-  primary key l_orderkey with {"node-group":{"name":"group1"}};
-
-delete $l from dataset LineItems_q1 where $l.l_shipdate <= '1998-09-02';
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-insert-secondary-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-insert-secondary-index.aql
deleted file mode 100644
index f98d5c7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-insert-secondary-index.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse tpch if exists;
-create dataverse tpch;
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int32,
-  l_partkey: int32,
-  l_suppkey: int32,
-  l_linenumber: int32,
-  l_quantity: double,
-  l_extendedprice: double,
-  l_discount: double,
-  l_tax: double,
-  l_returnflag: string,
-  l_linestatus: string,
-  l_shipdate: string,
-  l_commitdate: string,
-  l_receiptdate: string,
-  l_shipinstruct: string,
-  l_shipmode: string,
-  l_comment: string
-}
-
-create type LineIDType as closed {
-  l_orderkey: int32,
-  l_partkey: int32,
-  l_suppkey: int32
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset LineItems_q1(LineItemType)
-  primary key l_orderkey with {"node-group":{"name":"group1"}};
-
-create dataset LineID(LineIDType)
-  primary key l_orderkey with {"node-group":{"name":"group1"}};
-
-create index idx_LineID_partkey on LineID(l_partkey);
-create index idx_LineID_suppkey on LineID(l_suppkey);
-
-insert into dataset LineID (
-for $l in dataset('LineItems_q1')
-//    where $l.l_shipdate <= '1998-09-02'
-    return {
-        "l_orderkey": $l.l_orderkey,
-        "l_partkey": $l.l_partkey,
-        "l_suppkey": $l.l_partkey
-    }
-);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-insert.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-insert.aql
deleted file mode 100644
index 289d4f0..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-insert.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse tpch if exists;
-create dataverse tpch;
-use dataverse tpch;
-
-create type LineItemType as closed {
-  l_orderkey: int32,
-  l_partkey: int32,
-  l_suppkey: int32,
-  l_linenumber: int32,
-  l_quantity: double,
-  l_extendedprice: double,
-  l_discount: double,
-  l_tax: double,
-  l_returnflag: string,
-  l_linestatus: string,
-  l_shipdate: string,
-  l_commitdate: string,
-  l_receiptdate: string,
-  l_shipinstruct: string,
-  l_shipmode: string,
-  l_comment: string
-}
-
-create type LineIDType as closed {
-  l_orderkey: int32,
-  l_partkey: int32,
-  l_suppkey: int32
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset LineItems_q1(LineItemType)
-  primary key l_orderkey with {"node-group":{"name":"group1"}};
-
-create dataset LineID(LineIDType)
-  primary key l_orderkey with {"node-group":{"name":"group1"}};
-
-insert into dataset LineID (
-for $l in dataset('LineItems_q1')
-//    where $l.l_shipdate <= '1998-09-02'
-    return {
-        "l_orderkey": $l.l_orderkey,
-        "l_partkey": $l.l_partkey,
-        "l_suppkey": $l.l_partkey
-    }
-);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/select-self-join.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/select-self-join.aql
deleted file mode 100644
index 720bacdc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/select-self-join.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that self-join on primary key with select introduces surrogate join.
- * Success        : Yes
- */
- 
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"opttest/select-self-join.adm";
-
-create type empType as open {
-id: int,
-sal: int
-}
-
-create dataset Emps(empType) primary key id;
-
-for $e1 in dataset Emps
-for $e2 in (for $e3 in dataset Emps where $e3.sal > 1000 return $e3)
-where $e1.id = $e2.id
-return $e1
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_01.aql
deleted file mode 100644
index 0cdb106..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_01.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                  Replacement should happen because of a "<=" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_01.adm";
-
-for $o in dataset('DBLP')
-let $ed := edit-distance($o.authors, "Michael J. Carey")
-where $ed <= 2
-return $ed
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_02.aql
deleted file mode 100644
index 3cbd754f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_02.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Tests that the optimizer drills through the let clause. 
- *                  Replacement should happen because of a reverse "<=" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_02.adm";
-
-for $o in dataset('DBLP')
-let $ed := edit-distance($o.authors, "Michael J. Carey")
-where 2 >= $ed
-return $ed
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_03.aql
deleted file mode 100644
index ad10756..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_03.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                  Replacement should happen because of a "<" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_03.adm";
-
-for $o in dataset('DBLP')
-let $ed := edit-distance($o.authors, "Michael J. Carey")
-where $ed < 3
-return $ed
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_04.aql
deleted file mode 100644
index 8f71201..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_04.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                  Replacement should happen because of a reverse "<" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_04.adm";
-
-for $o in dataset('DBLP')
-let $ed := edit-distance($o.authors, "Michael J. Carey")
-where 3 > $ed
-return $ed
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_05.aql
deleted file mode 100644
index eee8d8c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_05.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                  Replacement should *not* happen because of a ">=" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_05.adm";
-
-for $o in dataset('DBLP')
-let $ed := edit-distance($o.authors, "Michael J. Carey")
-where $ed >= 2
-return $ed
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_06.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_06.aql
deleted file mode 100644
index cb99bb3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_06.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                   Replacement should *not* happen because of a reverse ">=" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_06.adm";
-
-for $o in dataset('DBLP')
-let $ed := edit-distance($o.authors, "Michael J. Carey")
-where 2 <= $ed
-return $ed
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_07.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_07.aql
deleted file mode 100644
index beaef2e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_07.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                  Replacement should *not* happen because of a ">" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_07.adm";
-
-for $o in dataset('DBLP')
-let $ed := edit-distance($o.authors, "Michael J. Carey")
-where $ed > 2
-return $ed
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_08.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_08.aql
deleted file mode 100644
index 897c620..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-let-to-edit-distance-check_08.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                  Replacement should *not* happen because of a reverse ">" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_08.adm";
-
-for $o in dataset('DBLP')
-let $ed := edit-distance($o.authors, "Michael J. Carey")
-where 2 < $ed
-return $ed
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_01.aql
deleted file mode 100644
index 7b02d92..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_01.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Replacement should happen because of a "<=" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_01.adm";
-
-for $o in dataset('DBLP')
-where edit-distance($o.authors, "Michael J. Carey") <= 2
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_02.aql
deleted file mode 100644
index b14939f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_02.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Replacement should happen because of a reverse "<=" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_02.adm";
-
-for $o in dataset('DBLP')
-where 2 >= edit-distance($o.authors, "Michael J. Carey")
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_03.aql
deleted file mode 100644
index 00d0380..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_03.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Replacement should happen because of a "<" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_03.adm";
-
-for $o in dataset('DBLP')
-where edit-distance($o.authors, "Michael J. Carey") < 3
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_04.aql
deleted file mode 100644
index ceafc8f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_04.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Replacement should happen because of a reverse "<" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_04.adm";
-
-for $o in dataset('DBLP')
-where 3 > edit-distance($o.authors, "Michael J. Carey")
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_05.aql
deleted file mode 100644
index c463f8d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_05.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Replacement should *not* happen because of a ">=" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_05.adm";
-
-// We cannot introduce edit-distance-check because the condition is >=
-for $o in dataset('DBLP')
-where edit-distance($o.authors, "Michael J. Carey") >= 2
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_06.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_06.aql
deleted file mode 100644
index 2723e7f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_06.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Replacement should *not* happen because of a reverse ">=" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_06.adm";
-
-// We cannot introduce edit-distance-check because the condition is <=
-for $o in dataset('DBLP')
-where 2 <= edit-distance($o.authors, "Michael J. Carey")
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_07.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_07.aql
deleted file mode 100644
index fcae8d9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_07.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Replacement should *not* happen because of a ">" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_07.adm";
-
-// We cannot introduce edit-distance-check because the condition is >
-for $o in dataset('DBLP')
-where edit-distance($o.authors, "Michael J. Carey") > 2
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_08.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_08.aql
deleted file mode 100644
index e6c42dc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/edit-distance-to-edit-distance-check_08.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
- *                  into edit-distance-check if possible.
- *                  Replacement should *not* happen because of a reverse ">" condition on the edit distance.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_08.adm";
-
-// We cannot introduce edit-distance-check because the condition is <
-for $o in dataset('DBLP')
-where 2 < edit-distance($o.authors, "Michael J. Carey")
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/fuzzyeq-to-edit-distance-check.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/fuzzyeq-to-edit-distance-check.aql
deleted file mode 100644
index 6a93ed9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/fuzzyeq-to-edit-distance-check.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the FuzzyEqRule rewrites ~= using edit distance 
- *                  into edit-distance-check.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_fuzzyeq-to-edit-distance-check.adm";
-
-set simfunction 'edit-distance';
-set simthreshold '1';
-
-// Tests two rules: FuzzyEqRule and SimilarityCheckRule
-for $o in dataset('DBLP')
-where $o.authors ~= "Michael J. Carey"
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/fuzzyeq-to-jaccard-check.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/fuzzyeq-to-jaccard-check.aql
deleted file mode 100644
index 3fd8edb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/fuzzyeq-to-jaccard-check.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the FuzzyEqRule rewrites ~= using Jaccard 
- *                  into edit-distance-check.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_fuzzyeq-to-jaccard-check.adm";
-
-set simfunction 'jaccard';
-set simthreshold '0.8f';
-
-// Tests two rules: FuzzyEqRule and SimilarityCheckRule
-for $paper in dataset('DBLP')
-where word-tokens($paper.title) ~= word-tokens("Transactions for Cooperative Environments")
-return $paper
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_01.aql
deleted file mode 100644
index 6ec46d7..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_01.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                  Replacement should happen because of a ">=" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
-
-for $paper in dataset('DBLP')
-let $jacc := similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments"))
-where $jacc >= 0.8f
-return $jacc
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_02.aql
deleted file mode 100644
index 267a16e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_02.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                  Replacement should happen because of a reverse ">=" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
-
-for $paper in dataset('DBLP')
-let $jacc := similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments"))
-where 0.8f <= $jacc 
-return $jacc
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_03.aql
deleted file mode 100644
index e83c79f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_03.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                  Replacement should happen because of a ">" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
-
-for $paper in dataset('DBLP')
-let $jacc := similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments"))
-where $jacc > 0.8f
-return $jacc
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_04.aql
deleted file mode 100644
index 6833b4b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_04.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                  Replacement should happen because of a reverse ">" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
-
-for $paper in dataset('DBLP')
-let $jacc := similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments"))
-where 0.8f < $jacc 
-return $jacc
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_05.aql
deleted file mode 100644
index 70b43ba..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_05.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                  Replacement should *not* happen because of a "<=" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
-
-for $paper in dataset('DBLP')
-let $jacc := similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments"))
-where $jacc <= 0.8f
-return $jacc
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_06.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_06.aql
deleted file mode 100644
index de9a9ad..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_06.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                  Replacement should *not* happen because of a reverse "<=" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
-
-for $paper in dataset('DBLP')
-let $jacc := similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments"))
-where 0.8f >= $jacc 
-return $jacc
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_07.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_07.aql
deleted file mode 100644
index 5ffdaaf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_07.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                  Replacement should *not* happen because of a "<" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
-
-for $paper in dataset('DBLP')
-let $jacc := similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments"))
-where $jacc < 0.8f
-return $jacc
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_08.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_08.aql
deleted file mode 100644
index 0009992..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-let-to-jaccard-check_08.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Tests that the optimizer drills through the let clause.
- *                  Replacement should *not* happen because of a reverse "<" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
-
-for $paper in dataset('DBLP')
-let $jacc := similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments"))
-where 0.8f > $jacc 
-return $jacc
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-similarity-join-dual-order.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-similarity-join-dual-order.aql
deleted file mode 100644
index ca88a9e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-similarity-join-dual-order.aql
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests the plan of runtimes/fuzzyjoin/basic_1_3_1/6
- * Success        : Yes
- */
-
-drop dataverse fuzzyjoin_basic if exists;
-
-create dataverse fuzzyjoin_basic;
-
-use dataverse fuzzyjoin_basic;
-
-create type BasicType as closed {
-    id: uuid,
-    authors: string
-}
-
-create dataset left(BasicType) primary key id autogenerated;
-create dataset right(BasicType) primary key id autogenerated;
-
-write output to asterix_nc1:"rttest/jaccard-similarity-join-right-ahead.adm";
-
-set import-private-functions 'true'
-
-for $right in dataset('right')
-let $idRight := $right.id
-let $tokensUnrankedRight := word-tokens($right.authors)
-let $lenRight := len($tokensUnrankedRight)
-let $tokensRight :=
-    for $tokenUnranked in $tokensUnrankedRight
-    for $tokenRanked at $i in
-        //
-        // -- - Stage 1 - --
-        //
-        for $r in
-            for $orderRight in dataset('right')
-            let $rightId := $orderRight.id
-            for $orderTokenRight in word-tokens($orderRight.authors)
-                /*+ hash */ group by $tokenRightGrouped := $orderTokenRight with $rightId
-            return {"rt": $tokenRightGrouped, "rc": count($rightId)}
-        for $l in
-            for $orderLeft in dataset('left')
-            let $leftId := $orderLeft.id
-            for $orderTokenLeft in word-tokens($orderLeft.authors)
-                /*+ hash */ group by $tokenLeftGrouped := $orderTokenLeft with $leftId
-            return {"lt": $tokenLeftGrouped, "lc": count($leftId)}
-        where $r.rt = $l.lt
-        /*+ inmem 1 302 */ order by $r.rc * $l.lc
-        return $r.rt
-
-    where $tokenUnranked = /*+ hash-bcast */ $tokenRanked
-    order by $i
-    return $i
-for $prefixTokenRight in subset-collection($tokensRight, 0, prefix-len-jaccard(len($tokensRight), .8f))
-
-for $left in dataset('left')
-let $idLeft := $left.id
-let $tokensUnrankedLeft := word-tokens($left.authors)
-let $lenLeft := len($tokensUnrankedLeft)
-let $tokensLeft :=
-    for $tokenUnranked in $tokensUnrankedLeft
-    for $tokenRanked at $i in
-        //
-        // -- - Stage 1 - --
-        //
-        for $r in
-            for $orderRight in dataset('right')
-            let $rightId := $orderRight.id
-            for $orderTokenRight in word-tokens($orderRight.authors)
-                /*+ hash */ group by $tokenRightGrouped := $orderTokenRight with $rightId
-            return {"rt": $tokenRightGrouped, "rc": count($rightId)}
-        for $l in
-            for $orderLeft in dataset('left')
-            let $leftId := $orderLeft.id
-            for $orderTokenLeft in word-tokens($orderLeft.authors)
-                /*+ hash */ group by $tokenLeftGrouped := $orderTokenLeft with $leftId
-            return {"lt": $tokenLeftGrouped, "lc": count($leftId)}
-        where $r.rt = $l.lt
-        /*+ inmem 1 302 */ order by $r.rc * $l.lc
-        return $r.rt
-
-    where $tokenUnranked = /*+ hash-bcast */ $tokenRanked
-    order by $i
-    return $i
-let $actualPrefixLen := prefix-len-jaccard(len($tokensUnrankedLeft), .8f) - len($tokensUnrankedLeft) + len($tokensLeft)
-for $prefixTokenLeft in subset-collection($tokensLeft, 0, $actualPrefixLen)
-
-where $prefixTokenRight = $prefixTokenLeft
-let $sim := similarity-jaccard-prefix($lenRight, $tokensRight, $lenLeft, $tokensLeft, $prefixTokenLeft, .8f)
-where $sim >= .8f
-/*+ hash*/ group by $idRight := $idRight, $idLeft := $idLeft with $sim
-return {'idDBLP': $idRight, 'idCSX': $idLeft, "sim": $sim[0]}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-similarity-join-right-ahead.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-similarity-join-right-ahead.aql
deleted file mode 100644
index 20f6912..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-similarity-join-right-ahead.aql
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests the plan of runtimes/fuzzyjoin/basic_1_3_1/5
- * Success        : Yes
- */
-
-drop dataverse fuzzyjoin_basic if exists;
-
-create dataverse fuzzyjoin_basic;
-
-use dataverse fuzzyjoin_basic;
-
-create type BasicType as closed {
-    id: uuid,
-    authors: string
-}
-
-create dataset left(BasicType) primary key id autogenerated;
-create dataset right(BasicType) primary key id autogenerated;
-
-write output to asterix_nc1:"rttest/jaccard-similarity-join-right-ahead.adm";
-
-set import-private-functions 'true'
-
-for $right in dataset('right')
-let $idRight := $right.id
-let $tokensUnrankedRight := word-tokens($right.authors)
-let $lenRight := len($tokensUnrankedRight)
-let $tokensRight :=
-    for $tokenUnranked in $tokensUnrankedRight
-    for $tokenRanked at $i in
-        //
-        // -- - Stage 1 - --
-        //
-        for $orderRight in dataset('right')
-        let $rightId := $orderRight.id
-        for $orderTokenRight in word-tokens($orderRight.authors)
-            /*+ hash */ group by $tokenRightGrouped := $orderTokenRight with $rightId
-        /*+ inmem 1 302 */ order by count($rightId)
-        return $tokenRightGrouped
-    where $tokenUnranked = /*+ hash-bcast */ $tokenRanked
-    order by $i
-    return $i
-for $prefixTokenRight in subset-collection($tokensRight, 0, prefix-len-jaccard(len($tokensRight), .8f))
-
-for $left in dataset('left')
-let $idLeft := $left.id
-let $tokensUnrankedLeft := word-tokens($left.authors)
-let $lenLeft := len($tokensUnrankedLeft)
-let $tokensLeft :=
-    for $tokenUnranked in $tokensUnrankedLeft
-    for $tokenRanked at $i in
-        //
-        // -- - Stage 1 - --
-        //
-        for $orderRight in dataset('right')
-        let $rightId := $orderRight.id
-        for $orderTokenRight in word-tokens($orderRight.authors)
-            /*+ hash */ group by $tokenRightGrouped := $orderTokenRight with $rightId
-        /*+ inmem 1 302 */ order by count($rightId)
-        return $tokenRightGrouped
-    where $tokenUnranked = /*+ hash-bcast */ $tokenRanked
-    order by $i
-    return $i
-let $actualPrefixLen := prefix-len-jaccard(len($tokensUnrankedLeft), .8f) - len($tokensUnrankedLeft) + len($tokensLeft)
-for $prefixTokenLeft in subset-collection($tokensLeft, 0, $actualPrefixLen)
-
-where $prefixTokenRight = $prefixTokenLeft
-let $sim := similarity-jaccard-prefix($lenRight, $tokensRight, $lenLeft, $tokensLeft, $prefixTokenLeft, .8f)
-where $sim >= .8f
-/*+ hash*/ group by $idRight := $idRight, $idLeft := $idLeft with $sim
-return {'idDBLP': $idRight, 'idCSX': $idLeft, "sim": $sim[0]}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_01.aql
deleted file mode 100644
index b69ae65..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_01.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Replacement should happen because of a ">=" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_01.adm";
-
-for $paper in dataset('DBLP')
-where similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments")) >= 0.8f
-return $paper
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_02.aql
deleted file mode 100644
index 0f72ccf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_02.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Replacement should happen because of a reverse ">=" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_02.adm";
-
-for $paper in dataset('DBLP')
-where 0.8f <= similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments"))
-return $paper
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_03.aql
deleted file mode 100644
index 717c9f9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_03.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Replacement should happen because of a ">" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_02.adm";
-
-for $paper in dataset('DBLP')
-where similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments")) > 0.8f
-return $paper
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_04.aql
deleted file mode 100644
index 150eb5c..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_04.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Replacement should happen because of a reverse ">" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_03.adm";
-
-for $paper in dataset('DBLP')
-where 0.8f < similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments"))
-return $paper
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_05.aql
deleted file mode 100644
index 0312d8a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_05.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Replacement should *not* happen because of a "<=" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_05.adm";
-
-// We cannot introduce jaccard-check because the condition is <=
-for $paper in dataset('DBLP')
-where similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments")) <= 0.8f
-return $paper
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_06.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_06.aql
deleted file mode 100644
index 55ebbb6..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_06.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Replacement should *not* happen because of a reverse "<=" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_06.adm";
-
-// We cannot introduce jaccard-check because the condition is >=
-for $paper in dataset('DBLP')
-where 0.8f >= similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments"))
-return $paper
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_07.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_07.aql
deleted file mode 100644
index 06b1bc9..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_07.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Replacement should *not* happen because of a "<" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_07.adm";
-
-// We cannot introduce jaccard-check because the condition is <
-for $paper in dataset('DBLP')
-where similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments")) < 0.8f
-return $paper
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_08.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_08.aql
deleted file mode 100644
index d88bcb1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/similarity/jaccard-to-jaccard-check_08.aql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
- *                  into similarity-jaccard-check-check if possible.
- *                  Replacement should *not* happen because of a reverse "<" condition on the similarity.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_08.adm";
-
-// We cannot introduce jaccard-check because the condition is >
-for $paper in dataset('DBLP')
-where 0.8f > similarity-jaccard(word-tokens($paper.title), word-tokens("Transactions for Cooperative Environments"))
-return $paper
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/dont-skip-primary-index-search-in-delete.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/dont-skip-primary-index-search-in-delete.aql
deleted file mode 100644
index 1edb391..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/dont-skip-primary-index-search-in-delete.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : The hint to skip secondary indexes don't apply to the primary index
- *                  : This test is intended to verify that the primary index is still used instead of a scan
- *  Expected Result : Success
- *  Date            : 21th December 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-delete $c from dataset Customers where $c.cid /*+ skip-index */ < 10;
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/dont-skip-primary-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/dont-skip-primary-index.aql
deleted file mode 100644
index 69f2f24..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/dont-skip-primary-index.aql
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- *  Description     : The hint to skip secondary indexes don't apply to the primary index
- *                  : This test is intended to verify that the primary index is still used instead of a scan 
- *  Expected Result : Success
- *  Date            : 21th December 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-primary-16.adm";
-
-create type TestType as open {
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key fname,lname;
-
-for $emp in dataset('testdst') 
-where $emp.fname /*+ skip-index */ >= "Craig" and $emp.lname /*+ skip-index */ >= "Kevin" and $emp.fname /*+ skip-index */ <= "Mary" and $emp.lname /*+ skip-index */ <= "Tomes"
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-ngram-index-search-in-delete.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-ngram-index-search-in-delete.aql
deleted file mode 100644
index 0649478..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-ngram-index-search-in-delete.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to avoid using any secondary index to evaluate the predicate in the where clause
- * Expected Res : Success
- * Date         : 21th December 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title) type ngram(3);
-
-delete $o from dataset DBLP where /*+ skip-index */ contains($o.title, "Multimedia")
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-ngram-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-ngram-index.aql
deleted file mode 100644
index e52276f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-ngram-index.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to avoid using any secondary index to evaluate the predicate in the where clause
- * Expected Res : Success
- * Date         : 21th December 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index ngram_index on DBLP(title) type ngram(3);
-
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm";
-
-for $o in dataset('DBLP')
-where /*+ skip-index */ test.contains($o.title, "Multimedia")
-order by $o.id
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-rtree-index-search-in-delete.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-rtree-index-search-in-delete.aql
deleted file mode 100644
index d45b3cf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-rtree-index-search-in-delete.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to avoid using any secondary index to evaluate the predicate in the where clause
- * Expected Res : Success
- * Date         : 21th December 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index rtree_index_point on MyData(point) type rtree;
-
-delete $m from dataset MyData where /*+ skip-index */ spatial-intersect($m.point, create-polygon([0.0,1.0,0.0,4.0,12.0,4.0,12.0,1.0]));
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-rtree-secondary-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-rtree-secondary-index.aql
deleted file mode 100644
index 734a3b8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-rtree-secondary-index.aql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to avoid using any secondary index to evaluate the predicate in the where clause
- * Expected Res : Success
- * Date         : 21th December 2013
- */
- 
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int32,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
-
-create dataset MyData(MyRecord)
-  primary key id with {"node-group":{"name":"group1"}};
-
-load dataset MyData 
-using localfs
-(("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
-
-create index rtree_index_point on MyData(point) type rtree;
-
-
-write output to asterix_nc1:"rttest/index_rtree-secondary-index.adm";
-
-for $o in dataset('MyData')
-where /*+ skip-index */ spatial-intersect($o.point, create-polygon([4.0,1.0,4.0,4.0,12.0,4.0,12.0,1.0]))
-return {"id":$o.id}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-secondary-btree-index-search-in-delete.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-secondary-btree-index-search-in-delete.aql
deleted file mode 100644
index 7dbbebe..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-secondary-btree-index-search-in-delete.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to avoid using any secondary index to evaluate the predicate in the where clause
- * Expected Res : Success
- * Date         : 21th December 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32,
-  address: AddressType?,
-  interests: {{string}},
-  children: [ { name: string, age: int32? } ]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-
-create index age_index on Customers(age);
-
-delete $c from dataset Customers where $c.age /*+ skip-index */ < 20;
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-secondary-btree-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-secondary-btree-index.aql
deleted file mode 100644
index fedb963..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-secondary-btree-index.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to avoid using any secondary index to evaluate the predicate in the where clause
- * Expected Res : Success
- * Date         : 21th December 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm";
-
-create type TestType as open {
-    id : int32,
-    fname : string,
-    lname : string
-}
-
-create dataset testdst(TestType) primary key id;
-
-create index sec_Idx on testdst(fname);
-
-for $emp in dataset('testdst') 
-where $emp.fname /*+ skip-index */ >= "Max" and $emp.fname /*+ skip-index */ <= "Roger" 
-return $emp
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-word-index-search-in-delete.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-word-index-search-in-delete.aql
deleted file mode 100644
index b9b6712..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-word-index-search-in-delete.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to avoid using any secondary index to evaluate the predicate in the where clause
- * Expected Res : Success
- * Date         : 21th December 2013
- */
-
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index keyword_index on DBLP(title) type keyword;
-
-delete $o from dataset DBLP where /*+ skip-index */ similarity-jaccard(word-tokens($o.title), word-tokens("Transactions for Cooperative Environments")) >= 0.5f
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-word-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-word-index.aql
deleted file mode 100644
index 5347b38..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-word-index.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description  : Notice the query hint to avoid using any secondary index to evaluate the predicate in the where clause
- * Expected Res : Success
- * Date         : 21th December 2013
- */
-
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-create index keyword_index on DBLP(title) type keyword;
-
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm";
-
-for $o in dataset('DBLP')
-let $jacc := /*+ skip-index */ similarity-jaccard(word-tokens($o.title), word-tokens("Transactions for Cooperative Environments"))
-where $jacc >= 0.5f
-return $o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/sort-cust.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/sort-cust.aql
deleted file mode 100644
index 597fc13..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/sort-cust.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse custlimit if exists;
-
-create dataverse custlimit;
-
-use dataverse custlimit;
-
-create type AddressType as closed {
-  number: int32,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int32,
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-
-
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Customers(CustomerType)
-  primary key cid with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/custlimit.adm";
-
-for $c in dataset('Customers')
-order by $c.age
-limit 10 // offset 10000
-return {"custname":$c.name, "custage":$c.age}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/split-materialization-above-join.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/split-materialization-above-join.aql
deleted file mode 100644
index 8fd3491..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/split-materialization-above-join.aql
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse fuzzyjoin if exists;
-
-create dataverse fuzzyjoin;
-
-use dataverse fuzzyjoin;
-
-create type DBLPType as open {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-set import-private-functions 'true';
-
-//
-// -- - Stage 3 - --
-//
-for $paperLeft in dataset('DBLP')
-for $paperRight in dataset('DBLP')
-for $ridpair in 
-    //
-    // -- - Stage 2 - --
-    //
-    for $paperLeft in dataset('DBLP')
-    let $lenLeft := len(counthashed-word-tokens($paperLeft.title))
-    let $tokensLeft :=
-        for $tokenUnranked in counthashed-word-tokens($paperLeft.title)
-        for $tokenRanked at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $paper in dataset('DBLP')
-            for $token in counthashed-word-tokens($paper.title)
-            group by $tokenGroupped := $token with $paper
-            order by count($paper), $tokenGroupped
-            return $tokenGroupped
-        where $tokenUnranked = $tokenRanked
-        order by $i
-        return $i
-    for $prefixTokenLeft in subset-collection(
-                                $tokensLeft, 
-                                0,
-                                prefix-len-jaccard($lenLeft, .5f))
-
-    for $paperRight in dataset('DBLP')
-    let $lenRight := len(counthashed-word-tokens($paperRight.title))
-    let $tokensRight :=
-        for $tokenUnranked in counthashed-word-tokens($paperRight.title)
-        for $tokenRanked at $i in
-            //
-            // -- - Stage 1 - --
-            //
-            for $paper in dataset('DBLP')
-            for $token in counthashed-word-tokens($paper.title)
-            group by $tokenGroupped := $token with $paper
-            order by count($paper), $tokenGroupped
-            return $tokenGroupped
-        where $tokenUnranked = $tokenRanked
-        order by $i
-        return $i
-    for $prefixTokenRight in subset-collection(
-                                $tokensRight, 
-                                0,
-                                prefix-len-jaccard($lenRight, .5f))
-
-    where $prefixTokenLeft = $prefixTokenRight
-
-    let $sim := similarity-jaccard-prefix(
-                    $lenLeft,
-                    $tokensLeft,
-                    $lenRight,
-                    $tokensRight,
-                    $prefixTokenLeft,
-                    .5f)
-    where $sim >= .5f and $paperLeft.id < $paperRight.id
-    group by $idLeft := $paperLeft.id, $idRight := $paperRight.id with $sim
-    return {'idLeft': $idLeft, 'idRight': $idRight, 'sim': $sim[0]}
-
-where $ridpair.idLeft = $paperLeft.id and $ridpair.idRight = $paperRight.id
-order by $paperLeft.id, $paperRight.id
-return {'left': $paperLeft, 'right': $paperRight, 'sim': $ridpair.sim}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1017-2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1017-2.aql
deleted file mode 100644
index 3e35f1d..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1017-2.aql
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-
-create type CHPReport as
-{ "rid":uuid, "epicenter":point, "radius":double }
-
-create type userLocation as
-{ "id":uuid, "user-id":int64, "location":point }
-
-create type tornadoShelter as
-{ "tsid":uuid, "location":point }
-
-create type sub as closed
-{ "id":int, "param0":int64 }
-
-create dataset NearbySheltersDuringTornadoDangerChannelSubscriptions(sub)
-primary key id;
-
-create dataset tornadoShelters(tornadoShelter)
-primary key tsid autogenerated;
-
-create dataset userLocations(userLocation)
-primary key id autogenerated;
-
-create dataset CHPReports(CHPReport)
-primary key rid autogenerated;
-
-
-create function NearbySheltersDuringTornadoDanger($userid) {
-   for $emergency in dataset CHPReports
-   let $dangerzone := create-circle($emergency.epicenter,$emergency.radius)
-   where (some $user in dataset userLocations satisfies $user.user-id = $userid
-          and spatial-intersect($dangerzone, $user.location))
-   return
-   { "shelter locations":for $shelter in dataset tornadoShelters return $shelter.location}
-};
-
-for $sub in dataset NearbySheltersDuringTornadoDangerChannelSubscriptions
-for $result in NearbySheltersDuringTornadoDanger($sub.param0)
-return
-{ "subscription-id":$sub.subscription-id,"execution-time":current-datetime(),"result":$result }
-;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1017-recursive-2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1017-recursive-2.aql
deleted file mode 100644
index da7d535..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1017-recursive-2.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-
-create type CHPReport as
-{ "rid":uuid, "epicenter":point, "radius":double }
-
-create type userLocation as
-{ "id":uuid, "user-id":int64, "location":point }
-
-create type tornadoShelter as
-{ "tsid":uuid, "location":point }
-
-create type sub as closed
-{ "id":int, "param0":int64 }
-
-create dataset NearbySheltersDuringTornadoDangerChannelSubscriptions(sub)
-primary key id;
-
-create dataset tornadoShelters(tornadoShelter)
-primary key tsid autogenerated;
-
-create dataset userLocations(userLocation)
-primary key id autogenerated;
-
-create dataset CHPReports(CHPReport)
-primary key rid autogenerated;
-
-
-create function NearbySheltersDuringTornadoDanger($userid) {
-   for $emergency in dataset CHPReports
-   let $dangerzone := create-circle($emergency.epicenter,$emergency.radius)
-   where (some $user in dataset userLocations satisfies $user.user-id = $userid
-          and spatial-intersect($dangerzone, $user.location))
-   return
-   { "shelter locations":for $shelter in dataset tornadoShelters return $shelter.location}
-};
-
-create function findShelters($sub){
-    for $result in NearbySheltersDuringTornadoDanger($sub.param0)
-    return { "subscription-id":$sub.subscription-id,"execution-time":current-datetime(),"result":$result }
-};
-
-for $sub in dataset NearbySheltersDuringTornadoDangerChannelSubscriptions
-for $r in findShelters($sub)
-return $r;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1017-recursive.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1017-recursive.aql
deleted file mode 100644
index 360cdc6..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1017-recursive.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-
-create type CHPReport as
-{ "rid":uuid, "epicenter":point, "radius":double }
-
-create type userLocation as
-{ "id":uuid, "user-id":int64, "location":point }
-
-create type tornadoShelter as
-{ "tsid":uuid, "location":point }
-
-create type sub as closed
-{ "id":int, "param0":int64 }
-
-create dataset NearbySheltersDuringTornadoDangerChannelSubscriptions(sub)
-primary key id;
-
-create dataset tornadoShelters(tornadoShelter)
-primary key tsid autogenerated;
-
-create dataset userLocations(userLocation)
-primary key id autogenerated;
-
-create dataset CHPReports(CHPReport)
-primary key rid autogenerated;
-
-
-create function NearbySheltersDuringTornadoDanger($userid) {
-   for $emergency in dataset CHPReports
-   let $dangerzone := create-circle($emergency.epicenter,$emergency.radius)
-   where (some $user in dataset userLocations satisfies $user.user-id = $userid
-          and spatial-intersect($dangerzone, $user.location))
-   return
-   { "shelter locations":for $shelter in dataset tornadoShelters return $shelter.location}
-};
-
-create function findShelters($id){
-    for $result in NearbySheltersDuringTornadoDanger($id)
-    return { "subscription-id":$id,"execution-time":current-datetime(),"result":$result }
-};
-
-for $sub in dataset NearbySheltersDuringTornadoDangerChannelSubscriptions
-for $r in findShelters($sub.param0)
-return $r;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1017.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1017.aql
deleted file mode 100644
index d82a2b8..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1017.aql
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-
-create type CHPReport as
-{ "rid":uuid, "epicenter":point, "radius":double }
-
-create type userLocation as
-{ "id":uuid, "user-id":int64, "location":point }
-
-create type tornadoShelter as
-{ "tsid":uuid, "location":point }
-
-create type sub as closed
-{ "id":int, "param0":int64 }
-
-create dataset NearbySheltersDuringTornadoDangerChannelSubscriptions(sub)
-primary key id;
-
-create dataset tornadoShelters(tornadoShelter)
-primary key tsid autogenerated;
-
-create dataset userLocations(userLocation)
-primary key id autogenerated;
-
-create dataset CHPReports(CHPReport)
-primary key rid autogenerated;
-
-
-create function NearbySheltersDuringTornadoDanger($userid) {
-   for $emergency in dataset CHPReports
-   let $dangerzone := create-circle($emergency.epicenter,$emergency.radius)
-   where (some $user in dataset userLocations satisfies $user.user-id = $userid)
-         //and spatial-intersect($dangerzone,$user.location))
-         /** This test comments out the spatial-intersect function to test
-          * if it will results in a hybrid hash join.
-          * query-ASTERIXDB-1017-2 is the same as this query except
-          * that the spatial-intersect function is enabled.
-          */
-   return
-   { "shelter locations":for $shelter in dataset tornadoShelters return $shelter.location}
-};
-
-
-for $sub in dataset NearbySheltersDuringTornadoDangerChannelSubscriptions
-for $result in NearbySheltersDuringTornadoDanger($sub.param0)
-return
-{ "subscription-id":$sub.subscription-id,"execution-time":current-datetime(),"result":$result }
-;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1018.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1018.aql
deleted file mode 100644
index 4386846..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1018.aql
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-
-create type CHPReport as
-{ "rid":uuid, "etype":string, "timestamp":datetime, "epicenter":point, "radius":double, "message":string }
-
-create type userLocation as
-{ "id":uuid, "user-id":int64, "timestamp":datetime, "location":point }
-
-create type tornadoShelter as
-{ "tsid":uuid, "name":string, "location":point }
-
-create dataset tornadoShelters(tornadoShelter)
-primary key tsid autogenerated;
-
-create dataset userLocations(userLocation)
-primary key id autogenerated;
-
-create dataset CHPReports(CHPReport)
-primary key rid autogenerated;
-
-create function NearbySheltersDuringTornadoDanger($userid) {
-for $emergency in dataset CHPReports
-let $dangerzone := create-circle($emergency.epicenter,$emergency.radius)
-let $timewindow := day-time-duration("PT1M")
-where (some $user in dataset userLocations satisfies
-$user.user-id = $userid
-)
-return
-{ "shelter locations":for $shelter in dataset tornadoShelters where spatial-intersect( $dangerzone,$shelter.location) return $shelter.location}
-};
-
-create type sub as closed
-{ "id":int, "param0":int64 }
-
-create dataset NearbySheltersDuringTornadoDangerChannelSubscriptions(sub)
-primary key id;
-
-for $sub in dataset NearbySheltersDuringTornadoDangerChannelSubscriptions
-for $result in NearbySheltersDuringTornadoDanger($sub.param0)
-return
-{ "result":$result}
-;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1019-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1019-index-only.aql
deleted file mode 100644
index 7fc67ea..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1019-index-only.aql
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-
-use dataverse emergencyTest;
-
-create type CHPReport as
-{ "rid":uuid, "etype":string, "timestamp":datetime, "epicenter":point, "radius":double, "message":string }
-
-create type userLocation as
-{ "id":uuid, "user-id":int64, "timestamp":datetime, "location":point }
-
-create type tornadoShelter as
-{ "tsid":uuid, "name":string, "location":point }
-
-create dataset tornadoShelters(tornadoShelter)
-primary key tsid autogenerated;
-
-create dataset userLocations(userLocation)
-primary key id autogenerated;
-
-create dataset CHPReports(CHPReport)
-primary key rid autogenerated;
-
-create index reportTimes on CHPReports(timestamp);
-create index userTimes on userLocations(timestamp);
-create index shelterloc on tornadoShelters(location) type rtree;
-
-create function NearbySheltersDuringTornadoDanger($userid) {
-for $emergency in dataset CHPReports
-let $dangerzone := create-circle($emergency.epicenter,$emergency.radius)
-let $timewindow := day-time-duration("PT1M")
-where (some $user in dataset userLocations satisfies
-$user.user-id = $userid
-)
-return
-{ "shelter locations":for $shelter in dataset tornadoShelters where spatial-intersect( $dangerzone,$shelter.location) return $shelter.location}
-};
-
-create type sub as closed
-{ "id":int, "param0":int64 }
-
-create dataset NearbySheltersDuringTornadoDangerChannelSubscriptions(sub)
-primary key id;
-
-create type result as open
-{ "id": uuid }
-
-create dataset NearbySheltersDuringTornadoDangerChannelResults(result)
-primary key id autogenerated;
-
-insert into dataset NearbySheltersDuringTornadoDangerChannelResults (
-for $sub in dataset NearbySheltersDuringTornadoDangerChannelSubscriptions
-for $result in NearbySheltersDuringTornadoDanger($sub.param0)
-return
-{ "result":$result}
-);
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1019.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1019.aql
deleted file mode 100644
index 6227eab..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1019.aql
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-
-use dataverse emergencyTest;
-
-create type CHPReport as
-{ "rid":uuid, "etype":string, "timestamp":datetime, "epicenter":point, "radius":double, "message":string }
-
-create type userLocation as
-{ "id":uuid, "user-id":int64, "timestamp":datetime, "location":point }
-
-create type tornadoShelter as
-{ "tsid":uuid, "name":string, "location":point }
-
-create dataset tornadoShelters(tornadoShelter)
-primary key tsid autogenerated;
-
-create dataset userLocations(userLocation)
-primary key id autogenerated;
-
-create dataset CHPReports(CHPReport)
-primary key rid autogenerated;
-
-create index reportTimes on CHPReports(timestamp);
-create index userTimes on userLocations(timestamp);
-create index shelterloc on tornadoShelters(location) type rtree;
-
-create function NearbySheltersDuringTornadoDanger($userid) {
-for $emergency in dataset CHPReports
-let $dangerzone := create-circle($emergency.epicenter,$emergency.radius)
-let $timewindow := day-time-duration("PT1M")
-where (some $user in dataset userLocations satisfies
-$user.user-id = $userid
-)
-return
-{ "shelter locations":for $shelter in dataset tornadoShelters where spatial-intersect( $dangerzone,$shelter.location) return $shelter.location}
-};
-
-create type sub as closed
-{ "id":int, "param0":int64 }
-
-create dataset NearbySheltersDuringTornadoDangerChannelSubscriptions(sub)
-primary key id;
-
-create type result as open
-{ "id": uuid }
-
-create dataset NearbySheltersDuringTornadoDangerChannelResults(result)
-primary key id autogenerated;
-
-set 'compiler.indexonly' "false";
-
-insert into dataset NearbySheltersDuringTornadoDangerChannelResults (
-for $sub in dataset NearbySheltersDuringTornadoDangerChannelSubscriptions
-for $result in NearbySheltersDuringTornadoDanger($sub.param0)
-return
-{ "result":$result}
-);
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1020.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1020.aql
deleted file mode 100644
index c980445..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1020.aql
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-
-create type CHPReport as
-{ "rid":uuid, "etype":string, "timestamp":datetime, "epicenter":point, "radius":double, "message":string }
-
-create type userLocation as
-{ "id":uuid, "user-id":int64, "timestamp":datetime, "location":point }
-
-create type tornadoShelter as
-{ "tsid":uuid, "name":string, "location":point }
-
-create type sub as closed
-{ "id":int, "param0":int64 }
-
-create dataset NearbySheltersDuringTornadoDangerChannelSubscriptions(sub)
-primary key id;
-
-create dataset tornadoShelters(tornadoShelter)
-primary key tsid autogenerated;
-
-create dataset userLocations(userLocation)
-primary key id autogenerated;
-
-create dataset CHPReports(CHPReport)
-primary key rid autogenerated;
-
-create function NearbySheltersDuringTornadoDanger($userid) {
-for $emergency in dataset CHPReports
-    let $dangerzone := create-circle($emergency.epicenter,$emergency.radius)
-    where (some $user in dataset userLocations satisfies
-    $user.user-id = $userid and spatial-intersect($dangerzone,$user.location))
-return { "shelter locations": for $shelter in dataset tornadoShelters return $shelter.location}
-};
-
-
-for $sub in dataset NearbySheltersDuringTornadoDangerChannelSubscriptions
-for $result in NearbySheltersDuringTornadoDanger(int("5"))
-return
-{ "result":$result }
-;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1029.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1029.aql
deleted file mode 100644
index 1cb0114..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1029.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-
-create type CHPReport as
-{ "rid":uuid, "epicenter":point, "radius":double, "message":string, "timestamp":datetime }
-
-create type userLocation as
-{ "id":uuid, "user-id":int64, "location":point, "timestamp":datetime }
-
-create type tornadoShelter as
-{ "tsid":uuid, "location":point }
-
-create type sub as closed
-{ "id":int, "param0":int64 }
-
-create dataset NearbySheltersDuringTornadoDangerChannelSubscriptions(sub)
-primary key id;
-
-create dataset tornadoShelters(tornadoShelter)
-primary key tsid autogenerated;
-
-create dataset userLocations(userLocation)
-primary key id autogenerated;
-
-create dataset CHPReports(CHPReport)
-primary key rid autogenerated;
-
-create index times on CHPReports(timestamp);
-create index times2 on userLocations(timestamp);
-create index locs on tornadoShelters(location) type rtree;
-create index locs2 on CHPReports(epicenter) type rtree;
-create index locs3 on userLocations(location) type rtree;
-
-for $sub in dataset NearbySheltersDuringTornadoDangerChannelSubscriptions
-for $emergency in dataset CHPReports
-let $dangerzone := create-circle($emergency.epicenter,$emergency.radius)
-let $timewindow := day-time-duration("PT10M")
-where $emergency.etype = "tornado"
-where $emergency.timestamp >= current-datetime()-$timewindow
-where (some $user in dataset userLocations satisfies
-$user.user-id = $sub.param0
-and $user.timestamp >= current-datetime() - $timewindow
-and spatial-intersect($dangerzone,$user.location))
-return
-{ "id":$sub.param0, "message":$emergency.message, "shelter locations":for $shelter in dataset tornadoShelters return $shelter.location }
-;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1029_2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1029_2.aql
deleted file mode 100644
index b2ff83b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1029_2.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-
-create type CHPReport as
-{ "rid":uuid, "epicenter":point, "radius":double, "message":string, "timestamp":datetime }
-
-create type userLocation as
-{ "id":uuid, "user-id":int64, "location":point, "timestamp":datetime }
-
-create type tornadoShelter as
-{ "tsid":uuid, "location":point }
-
-create type sub as closed
-{ "id":int, "param0":int64 }
-
-create dataset NearbySheltersDuringTornadoDangerChannelSubscriptions(sub)
-primary key id;
-
-create dataset tornadoShelters(tornadoShelter)
-primary key tsid autogenerated;
-
-create dataset userLocations(userLocation)
-primary key id autogenerated;
-
-create dataset CHPReports(CHPReport)
-primary key rid autogenerated;
-
-create index times on CHPReports(timestamp);
-create index times2 on userLocations(timestamp);
-create index locs on tornadoShelters(location) type rtree;
-create index locs2 on CHPReports(epicenter) type rtree;
-create index locs3 on userLocations(location) type rtree;
-
-for $sub in dataset NearbySheltersDuringTornadoDangerChannelSubscriptions
-for $emergency in dataset CHPReports
-let $dangerzone := create-circle($emergency.epicenter,$emergency.radius)
-let $timewindow := day-time-duration("PT10M")
-where $emergency.etype = "tornado"
-where current-datetime()-$timewindow <= $emergency.timestamp
-where (some $user in dataset userLocations satisfies
-$user.user-id = $sub.param0
-and current-datetime() - $timewindow <= $user.timestamp
-and spatial-intersect($dangerzone,$user.location))
-return
-{ "id":$sub.param0, "message":$emergency.message, "shelter locations":for $shelter in dataset tornadoShelters return $shelter.location }
-;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1030_1034.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1030_1034.aql
deleted file mode 100644
index 9273ce5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1030_1034.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-
-create type CHPReport as
-{ "rid":uuid, "epicenter":point, "radius":double, "message":string, "timestamp":datetime, "param0":int64 }
-
-create type sub as closed
-{ "id":int, "param0":int64 }
-
-create dataset NearbySheltersDuringTornadoDangerChannelSubscriptions(sub)
-primary key id;
-
-create dataset CHPReports(CHPReport)
-primary key rid autogenerated;
-
-create index times on CHPReports(timestamp);
-create index locs2 on CHPReports(epicenter) type rtree;
-
-for $sub in dataset NearbySheltersDuringTornadoDangerChannelSubscriptions
-let $timewindow := day-time-duration("PT10M")
-for $emergency in dataset CHPReports
-where $emergency.timestamp >= current-datetime()-$timewindow
-and $emergency.param0 = $sub.param0
-return
-{ "id":$sub.param0 }
-;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1030_1034_2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1030_1034_2.aql
deleted file mode 100644
index 788a2c1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1030_1034_2.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-
-create type CHPReport as
-{ "rid":uuid, "epicenter":point, "radius":double, "message":string, "timestamp":datetime, "param0":int64 }
-
-create type sub as closed
-{ "id":int, "param0":int64 }
-
-create dataset NearbySheltersDuringTornadoDangerChannelSubscriptions(sub)
-primary key id;
-
-create dataset CHPReports(CHPReport)
-primary key rid autogenerated;
-
-create index times on CHPReports(timestamp);
-create index locs2 on CHPReports(epicenter) type rtree;
-
-for $sub in dataset NearbySheltersDuringTornadoDangerChannelSubscriptions
-let $timewindow := day-time-duration("PT10M")
-for $emergency in dataset CHPReports
-where current-datetime()-$timewindow <= $emergency.timestamp
-and $emergency.param0 = $sub.param0
-return
-{ "id":$sub.param0 }
-;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1298.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1298.aql
deleted file mode 100644
index 996ba05..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1298.aql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse emergencyTest if exists;
-create dataverse emergencyTest;
-use dataverse emergencyTest;
-
-
-drop dataverse channels if exists;
-create dataverse channels;
-use dataverse channels;
-
-create type userLocation as closed
-{ userId: int, roomNumber: int }
-
-create dataset userLocations(userLocation)
-primary key userId;
-
-create function currentOccupancy($room)
-{
- let $list := for $location in dataset userLocations
- where $location.roomNumber = $room
- return $location.userId return $list
-};
-
-create type subscription as { "id":uuid, "param0":int }
-
-create dataset subscriptions(subscription)
-primary key id autogenerated;
-
-for $sub in dataset subscriptions
-for $result in currentOccupancy($sub.param0)
-return $result;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1308-1.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1308-1.aql
deleted file mode 100644
index 2f56f85..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1308-1.aql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-declare function median($x)
-{
-   let $c := count($x)
-   return avg(
-                for $i at $p in (for $j in $x order by $j return $j)
-                where $p >= floor(($c-1)/2.0) and $p <= $c/2
-                return $i
-             )
-}
-
-
-declare function MAD($x)
-{
-     let $m := median($x)
-     return median(for $j in $x order by abs($j-$m) return abs($j-$m))
-}
-
-MAD([2, 3, 4, 1, 5, 6, 10, 0])
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1308-2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1308-2.aql
deleted file mode 100644
index 028e436..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1308-2.aql
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type HRMType as closed {
-  row_id: int32,
-  sid: int32,
-  date: date,
-  day: int32,
-  time: time,
-  bpm: int32,
-  RR: float
-};
-
-create dataset HRM(HRMType) primary key row_id;
-
-declare function median($x)
-{
-     let $c := count($x)
-     return avg(
-                for $i at $p in (for $j in $x order by $j return $j)
-                where $p >= floor(($c-1)/2.0) and $p <= $c/2
-                return $i
-               )
-}
-
-
-declare function MAD($x)
-{
-     let $m := median($x)
-     return median(for $j in $x order by abs($j-$m) return abs($j-$m))
-}
-
-for $i in dataset HRM
-group by $sid := $i.sid, $gdate := $i.date, $gday := $i.day,
-$timebin := interval-bin($i.time, time("00:00:00"), day-time-duration("PT15M")) with $i
-return
-{
-  "sid": $sid,
-  "gdate": $gdate,
-  "gday": $gday,
-  "timebin": $timebin,
-  "stdv": (avg(for $ii in $i return $ii.RR * $ii.RR) -
-          avg(for $ii in $i return $ii.RR) * avg(for $ii in $i return $ii.RR))^(0.5),
-  "MAD": MAD(for $ii in $i return $ii.RR)
-}
-
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1047.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1047.aql
deleted file mode 100644
index 4210fc3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1047.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * This query is to verify the fix of ASTERIXDB-1047.
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type DBLPType as open {
-  id: int64,
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create dataset DBLP(DBLPType) primary key id;
-
-
-(for $d in dataset DBLP where $d.id = 1 return $d)
-  union
-(for $d in dataset DBLP where $d.authors = "Alfred V. Aho John E. Hopcroft Jeffrey D. Ullman" return $d);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1205-2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1205-2.aql
deleted file mode 100644
index 82d1430..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1205-2.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * This query is to verify the fix of ASTERIXDB-1205.
- */
-
-let $aa := [{"fa":1, "fb":1}, {"fa":2, "fb":1}]
-let $bb := [{"fa":1, "fb":0}, {"fa":1, "fb":1}, {"fa":3, "fb":1}]
-
-for $tt in ($aa union $bb)
-order by $tt.fa, $tt.fb
-return $tt;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1205-3.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1205-3.aql
deleted file mode 100644
index 2ab92dc..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1205-3.aql
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * This query is to verify the fix of ASTERIXDB-1205.
- */
-
-let $aa := [{"fa":1, "fb":1}, {"fa":2, "fb":1}]
-let $bb := [{"fa":1, "fb":0}, {"fa":1, "fb":1}, {"fa":3, "fb":1}]
-return $aa union $bb;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1205-4.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1205-4.aql
deleted file mode 100644
index 48f7c2a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1205-4.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * This query is to verify the fix of ASTERIXDB-1205.
- */
-
-let $aa := [{"fa":1, "fb":1}, {"fa":2, "fb":1}]
-let $bb := [{"fa":1, "fb":0}, {"fa":1, "fb":1}, {"fa":3, "fb":1}]
-let $dd := [{"fa":4, "fb":5}, {"fa":6, "fb":7}]
-let $ccc := $aa union $bb union $dd
-
-for $tt in $ccc
-order by $tt.fa, $tt.fb
-return $tt;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1205.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1205.aql
deleted file mode 100644
index 763aba1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/query-ASTERIXDB-1205.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * This query is to verify the fix of ASTERIXDB-1205.
- */
-
-let $aa := [{"fa":1, "fb":1}, {"fa":2, "fb":1}]
-let $bb := [{"fa":1, "fb":0}, {"fa":1, "fb":1}, {"fa":3, "fb":1}]
-let $ccc := $aa union $bb
-
-for $tt in $ccc
-order by $tt.fa, $tt.fb
-return $tt;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/union_dataset.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/union_dataset.aql
deleted file mode 100644
index 7a55ee5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/union_dataset.aql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse TinySocial if exists;
-create dataverse TinySocial;
-use dataverse TinySocial;
-
-create type FacebookUserType as open {
-        id: int
-}
-
-create dataset FacebookUsers(FacebookUserType)
-primary key id;
-
-create dataset FacebookUsers2(FacebookUserType)
-primary key id;
-
-
-let $c := dataset("FacebookUsers") union dataset("FacebookUsers2")
-for $res in $c order by $res.id return $res
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/union_dataset2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/union_dataset2.aql
deleted file mode 100644
index 049652f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/union_dataset2.aql
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse TinySocial if exists;
-create dataverse TinySocial;
-use dataverse TinySocial;
-
-create type FacebookUserType as open {
-        id: int
-}
-
-create dataset FacebookUsers(FacebookUserType)
-primary key id;
-
-create dataset FacebookUsers2(FacebookUserType)
-primary key id;
-
-dataset("FacebookUsers") union dataset("FacebookUsers2");
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/union_dataset3.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/union_dataset3.aql
deleted file mode 100644
index edb429f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/union_dataset3.aql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse TinySocial if exists;
-create dataverse TinySocial;
-use dataverse TinySocial;
-
-create type FacebookUserType as open {
-        id: int
-}
-
-create dataset FacebookUsers(FacebookUserType)
-primary key id;
-
-create dataset FacebookUsers2(FacebookUserType)
-primary key id;
-
-
-for $res in (dataset("FacebookUsers") union dataset("FacebookUsers2"))
-order by $res.id return $res
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/union_query.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/union_query.aql
deleted file mode 100644
index 3e6ebaf..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/union/union_query.aql
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-drop dataverse TinySocial if exists;
-create dataverse TinySocial;
-use dataverse TinySocial;
-
-create type FacebookUserType as open {
-        id: int
-}
-
-create type FacebookMessageType as open {
-        message-id: int
-}
-
-create dataset FacebookUsers(FacebookUserType)
-primary key id;
-
-create dataset FacebookMessages(FacebookMessageType)
-primary key message-id;
-
-let $t1 := for $t in dataset FacebookUsers return $t.id
-let $t2 := for $s in dataset FacebookMessages return $s.message-id
-let $c := $t1 union $t2
-for $res in $c distinct by $res order by $res return $res
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/unnest-to-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/unnest-to-join_01.aql
deleted file mode 100644
index 52e56d3..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/unnest-to-join_01.aql
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that non-datascan unnests are rewritten into joins.
- * Success        : Yes
- */
- 
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/unnest-to-join_01.adm";
-
-for $x in [1,2,3,4,5,6]
-for $y in [4,5,6,7,8,9]
-where $x = $y
-return $y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/unnest-to-join_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/unnest-to-join_02.aql
deleted file mode 100644
index 4fa1f52..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/unnest-to-join_02.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Tests that non-datascan unnests in a subplan are rewritten into joins.
- * Success        : Yes
- */
- 
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-write output to asterix_nc1:"rttest/unnest-to-join_02.adm";
-
-some $x in [1,2,3,4,5,6], $y in [4,5,6,7,8,9] satisfies $x = $y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/unnest_list_in_subplan.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/unnest_list_in_subplan.aql
deleted file mode 100644
index 2c5bf45..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/unnest_list_in_subplan.aql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse fuzzyjoin if exists;
-create dataverse fuzzyjoin;
-use dataverse fuzzyjoin;
-
-create type DBLPType as closed {
-  id: int32, 
-  dblpid: string,
-  title: string,
-  authors: string,
-  misc: string
-}
-
-create type TOKENSRANKEDADMType as closed {
-  token: int32,
-  rank: int32
-}
-
-create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
-
-create dataset DBLP(DBLPType) primary key id on group1;
-create dataset TOKENSRANKEDADM(TOKENSRANKEDADMType) primary key rank on group1;
-
-write output to asterix_nc1:'rttest/unnest_list_in_subplan.adm';
-
-    //
-    // -- - Stage 2 - --
-    //
-    for $paperDBLP in dataset('DBLP')
-    let $idDBLP := $paperDBLP.id
-    let $tokensUnrankedDBLP := counthashed-word-tokens($paperDBLP.title)
-    let $tokensDBLP :=
-        for $tokenUnranked in $tokensUnrankedDBLP
-        for $tokenRanked in dataset('TOKENSRANKEDADM')
-        where $tokenUnranked = $tokenRanked.token
-        order by $tokenRanked.rank
-        return $tokenRanked.rank
-    return {'id': $idDBLP, 'tokens': $tokensDBLP}
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/1.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/1.aql
deleted file mode 100644
index e13643a..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/1.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-from $user in dataset('User')
-where some $i in $user.interests satisfies $i = "movies"
-select { "name": $user.name }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/2.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/2.aql
deleted file mode 100644
index 4571288..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/2.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-from $event in dataset('Event')
-from $sponsor in $event.sponsoring_sigs
-with $es := { "event": $event, "sponsor": $sponsor }
-group by $sig_name := $sponsor.sig_name keeping $es
-with $sig_sponsorship_count := count($es)
-with $by_chapter :=
-   from $e in $es
-   group by $chapter_name := $e.sponsor.chapter_name keeping $es
-   select { "chapter_name": $chapter_name, "escount" : count($es) }
-order by $sig_sponsorship_count desc
-limit 5
-select { "sig_name": $sig_name, "total_count": $sig_sponsorship_count, "chapter_breakdown": $by_chapter }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/4.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/4.aql
deleted file mode 100644
index f60795b..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/4.aql
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-from $sig in dataset('SIGroup')
-where $sig.name = "Movie-Watchers"
-with $similar_sigs :=
-   from $similar_sig in dataset('SIGroup')
-   where $similar_sig != $sig
-   and $similar_sig.interests ~= $sig.interests
-   select { "sig_name" : $similar_sig.name }
-select { "similar_sigs" : $similar_sigs }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/5.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/5.aql
deleted file mode 100644
index 2687bf1..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/5.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-from $event in dataset('Event')
-where $event.name = "The Night of the Ad Eaters, 29th edition"
-with $collocated_events :=
-   from $collocated_event in dataset('Events')
-   where $collocated_event.location.street ~= $event.location.street
-   and $collocated_event.location.city = $event.location.city
-   and $collocated_event.location.state = $event.location.state
-   and $collocated_event.location.zip = $event.location.zip
-   select { "event_name" : $collocated_event.name }
-select { "collocated_evnets" : $collocated_events }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/6.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/6.aql
deleted file mode 100644
index 4562406..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/6.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-from $user in dataset('Users')
-with $similar_users :=
-   from $similar_user in dataset('Users')
-   with $similarity := similarity_jaccard($user.interests, $similar_user.interests)
-   where $user != $similar_user
-   and $similarity >= .75
-   order by $similarity desc
-   limit 10
-   select { "user_name" : $similar_user.name, "similarity" : $similarity }
-select { "user_name" : $user.name, "similar_users" : $similar_users }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/ANYInFieldAccessor.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/ANYInFieldAccessor.aql
deleted file mode 100644
index 12e3f96..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/ANYInFieldAccessor.aql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-from $user in dataset('User')
-from $mv in dataset('Movie')
-where some $i in $user.interests satisfies $i.movie = $mv.movie[?]
-select { "name": $user.name, "movie": $mv.movie }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/IfInFLOWGR.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/IfInFLOWGR.aql
deleted file mode 100644
index cf65175..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/IfInFLOWGR.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-from $i in [1,2,30,40]
-from $j in {{4,5,6}}
-select if ($i>$j) then $i else $j
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/ListConstructor.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/ListConstructor.aql
deleted file mode 100644
index b4ced83..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/ListConstructor.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-from $i in [1,2,3]
-from $j in {{4,5,6}}
-select $i+$j
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/WithFrom.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/WithFrom.aql
deleted file mode 100644
index a384e16..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/WithFrom.aql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-with $users := dataset('User')
-from $user in $users
-where some $i in $user.interests satisfies $i = "movies"
-select { "name": $user.name }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/fieldAccessor.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/fieldAccessor.aql
deleted file mode 100644
index 667821d..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/fieldAccessor.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-with $bla := { "name" : "value" }
-return
-  $bla."name" = $bla.name
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/functionDecl1.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/functionDecl1.aql
deleted file mode 100644
index 6b0364c..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/functionDecl1.aql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-declare function calculate($events){
-from $event in $events
-from $sponsor in $event.sponsoring_sigs
-with $es := { "event": $event, "sponsor": $sponsor }
-group by $sig_name := $sponsor.sig_name keeping $es
-with $sig_sponsorship_count := count($es)
-with $by_chapter :=
-   from $e in $es
-   group by $chapter_name := $e.sponsor.chapter_name keeping $es
-   select { "chapter_name": $chapter_name, "escount" : count($es) }
-order by $sig_sponsorship_count desc
-limit 5
-select { "sig_name": $sig_name, "total_count": $sig_sponsorship_count, "chapter_breakdown": $by_chapter }
-}
-
-with $result := calculate(dataset('Events'))
-select $result
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFLWOGR.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFLWOGR.aql
deleted file mode 100644
index 95a0e22..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFLWOGR.aql
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-from $user in
-    with $data := dataset('User')
-    select $data
-where some $i in $user.interests satisfies $i = "movies"
-select { "name": $user.name }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFLWOGR1.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFLWOGR1.aql
deleted file mode 100644
index db114e4..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFLWOGR1.aql
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-from $i in [1,2,30,40]
-from $j in {{4,5,6}}
-select
-    from $k in if ($i>$j) then $i else $j
-    where $k <10
-    select $k
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFLWOGR2.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFLWOGR2.aql
deleted file mode 100644
index c9d772e..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFLWOGR2.aql
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-from $i in [1,2,30,from $tmp in dataset('number') select $tmp]
-from $j in {{4,5,6}}
-select
-    from $k in if ($i>$j) then $i else $j
-    where $k <10
-    select $k
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFLWOGR3.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFLWOGR3.aql
deleted file mode 100644
index 657eacc..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFLWOGR3.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-from $event in dataset('Event')
-from $sponsor in $event.sponsoring_sigs
-with $es := { "event": $event, "sponsor": $sponsor }
-group by $sig_name := $sponsor.sig_name keeping $es
-with $sig_sponsorship_count := count($es)
-with $by_chapter :=
-   from $e in $es
-   group by $chapter_name := $e.sponsor.chapter_name keeping $es
-   select { "chapter_name": $chapter_name, "escount" : count($es) }
-order by $sig_sponsorship_count desc
-limit 5 offset 2
-select { "sig_name": $sig_name, "total_count": $sig_sponsorship_count, "chapter_breakdown": $by_chapter }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFor.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFor.aql
deleted file mode 100644
index 88d0bcc..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/nestedFor.aql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-from $user in dataset('User')
-from $mv in dataset('Movie')
-where some $i in $user.interests satisfies $i.movie = $mv.movie
-select { "name": $user.name, "movie": $mv.movie }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/numberInFieldAccessor.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/numberInFieldAccessor.aql
deleted file mode 100644
index 8d58272..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/numberInFieldAccessor.aql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-from $user in dataset('User')
-from $mv in dataset('Movie')
-where some $i in $user.interests satisfies $i.movie = $mv.movie[2]
-select { "name": $user.name, "movie": $mv.movie }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/union.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/union.aql
deleted file mode 100644
index a850807..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/union.aql
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-(from $l in foo1()
-select $l)
-union
-(from $l in foo2()
-select $l)
-union
-(from $l in foo3()
-select $l)
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/variables.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/variables.aql
deleted file mode 100644
index 9efb2c0..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/variables.aql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-with $a:=1
-with $b:=1
-return
-  $b-$a
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/1.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/1.aql
deleted file mode 100644
index fcf1126..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/1.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $user in dataset('User')
-where some $i in $user.interests satisfies $i = "movies"
-return { "name": $user.name }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/2.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/2.aql
deleted file mode 100644
index 9a343f6..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/2.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $event in dataset('Event')
-for $sponsor in $event.sponsoring_sigs
-let $es := { "event": $event, "sponsor": $sponsor }
-group by $sig_name := $sponsor.sig_name with $es
-let $sig_sponsorship_count := count($es)
-let $by_chapter :=
-   for $e in $es
-   group by $chapter_name := $e.sponsor.chapter_name with $es
-   return { "chapter_name": $chapter_name, "escount" : count($es) }
-order by $sig_sponsorship_count desc
-limit 5
-return { "sig_name": $sig_name, "total_count": $sig_sponsorship_count, "chapter_breakdown": $by_chapter }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/4.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/4.aql
deleted file mode 100644
index 8817098..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/4.aql
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $sig in dataset('SIGroup')
-where $sig.name = "Movie-Watchers"
-let $similar_sigs :=
-   for $similar_sig in dataset('SIGroup')
-   where $similar_sig != $sig
-   and $similar_sig.interests ~= $sig.interests
-   return { "sig_name" : $similar_sig.name }
-return { "similar_sigs" : $similar_sigs }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/5.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/5.aql
deleted file mode 100644
index 6653644..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/5.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $event in dataset('Event')
-where $event.name = "The Night of the Ad Eaters, 29th edition"
-let $collocated_events :=
-   for $collocated_event in dataset('Events')
-   where $collocated_event.location.street ~= $event.location.street
-   and $collocated_event.location.city = $event.location.city
-   and $collocated_event.location.state = $event.location.state
-   and $collocated_event.location.zip = $event.location.zip
-   return { "event_name" : $collocated_event.name }
-return { "collocated_evnets" : $collocated_events }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/6.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/6.aql
deleted file mode 100644
index 62fe967..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/6.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $user in dataset('Users')
-let $similar_users :=
-   for $similar_user in dataset('Users')
-   let $similarity := similarity_jaccard($user.interests, $similar_user.interests)
-   where $user != $similar_user
-   and $similarity >= .75
-   order by $similarity desc
-   limit 10
-   return { "user_name" : $similar_user.name, "similarity" : $similarity }
-return { "user_name" : $user.name, "similar_users" : $similar_users }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/ANYInFieldAccessor.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/ANYInFieldAccessor.aql
deleted file mode 100644
index d2800c1..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/ANYInFieldAccessor.aql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $user in dataset('User')
-for $mv in dataset('Movie')
-where some $i in $user.interests satisfies $i.movie = $mv.movie[?]
-return { "name": $user.name, "movie": $mv.movie }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/IfInFLOWGR.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/IfInFLOWGR.aql
deleted file mode 100644
index 1ec2e65..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/IfInFLOWGR.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $i in [1,2,30,40]
-for $j in {{4,5,6}}
-return if ($i>$j) then $i else $j
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/IfThenElse.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/IfThenElse.aql
deleted file mode 100644
index 0c3fbac..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/IfThenElse.aql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-if (2>1) then
-    20
-else
-    10
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/LetFor.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/LetFor.aql
deleted file mode 100644
index 0f7009c..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/LetFor.aql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-let $users := dataset('User')
-for $user in $users
-where some $i in $user.interests satisfies $i = "movies"
-return { "name": $user.name }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/ListConstructor.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/ListConstructor.aql
deleted file mode 100644
index 5e84384..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/ListConstructor.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $i in [1,2,3]
-for $j in {{4,5,6}}
-return $i+$j
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/addOperator.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/addOperator.aql
deleted file mode 100644
index fe5ab3c..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/addOperator.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-1+1-2
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/constant.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/constant.aql
deleted file mode 100644
index 4fa77c9..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/constant.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--1 +1
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/createInternalDataSet.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/createInternalDataSet.aql
deleted file mode 100644
index 899c755..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/createInternalDataSet.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-create dataset ds1(someType) primary key id;
-create internal dataset ds2(someType) primary key id;
-
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/del-dataset.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/del-dataset.aql
deleted file mode 100644
index f7550db..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/del-dataset.aql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse demo0927 if exists;
-
-create dataverse demo0927;
-
-use dataverse demo0927;
-
-create type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-create type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-drop dataset Customers;
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/fieldAccessor.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/fieldAccessor.aql
deleted file mode 100644
index b324ee1..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/fieldAccessor.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-let $bla := { "name" : "value" }
-return
-  $bla."name" = $bla.name
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/functionDecl.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/functionDecl.aql
deleted file mode 100644
index 55ecd5e..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/functionDecl.aql
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-declare function add($a, $b){
-    $a + $b
-}
-
-declare function minus($a, $b){
-    $a - $b
-}
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/functionDecl1.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/functionDecl1.aql
deleted file mode 100644
index 1c65cdf..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/functionDecl1.aql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-declare function calculate($events){
-for $event in $events
-for $sponsor in $event.sponsoring_sigs
-let $es := { "event": $event, "sponsor": $sponsor }
-group by $sig_name := $sponsor.sig_name with $es
-let $sig_sponsorship_count := count($es)
-let $by_chapter :=
-   for $e in $es
-   group by $chapter_name := $e.sponsor.chapter_name with $es
-   return { "chapter_name": $chapter_name, "escount" : count($es) }
-order by $sig_sponsorship_count desc
-limit 5
-return { "sig_name": $sig_name, "total_count": $sig_sponsorship_count, "chapter_breakdown": $by_chapter }
-}
-
-let $result := calculate(dataset('Events'))
-return $result
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/functionDecl2.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/functionDecl2.aql
deleted file mode 100644
index c44d703..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/functionDecl2.aql
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-declare function GT($a, $b){
-if ($a > $b) then
-    true
-else
-    false
-}
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/functionDecl3.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/functionDecl3.aql
deleted file mode 100644
index 854d6f0..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/functionDecl3.aql
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-declare function "function with spaces"($a, $b) {
-  "string with spaces"
-};
-
-"function with spaces" (1, 2)
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/load-del-dataset.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/load-del-dataset.aql
deleted file mode 100644
index 5d6ca9b..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/load-del-dataset.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-drop dataverse demo0927 if exists;
-
-create dataverse demo0927;
-
-use dataverse demo0927;
-
-create type CustomerType as closed {
-  cid: int32, 
-  name: string,
-  age: int32?,
-  address: AddressType?,
-  lastorder: {
-    oid: int32,
-    total: float
-  }
-}
-
-create type AddressType as closed {
-  number: int32, 
-  street: string,
-  city: string
-}
-
-create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
-
-create dataset Customers(CustomerType) 
-  primary key cid with {"node-group":{"name":"group1"}};
-
-load dataset Customers 
-using localfs
-(("path"="asterix_nc1:///tmp/customerData.json"),("format"="adm")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/mulOperator.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/mulOperator.aql
deleted file mode 100644
index 848fe63..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/mulOperator.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-1+2*3-4
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFLWOGR.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFLWOGR.aql
deleted file mode 100644
index 12f4756..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFLWOGR.aql
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $user in
-    let $data := dataset('User')
-    return $data
-where some $i in $user.interests satisfies $i = "movies"
-return { "name": $user.name }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFLWOGR1.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFLWOGR1.aql
deleted file mode 100644
index 4701ec8..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFLWOGR1.aql
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $i in [1,2,30,40]
-for $j in {{4,5,6}}
-return
-    for $k in if ($i>$j) then $i else $j
-    where $k <10
-    return $k
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFLWOGR2.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFLWOGR2.aql
deleted file mode 100644
index 81f9b0d..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFLWOGR2.aql
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $i in [1,2,30,for $tmp in dataset('number') return $tmp]
-for $j in {{4,5,6}}
-return
-    for $k in if ($i>$j) then $i else $j
-    where $k <10
-    return $k
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFLWOGR3.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFLWOGR3.aql
deleted file mode 100644
index c1a9ec9..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFLWOGR3.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $event in dataset('Event')
-for $sponsor in $event.sponsoring_sigs
-let $es := { "event": $event, "sponsor": $sponsor }
-group by $sig_name := $sponsor.sig_name with $es
-let $sig_sponsorship_count := count($es)
-let $by_chapter :=
-   for $e in $es
-   group by $chapter_name := $e.sponsor.chapter_name with $es
-   return { "chapter_name": $chapter_name, "escount" : count($es) }
-order by $sig_sponsorship_count desc
-limit 5 offset 2
-return { "sig_name": $sig_name, "total_count": $sig_sponsorship_count, "chapter_breakdown": $by_chapter }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFor.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFor.aql
deleted file mode 100644
index 03172b7..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/nestedFor.aql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $user in dataset('User')
-for $mv in dataset('Movie')
-where some $i in $user.interests satisfies $i.movie = $mv.movie
-return { "name": $user.name, "movie": $mv.movie }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/numberInFieldAccessor.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/numberInFieldAccessor.aql
deleted file mode 100644
index 7dfcb93..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/numberInFieldAccessor.aql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-for $user in dataset('User')
-for $mv in dataset('Movie')
-where some $i in $user.interests satisfies $i.movie = $mv.movie[2]
-return { "name": $user.name, "movie": $mv.movie }
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/union.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/union.aql
deleted file mode 100644
index eb98c60..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/union.aql
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-(for $l in foo1()
-return $l)
-union
-(for $l in foo2()
-return $l)
-union
-(for $l in foo3()
-return $l)
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/utf-8.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/utf-8.aql
deleted file mode 100644
index 645c6ee..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/utf-8.aql
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-string-to-codepoint("äöß");
-string-to-codepoint("迎");
-/* currently fails (issue 277) string-to-codepoint("欢")  */
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/variables.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/variables.aql
deleted file mode 100644
index d8dc03f..0000000
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/variables.aql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-let $a:=1
-let $b:=1
-return
-  $b-$a
diff --git a/asterixdb/asterix-app/src/test/resources/spatial/local/spatial-drop.aql b/asterixdb/asterix-app/src/test/resources/spatial/local/spatial-drop.aql
deleted file mode 100644
index 110ab61..0000000
--- a/asterixdb/asterix-app/src/test/resources/spatial/local/spatial-drop.aql
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset MyData(MyRecord)
-  primary key id on group1;
-
-drop dataset MyData;
diff --git a/asterixdb/asterix-app/src/test/resources/spatial/local/spatial-load.aql b/asterixdb/asterix-app/src/test/resources/spatial/local/spatial-load.aql
deleted file mode 100644
index fddb91b..0000000
--- a/asterixdb/asterix-app/src/test/resources/spatial/local/spatial-load.aql
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse demo1112;
-
-declare type MyRecord as open {
-  id: int32,
-  point: point,
-  kwds: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
-
-declare dataset MyData(MyRecord)
-  primary key id on group1;
-
-load dataset MyData 
-using localfs
-(("path"="asterix_nc1:///tmp/data.json"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/enlist_data.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/enlist_data.aql
deleted file mode 100644
index 9bf9403..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/enlist_data.aql
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix-001, asterix-002 , asterix-003, asterix-004,
-  asterix-005, asterix-006, asterix-007, asterix-008, asterix-009, asterix-010;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-
-enlist dataset Customers;
-
-enlist dataset Suppliers;
-
-enlist dataset Nations;
-
-enlist dataset Regions;
-
-enlist dataset Parts;
-
-enlist dataset PartSupp;
-
-enlist dataset Orders;
-
-enlist dataset LineItems;
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/inlined_q18_large_volume_customer.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/inlined_q18_large_volume_customer.aql
deleted file mode 100644
index c6ef655..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/inlined_q18_large_volume_customer.aql
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare nodegroup group1 on asterix-001, asterix-002, asterix-003, asterix-004,
-      asterix-005, asterix-006, asterix-007, asterix-008, asterix-009, asterix-010;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
-declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
-declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
-
-write output to asterix-001:"/tmp/inlined_q18_large_volume_customer.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where
-  $c.c_custkey = $o.o_custkey
-for $t in 
-(
-  for $l in dataset('LineItems')
-  group by $l_orderkey := $l.l_orderkey with $l
-  return 
-    { "l_orderkey": $l_orderkey, 
-      "t_sum_quantity": sum(for $i in $l return $i.l_quantity) }
-) 
-where 
-  $o.o_orderkey = $t.l_orderkey and $t.t_sum_quantity > 300
-for $l in dataset('LineItems')
-where
-  $l.l_orderkey = $o.o_orderkey 
-group by $c_name := $c.c_name, $c_custkey := $c.c_custkey, $o_orderkey := $o.o_orderkey, 
-         $o_orderdate := $o.o_orderdate, $o_totalprice := $o.o_totalprice with $l
-order by $o_totalprice desc, $o_orderdate 
-limit 100
-return {  
-  "c_name": $c_name,
-  "c_custkey": $c_custkey,
-  "o_orderkey": $o_orderkey,
-  "o_orderdate": $o_orderdate,
-  "o_totalprice": $o_totalprice,
-  "sum_quantity": sum(for $j in $l return $j.l_quantity)  
-}
-
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_adm.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_adm.aql
deleted file mode 100644
index 41161af..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_adm.aql
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix-001, asterix-002 , asterix-003, asterix-004,
-  asterix-005, asterix-006, asterix-007, asterix-008, asterix-009, asterix-010;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-
-load dataset LineItems 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/data/tpch/lineitem.adm"),("format"="adm")) pre-sorted;
-
-load dataset Orders 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/data/tpch/orders.adm"),("format"="adm")) pre-sorted;
-
-load dataset Customers 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/data/tpch/customer.adm"),("format"="adm")) pre-sorted;
-
-load dataset Suppliers 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/data/tpch/supplier.adm"),("format"="adm")) pre-sorted;
-
-load dataset Nations 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/data/tpch/nation.adm"),("format"="adm")) pre-sorted;
-
-load dataset Regions 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/data/tpch/region.adm"),("format"="adm")) pre-sorted;
-
-load dataset Parts 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/data/tpch/part.adm"),("format"="adm")) pre-sorted;
-
-load dataset PartSupp 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/data/tpch/partsupp.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_tbl_100x.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_tbl_100x.aql
deleted file mode 100644
index eec9c69..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_tbl_100x.aql
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix-001, asterix-002 , asterix-003, asterix-004,
-  asterix-005, asterix-006, asterix-007, asterix-008, asterix-009, asterix-010;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-
-load dataset Customers 
-using localfs
-(("path"="asterix-002:///mnt/data/sdb/space/onose/delim_data/hundredgigs/customer.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Suppliers 
-using localfs
-(("path"="asterix-002:///mnt/data/sdb/space/onose/delim_data/hundredgigs/customer.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Nations 
-using localfs
-(("path"="asterix-002:///mnt/data/sdb/space/onose/delim_data/hundredgigs/customer.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Regions 
-using localfs
-(("path"="asterix-002:///mnt/data/sdb/space/onose/delim_data/hundredgigs/customer.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Parts 
-using localfs
-(("path"="asterix-002:///mnt/data/sdb/space/onose/delim_data/hundredgigs/customer.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset PartSupp 
-using localfs
-(("path"="asterix-001:///mnt/data/sdb/space/onose/splits/partsupp_part00,
-  asterix-002:///mnt/data/sdb/space/onose/splits/partsupp_part01,
-  asterix-003:///mnt/data/sdb/space/onose/splits/partsupp_part02,
-  asterix-004:///mnt/data/sdb/space/onose/splits/partsupp_part03,
-  asterix-005:///mnt/data/sdb/space/onose/splits/partsupp_part04,
-  asterix-006:///mnt/data/sdb/space/onose/splits/partsupp_part05,
-  asterix-007:///mnt/data/sdb/space/onose/splits/partsupp_part06,
-  asterix-008:///mnt/data/sdb/space/onose/splits/partsupp_part07,
-  asterix-009:///mnt/data/sdb/space/onose/splits/partsupp_part08,
-  asterix-010:///mnt/data/sdb/space/onose/splits/partsupp_part09"),              
-("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Orders 
-using localfs
-(("path"="asterix-001:///mnt/data/sdb/space/onose/splits/orders_part00,
-  asterix-002:///mnt/data/sdb/space/onose/splits/orders_part01,
-  asterix-003:///mnt/data/sdb/space/onose/splits/orders_part02,
-  asterix-004:///mnt/data/sdb/space/onose/splits/orders_part03,
-  asterix-005:///mnt/data/sdb/space/onose/splits/orders_part04,
-  asterix-006:///mnt/data/sdb/space/onose/splits/orders_part05,
-  asterix-007:///mnt/data/sdb/space/onose/splits/orders_part06,
-  asterix-008:///mnt/data/sdb/space/onose/splits/orders_part07,
-  asterix-009:///mnt/data/sdb/space/onose/splits/orders_part08,
-  asterix-010:///mnt/data/sdb/space/onose/splits/orders_part09"),              
-("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset LineItems 
-using localfs
-(("path"="asterix-001:///mnt/data/sdb/space/onose/splits/lineitems_part00,
-  asterix-002:///mnt/data/sdb/space/onose/splits/lineitems_part01,
-  asterix-003:///mnt/data/sdb/space/onose/splits/lineitems_part02,
-  asterix-004:///mnt/data/sdb/space/onose/splits/lineitems_part03,
-  asterix-005:///mnt/data/sdb/space/onose/splits/lineitems_part04,
-  asterix-006:///mnt/data/sdb/space/onose/splits/lineitems_part05,
-  asterix-007:///mnt/data/sdb/space/onose/splits/lineitems_part06,
-  asterix-008:///mnt/data/sdb/space/onose/splits/lineitems_part07,
-  asterix-009:///mnt/data/sdb/space/onose/splits/lineitems_part08,
-  asterix-010:///mnt/data/sdb/space/onose/splits/lineitems_part09"),              
-("format"="delimited-text"),("delimiter"="|")) pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_tbl_1x.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_tbl_1x.aql
deleted file mode 100644
index 55c8f03..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_tbl_1x.aql
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix-001, asterix-002 , asterix-003, asterix-004,
-  asterix-005, asterix-006, asterix-007, asterix-008, asterix-009, asterix-010;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-
-load dataset Customers 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/delim_data/onegig/customer.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Suppliers 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/delim_data/onegig/supplier.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Nations 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/delim_data/onegig/nation.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Regions 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/delim_data/onegig/region.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Parts 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/delim_data/onegig/part.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset PartSupp 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/delim_data/onegig/partsupp.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Orders 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/delim_data/onegig/orders.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset LineItems 
-using localfs
-(("path"="asterix-001:///home/ubuntu/nick/delim_data/onegig/lineitem.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q01_pricing_summary_report.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q01_pricing_summary_report.aql
deleted file mode 100644
index ee24f08..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q01_pricing_summary_report.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare nodegroup group1 on asterix-001, asterix-002, asterix-003, asterix-004,
-      asterix-005, asterix-006, asterix-007, asterix-008, asterix-009, asterix-010;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
-
-write output to asterix-001:"/home/onose/hyracks-asterix/results/q1_pricing_summary_report.adm";
- 
-for $l in dataset('LineItems')
-where $l.l_shipdate <= '1998-09-02'
-group by $l_returnflag := $l.l_returnflag, $l_linestatus := $l.l_linestatus  
-  with $l
-order by $l_returnflag, $l_linestatus
-return {
-  "l_returnflag": $l_returnflag,
-  "l_linestatus": $l_linestatus,
-  "sum_qty": sum(for $i in $l return $i.l_quantity),
-  "sum_base_price": sum(for $i in $l return $i.l_extendedprice),
-  "sum_disc_price": sum(for $i in $l return $i.l_extendedprice * (1 - $i.l_discount)),
-  "sum_charge": sum(for $i in $l return $i.l_extendedprice * (1 - $i.l_discount) * (1 + $i.l_tax)),
-  "ave_qty": avg(for $i in $l return $i.l_quantity),  
-  "ave_price": avg(for $i in $l return $i.l_extendedprice),
-  "ave_disc": avg(for $i in $l return $i.l_discount),
-  "count_order": count($l)
-}   
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q03_shipping_priority.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q03_shipping_priority.aql
deleted file mode 100644
index 3e53ea6..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q03_shipping_priority.aql
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare nodegroup group1 on asterix-001, asterix-002, asterix-003, asterix-004,
-      asterix-005, asterix-006, asterix-007, asterix-008, asterix-009, asterix-010;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-
-write output to asterix-001:"/home/onose/hyracks-asterix/results/q3_shipping_priority.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where
-  $c.c_mktsegment = 'BUILDING' and $c.c_custkey = $o.o_custkey 
-for $l in dataset('LineItems')
-where
-  $l.l_orderkey = $o.o_orderkey and
-  $o.o_orderdate < '1995-03-15' and $l.l_shipdate > '1995-03-15'
-group by $l_orderkey := $l.l_orderkey, $o_orderdate := $o.o_orderdate, $o_shippriority := $o.o_shippriority
-  with $l
-let $revenue := sum (
-  for $i in $l 
-  return 
-    $i.l_extendedprice * (1 - $i.l_discount)
-)
-order by $revenue desc, $o_orderdate
-limit 10
-return {  
-  "l_orderkey": $l_orderkey,
-  "revenue": $revenue,
-  "o_orderdate": $o_orderdate,
-  "o_shippriority": $o_shippriority 
-}
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q05_local_supplier_volume.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q05_local_supplier_volume.aql
deleted file mode 100644
index 19525e4..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q05_local_supplier_volume.aql
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare nodegroup group1 on asterix-001, asterix-002, asterix-003, asterix-004,
-      asterix-005, asterix-006, asterix-007, asterix-008, asterix-009, asterix-010;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
-declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
-declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
-declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
-declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
-  
-write output to asterix-001:"/home/onose/hyracks-asterix/results/q5_local_supplier.adm";
-
-
-for $c in dataset('Customers')
-for $o1 in 
-(  for $o in dataset('Orders')
-   for $l1 in (
-     for $l in dataset('LineItems')
-     for $s1 in 
-     (  for $s in dataset('Suppliers')
-        for $n1 in 
-        (  for $n in dataset('Nations')
-           for $r in dataset('Regions')
-             where $n.n_regionkey = $r.r_regionkey and $r.r_name = 'ASIA'
-           return 
-              {"n_name": $n.n_name, "n_nationkey": $n.n_nationkey}  )
-        where $s.s_nationkey = $n1.n_nationkey
-        return 
-           { "n_name": $n1.n_name, "s_suppkey": $s.s_suppkey, "s_nationkey": $s.s_nationkey }  )
-     where $l.l_suppkey = $s1.s_suppkey      
-     return 
-        { "n_name": $s1.n_name, "l_extendedprice": $l.l_extendedprice, "l_discount": $l.l_discount, "l_orderkey": $l.l_orderkey, "s_nationkey": $s1.s_nationkey }  )
-   where $l1.l_orderkey = $o.o_orderkey and $o.o_orderdate >= '1994-01-01' and $o.o_orderdate < '1995-01-01'
-   return 
-     { "n_name": $l1.n_name, "l_extendedprice": $l1.l_extendedprice, "l_discount": $l1.l_discount, "s_nationkey": $l1.s_nationkey, "o_custkey": $o.o_custkey }  )
-where $c.c_nationkey = $o1.s_nationkey and $c.c_custkey = $o1.o_custkey     
-group by $n_name := $o1.n_name with $o1
-let $revenue := sum (
-  for $i in $o1 
-  return 
-    $i.l_extendedprice * (1 - $i.l_discount)
-)
-order by $revenue desc
-return 
-  { "n_name": $n_name, "revenue": $revenue }
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q09_product_type_profit.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q09_product_type_profit.aql
deleted file mode 100644
index eafb46a..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q09_product_type_profit.aql
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix-001, asterix-002, asterix-003, asterix-004,
-      asterix-005, asterix-006, asterix-007, asterix-008, asterix-009, asterix-010;
-      
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
-declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
-declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
-declare dataset Parts(PartType)
-  primary key p_partkey on group1;
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
-  
-write output to asterix-001:"/home/onose/hyracks-asterix/results/q9_product_type_profit.adm";
-
-                
-for $profit in 
-(  for $o in dataset('Orders')
-   for $l3 in 
-   (  for $p in dataset('Parts')
-      for $l2 in 
-      (  for $ps in dataset('PartSupp')
-         for $l1 in 
-        (  for $s1 in
-            (  for $s in dataset('Suppliers')
-               for $n in dataset('Nations')
-               where $n.n_nationkey = $s.s_nationkey
-               return 
-                 { "s_suppkey": $s.s_suppkey, "n_name": $n.n_name}  )
-            for $l in dataset('LineItems')
-            where $s1.s_suppkey = $l.l_suppkey       
-            return 
-              { "l_suppkey": $l.l_suppkey, "l_extendedprice": $l.l_extendedprice, "l_discount": $l.l_discount,
-                "l_quantity": $l.l_quantity, "l_partkey": $l.l_partkey, "l_orderkey": $l.l_orderkey, "n_name": $s1.n_name } )
-         where $ps.ps_suppkey = $l1.l_suppkey and $ps.ps_partkey = $l1.l_partkey       
-         return 
-           { "l_extendedprice": $l1.l_extendedprice, "l_discount": $l1.l_discount, "l_quantity": $l1.l_quantity, 
-             "l_partkey": $l1.l_partkey, "l_orderkey": $l1.l_orderkey, "n_name": $l1.n_name, "ps_supplycost": $ps.ps_supplycost }  )
-      where contains($p.p_name, 'green') and $p.p_partkey = $l2.l_partkey    
-      return 
-        { "l_extendedprice": $l2.l_extendedprice, "l_discount": $l2.l_discount, "l_quantity": $l2.l_quantity, 
-          "l_orderkey": $l2.l_orderkey, "n_name": $l2.n_name, "ps_supplycost": $l2.ps_supplycost  }  )
-   where $o.o_orderkey = $l3.l_orderkey
-   let $amount := $l3.l_extendedprice * (1 - $l3.l_discount) -  $l3.ps_supplycost * $l3.l_quantity 
-   let $o_year := year($o.o_orderdate)
-   return 
-     { "nation": $l3.n_name, "o_year": $o_year, "amount": $amount }  )
- group by $nation := $profit.nation, $o_year := $profit.o_year with $profit
- order by $nation, $o_year desc
- return 
-   { "nation": $nation, 
-     "o_year": $o_year, 
-      "sum_profit": sum( for $pr in $profit return $pr.amount )  }    
-   
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/inlined_q18_large_volume_customer.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/inlined_q18_large_volume_customer.aql
deleted file mode 100644
index 7d391f5..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/inlined_q18_large_volume_customer.aql
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/inlined_q18_large_volume_customer.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where
-  $c.c_custkey = $o.o_custkey
-for $t in 
-(
-  for $l in dataset('LineItems')
-  group by $l_orderkey := $l.l_orderkey with $l
-  return 
-    { "l_orderkey": $l_orderkey, 
-      "t_sum_quantity": sum(for $i in $l return $i.l_quantity) }
-) 
-where 
-  $o.o_orderkey = $t.l_orderkey and $t.t_sum_quantity > 300
-for $l in dataset('LineItems')
-where
-  $l.l_orderkey = $o.o_orderkey 
-group by $c_name := $c.c_name, $c_custkey := $c.c_custkey, $o_orderkey := $o.o_orderkey, 
-         $o_orderdate := $o.o_orderdate, $o_totalprice := $o.o_totalprice with $l
-order by $o_totalprice desc, $o_orderdate 
-limit 100
-return {  
-  "c_name": $c_name,
-  "c_custkey": $c_custkey,
-  "o_orderkey": $o_orderkey,
-  "o_orderdate": $o_orderdate,
-  "o_totalprice": $o_totalprice,
-  "sum_quantity": sum(for $j in $l return $j.l_quantity)  
-}
-
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_adm_data.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_adm_data.aql
deleted file mode 100644
index d2512a0..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_adm_data.aql
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-load dataset LineItems 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/lineitems.adm"),("format="adm")) pre-sorted;
-
-load dataset Orders 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/orders.adm"),("format"="adm")) pre-sorted;
-
-load dataset Customers 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/customers.adm"),("format"="adm")) pre-sorted;
-
-load dataset Suppliers 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/suppliers.adm"),("format"="adm")) pre-sorted;
-
-load dataset Nations 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/nations.adm"),("format"="adm")) pre-sorted;
-
-load dataset Regions 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/regions.adm"),("format"="adm")) pre-sorted;
-
-load dataset Parts 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/parts.adm"),("format"="adm")) pre-sorted;
-
-load dataset PartSupp 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/partsupp.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_0.001x_2nodes.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_0.001x_2nodes.aql
deleted file mode 100644
index cab0315..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_0.001x_2nodes.aql
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-load dataset LineItems 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/lineitem.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Orders 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/orders.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Customers 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/customer.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Suppliers 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/supplier.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Nations 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/nation.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Regions 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/region.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Parts 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/part.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset PartSupp 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tpch0.001/tbl/partsupp.tbl"),("delimiter"="|")) pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_10x_1node.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_10x_1node.aql
deleted file mode 100644
index 0c55e17..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_10x_1node.aql
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix_nc1;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-load dataset LineItems 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tengigs/lineitem.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Orders 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tengigs/lineitem.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Customers 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tengigs/lineitem.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Suppliers 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tengigs/lineitem.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Nations 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tengigs/lineitem.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Regions 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tengigs/lineitem.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Parts 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tengigs/lineitem.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset PartSupp 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/tengigs/lineitem.tbl"),("delimiter"="|")) pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_1x_1node.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_1x_1node.aql
deleted file mode 100644
index 606f6b8..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_1x_1node.aql
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix_nc1;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-load dataset LineItems 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/onegig/lineitem.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Orders
-using localfs
-(("path"="asterix_nc1:///opt/tpch/onegig/orders.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Customers 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/onegig/customer.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Suppliers 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/onegig/customer.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Nations 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/onegig/customer.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Regions 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/onegig/region.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset Parts 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/onegig/part.tbl"),("delimiter"="|")) pre-sorted;
-
-load dataset PartSupp 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/onegig/partsupp.tbl"),("delimiter"="|")) pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_20x_2node.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_20x_2node.aql
deleted file mode 100644
index 5bfa238..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_20x_2node.aql
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-
-load dataset LineItems 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/twentygigs/lineitem.tbl.1,asterix_nc1:///opt/tpch/twentygigs/lineitem.tbl.2"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Orders 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/twentygigs/orders.tbl.1,asterix_nc1:///opt/tpch/twentygigs/orders.tbl.2"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Customers 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/twentygigs/customer.tbl.1,asterix_nc1:///opt/tpch/twentygigs/customer.tbl.2"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Suppliers 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/twentygigs/supplier.tbl.1,asterix_nc1:///opt/tpch/twentygigs/supplier.tbl.2"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Nations 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/twentygigs/nation.tbl.1"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Regions 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/twentygigs/region.tbl.1"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset Parts 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/twentygigs/part.tbl.1,asterix_nc2:///opt/tpch/twentygigs/part.tbl.2"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset PartSupp 
-using localfs
-(("path"="asterix_nc1:///opt/tpch/twentygigs/partsupp.tbl.1,asterix_nc2:///opt/tpch/twentygigs/partsupp.tbl.2"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/orders-index-create.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/orders-index-create.aql
deleted file mode 100644
index bfec649..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/orders-index-create.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-
-create index idx_Orders_Custkey on Orders(o_custkey);
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/orders-index-search.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/orders-index-search.aql
deleted file mode 100644
index d473058..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/orders-index-search.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-
-declare index idx_Orders_Custkey on Orders(o_custkey);
-
-write output to asterix_nc1:"/tmp/orders-index-search.adm";
-
-
-for $o in dataset('Orders')
-where
-  $o.o_custkey = 40
-return {  
-  "o_orderkey": $o.o_orderkey,
-  "o_custkey": $o.o_custkey 
-}
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q01_pricing_summary_report.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q01_pricing_summary_report.aql
deleted file mode 100644
index e05c636..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q01_pricing_summary_report.aql
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-
-// for external datasets, use:
-//
-// declare dataset LineItems(LineItemType)
-//   splits asterix_nc1:"/opt/tmp/tpch0.001/lineitem.tbl" delimited by "|";
-
-
-write output to asterix_nc1:"/tmp/q1_pricing_summary_report.adm";
- 
-for $l in dataset('LineItems')
-where $l.l_shipdate <= '1998-09-02'
-group by $l_returnflag := $l.l_returnflag, $l_linestatus := $l.l_linestatus  
-  with $l
-order by $l_returnflag, $l_linestatus
-return {
-  "l_returnflag": $l_returnflag,
-  "l_linestatus": $l_linestatus,
-  "sum_qty": sum(for $i in $l return $i.l_quantity),
-  "sum_base_price": sum(for $i in $l return $i.l_extendedprice),
-  "sum_disc_price": sum(for $i in $l return $i.l_extendedprice * (1 - $i.l_discount)),
-  "sum_charge": sum(for $i in $l return $i.l_extendedprice * (1 - $i.l_discount) * (1 + $i.l_tax)),
-  "ave_qty": avg(for $i in $l return $i.l_quantity),  
-  "ave_price": avg(for $i in $l return $i.l_extendedprice),
-  "ave_disc": avg(for $i in $l return $i.l_discount),
-  "count_order": count($l)
-}   
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q03_shipping_priority.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q03_shipping_priority.aql
deleted file mode 100644
index 4f1199c..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q03_shipping_priority.aql
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-
-write output to asterix_nc1:"/tmp/q3_shipping_priority.adm";
-
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where
-  $c.c_mktsegment = 'BUILDING' and $c.c_custkey = $o.o_custkey 
-for $l in dataset('LineItems')
-where
-  $l.l_orderkey = $o.o_orderkey and
-  $o.o_orderdate < '1995-03-15' and $l.l_shipdate > '1995-03-15'
-group by $l_orderkey := $l.l_orderkey, $o_orderdate := $o.o_orderdate, $o_shippriority := $o.o_shippriority
-  with $l
-let $revenue := sum (
-  for $i in $l 
-  return 
-    $i.l_extendedprice * (1 - $i.l_discount)
-)
-order by $revenue desc, $o_orderdate
-limit 10
-return {  
-  "l_orderkey": $l_orderkey,
-  "revenue": $revenue,
-  "o_orderdate": $o_orderdate,
-  "o_shippriority": $o_shippriority 
-}
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q05_local_supplier_volume.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q05_local_supplier_volume.aql
deleted file mode 100644
index 1832129..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q05_local_supplier_volume.aql
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Regions(RegionType)
-  primary key r_regionkey with {"node-group":{"name":"group1"}};
-  
-write output to asterix_nc1:"/tmp/q5_local_supplier_volume.adm";
-
-
-for $c in dataset('Customers')
-for $o1 in 
-(  for $o in dataset('Orders')
-   for $l1 in (
-     for $l in dataset('LineItems')
-     for $s1 in 
-     (  for $s in dataset('Suppliers')
-        for $n1 in 
-        (  for $n in dataset('Nations')
-           for $r in dataset('Regions')
-             where $n.n_regionkey = $r.r_regionkey and $r.r_name = 'ASIA'
-           return 
-              {"n_name": $n.n_name, "n_nationkey": $n.n_nationkey}  )
-        where $s.s_nationkey = $n1.n_nationkey
-        return 
-           { "n_name": $n1.n_name, "s_suppkey": $s.s_suppkey, "s_nationkey": $s.s_nationkey }  )
-     where $l.l_suppkey = $s1.s_suppkey      
-     return 
-        { "n_name": $s1.n_name, "l_extendedprice": $l.l_extendedprice, "l_discount": $l.l_discount, "l_orderkey": $l.l_orderkey, "s_nationkey": $s1.s_nationkey }  )
-   where $l1.l_orderkey = $o.o_orderkey and $o.o_orderdate >= '1994-01-01' and $o.o_orderdate < '1995-01-01'
-   return 
-     { "n_name": $l1.n_name, "l_extendedprice": $l1.l_extendedprice, "l_discount": $l1.l_discount, "s_nationkey": $l1.s_nationkey, "o_custkey": $o.o_custkey }  )
-where $c.c_nationkey = $o1.s_nationkey and $c.c_custkey = $o1.o_custkey     
-group by $n_name := $o1.n_name with $o1
-let $revenue := sum (
-  for $i in $o1 
-  return 
-    $i.l_extendedprice * (1 - $i.l_discount)
-)
-order by $revenue desc
-return 
-  { "n_name": $n_name, "revenue": $revenue }
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q09_product_type_profit.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q09_product_type_profit.aql
deleted file mode 100644
index 6638e7a..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q09_product_type_profit.aql
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey with {"node-group":{"name":"group1"}};
-declare dataset Nations(NationType) 
-  primary key n_nationkey with {"node-group":{"name":"group1"}};
-declare dataset Parts(PartType)
-  primary key p_partkey with {"node-group":{"name":"group1"}};
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
-  
-write output to asterix_nc1:"/tmp/q9_product_type_profit.adm";
-
-                
-for $profit in 
-(  for $o in dataset('Orders')
-   for $l3 in 
-   (  for $p in dataset('Parts')
-      for $l2 in 
-      (  for $ps in dataset('PartSupp')
-         for $l1 in 
-        (  for $s1 in
-            (  for $s in dataset('Suppliers')
-               for $n in dataset('Nations')
-               where $n.n_nationkey = $s.s_nationkey
-               return 
-                 { "s_suppkey": $s.s_suppkey, "n_name": $n.n_name}  )
-            for $l in dataset('LineItems')
-            where $s1.s_suppkey = $l.l_suppkey       
-            return 
-              { "l_suppkey": $l.l_suppkey, "l_extendedprice": $l.l_extendedprice, "l_discount": $l.l_discount,
-                "l_quantity": $l.l_quantity, "l_partkey": $l.l_partkey, "l_orderkey": $l.l_orderkey, "n_name": $s1.n_name } )
-         where $ps.ps_suppkey = $l1.l_suppkey and $ps.ps_partkey = $l1.l_partkey       
-         return 
-           { "l_extendedprice": $l1.l_extendedprice, "l_discount": $l1.l_discount, "l_quantity": $l1.l_quantity, 
-             "l_partkey": $l1.l_partkey, "l_orderkey": $l1.l_orderkey, "n_name": $l1.n_name, "ps_supplycost": $ps.ps_supplycost }  )
-      where contains($p.p_name, 'green') and $p.p_partkey = $l2.l_partkey    
-      return 
-        { "l_extendedprice": $l2.l_extendedprice, "l_discount": $l2.l_discount, "l_quantity": $l2.l_quantity, 
-          "l_orderkey": $l2.l_orderkey, "n_name": $l2.n_name, "ps_supplycost": $l2.ps_supplycost  }  )
-   where $o.o_orderkey = $l3.l_orderkey
-   let $amount := $l3.l_extendedprice * (1 - $l3.l_discount) -  $l3.ps_supplycost * $l3.l_quantity 
-   let $o_year := year($o.o_orderdate)
-   return 
-     { "nation": $l3.n_name, "o_year": $o_year, "amount": $amount }  )
- group by $nation := $profit.nation, $o_year := $profit.o_year with $profit
- order by $nation, $o_year desc
- return 
-   { "nation": $nation, 
-     "o_year": $o_year, 
-      "sum_profit": sum( for $pr in $profit return $pr.amount )  }    
-   
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/scan_filter_lineitem.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/scan_filter_lineitem.aql
deleted file mode 100644
index 25bb8d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/scan_filter_lineitem.aql
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-
-// load dataset LineItems from asterix_nc1:"/opt/tpch/tengigs/lineitem.tbl" delimited by "|";
-
-// for external datasets, use:
-//
-// declare dataset LineItems(LineItemType)
-//   splits asterix_nc1:"/opt/tmp/tpch0.001/lineitem.tbl" delimited by "|";
-
-
-write output to asterix_nc1:"/tmp/li_10x.adm";
-
-for $li in dataset('LineItems')
-where $li.l_orderkey = 1
-return $li
-
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/write-custorder.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/write-custorder.aql
deleted file mode 100644
index 6c67591..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/write-custorder.aql
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type CustOrderType as closed {
-  co_custkey: int32, 
-  co_orderkey: int32
-}
-
-declare nodegroup group1 on asterix_nc1, asterix_nc2;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
-declare dataset Orders(OrderType)
-  primary key o_orderkey with {"node-group":{"name":"group1"}};
-declare dataset Customers(CustomerType) 
-  primary key c_custkey with {"node-group":{"name":"group1"}};
-declare dataset CustOrder(CustOrderType)
-  primary key co_custkey with {"node-group":{"name":"group1"}};
-
-insert into dataset CustOrder 
-( for $c in dataset('Customers')
-  for $o in dataset('Orders')
-  where $c.c_custkey = $o.o_custkey
-   return
-  { "co_custkey": $c.c_custkey, "co_orderkey": $o.o_orderkey }
-);
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/rainbow/load_data_tbl_50x.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/rainbow/load_data_tbl_50x.aql
deleted file mode 100644
index 40cbf48..0000000
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/rainbow/load_data_tbl_50x.aql
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse tpch;
-
-declare type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
-  l_extendedprice: double,
-  l_discount: double, 
-  l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
-  l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
-  l_comment: string
-}
-
-declare type OrderType as closed {
-  o_orderkey: int32, 
-  o_custkey: int32, 
-  o_orderstatus: string, 
-  o_totalprice: double, 
-  o_orderdate: string, 
-  o_orderpriority: string,
-  o_clerk: string, 
-  o_shippriority: int32, 
-  o_comment: string
-}
-
-declare type CustomerType as closed {
-  c_custkey: int32, 
-  c_name: string, 
-  c_address: string, 
-  c_nationkey: int32, 
-  c_phone: string, 
-  c_acctbal: double, 
-  c_mktsegment: string,
-  c_comment: string
-}
-
-declare type SupplierType as closed {
-  s_suppkey: int32, 
-  s_name: string,
-  s_address: string,
-  s_nationkey: int32,
-  s_phone: string,
-  s_acctbal: double,
-  s_comment: string
-}
-
-declare type NationType as closed {
-  n_nationkey: int32,
-  n_name: string,
-  n_regionkey: int32,
-  n_comment: string
-}
-
-declare type RegionType as closed {
-  r_regionkey: int32,
-  r_name: string,
-  r_comment: string
-}
-
-declare type PartType as closed {
-  p_partkey: int32, 
-  p_name: string, 
-  p_mfgr: string,
-  p_brand: string,
-  p_type: string,
-  p_size: int32,
-  p_container: string,
-  p_retailprice: double,
-  p_comment: string
-}
-
-declare type PartSuppType as closed {
-  ps_partkey: int32, 
-  ps_suppkey: int32,
-  ps_availqty: int32,
-  ps_supplycost: double,
-  ps_comment: string 
-}
-
-declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03,
-rainbow-04, rainbow-05;
-
-declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
-declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
-declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
-declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
-declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
-declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
-declare dataset Parts(PartType)
-  primary key p_partkey on group1;
-declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
-
-
-load dataset Customers from 
-   rainbow-01:"/data/onose/fiftygigs/customer.tbl.1",
-   rainbow-02:"/data/onose/fiftygigs/customer.tbl.2",
-   rainbow-03:"/data/onose/fiftygigs/customer.tbl.3",
-   rainbow-04:"/data/onose/fiftygigs/customer.tbl.4",
-   rainbow-05:"/data/onose/fiftygigs/customer.tbl.5"
-     delimited by "|" pre-sorted;
-
-load dataset Suppliers from 
-   rainbow-01:"/data/onose/fiftygigs/supplier.tbl.1",
-   rainbow-02:"/data/onose/fiftygigs/supplier.tbl.2",
-   rainbow-03:"/data/onose/fiftygigs/supplier.tbl.3",
-   rainbow-04:"/data/onose/fiftygigs/supplier.tbl.4",
-   rainbow-05:"/data/onose/fiftygigs/supplier.tbl.5"
-     delimited by "|" pre-sorted;
-
-load dataset Nations from rainbow-05:"/data/onose/fiftygigs/nation.tbl"  delimited by "|" pre-sorted;
-
-load dataset Regions from rainbow-05:"/data/onose/fiftygigs/region.tbl"  delimited by "|" pre-sorted;
-
-load dataset Parts from 
-   rainbow-01:"/data/onose/fiftygigs/part.tbl.1",
-   rainbow-02:"/data/onose/fiftygigs/part.tbl.2",
-   rainbow-03:"/data/onose/fiftygigs/part.tbl.3",
-   rainbow-04:"/data/onose/fiftygigs/part.tbl.4",
-   rainbow-05:"/data/onose/fiftygigs/part.tbl.5"
-     delimited by "|" pre-sorted;
-
-load dataset PartSupp from 
-   rainbow-01:"/data/onose/fiftygigs/partsupp.tbl.1",
-   rainbow-02:"/data/onose/fiftygigs/partsupp.tbl.2",
-   rainbow-03:"/data/onose/fiftygigs/partsupp.tbl.3",
-   rainbow-04:"/data/onose/fiftygigs/partsupp.tbl.4",
-   rainbow-05:"/data/onose/fiftygigs/partsupp.tbl.5"
-     delimited by "|" pre-sorted;
-
-load dataset Orders from 
-   rainbow-01:"/data/onose/fiftygigs/orders.tbl.1",
-   rainbow-02:"/data/onose/fiftygigs/orders.tbl.2",
-   rainbow-03:"/data/onose/fiftygigs/orders.tbl.3",
-   rainbow-04:"/data/onose/fiftygigs/orders.tbl.4",
-   rainbow-05:"/data/onose/fiftygigs/orders.tbl.5"
-     delimited by "|" pre-sorted;
-
-load dataset LineItems from 
-   rainbow-01:"/data/onose/fiftygigs/lineitem.tbl.1",
-   rainbow-02:"/data/onose/fiftygigs/lineitem.tbl.2",
-   rainbow-03:"/data/onose/fiftygigs/lineitem.tbl.3",
-   rainbow-04:"/data/onose/fiftygigs/lineitem.tbl.4",
-   rainbow-05:"/data/onose/fiftygigs/lineitem.tbl.5"
-     delimited by "|" pre-sorted;