http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
deleted file mode 100644
index 5845a2e..0000000
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
+++ /dev/null
@@ -1,875 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.ignite.internal.processors.query.h2.sql;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-
-/**
- * Test to compare query results from h2 database instance and mixed ignite 
caches (replicated and partitioned) 
- * which have the same data models and data content. 
- */
-public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
-    /** */
-    private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
-
-    /** Partitioned cache. */
-    private static IgniteCache pCache;
-
-    /** Replicated cache. */
-    private static IgniteCache rCache;
-    
-    /** H2 db connection. */
-    private static Connection conn;
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
-    @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
-        IgniteConfiguration c = super.getConfiguration(gridName);
-
-        TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
-        disco.setIpFinder(IP_FINDER);
-
-        c.setDiscoverySpi(disco);
-
-        c.setMarshaller(new OptimizedMarshaller(true));
-
-        c.setCacheConfiguration(createCache("part", CacheMode.PARTITIONED),
-            createCache("repl", CacheMode.REPLICATED)
-        );
-
-        return c;
-    }
-
-    /**
-     * Creates new cache configuration.
-     *
-     * @param name Cache name.
-     * @param mode Cache mode.
-     * @return Cache configuration.
-     */
-    private static CacheConfiguration createCache(String name, CacheMode mode) 
{
-        CacheConfiguration<?,?> cc = defaultCacheConfiguration();
-
-        cc.setName(name);
-        cc.setCacheMode(mode);
-        
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-        cc.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
-
-        if (mode == CacheMode.PARTITIONED)
-            cc.setIndexedTypes(
-                Integer.class, Organization.class,
-                AffinityKey.class, Person.class,
-                AffinityKey.class, Purchase.class
-            );
-        else if (mode == CacheMode.REPLICATED)
-            cc.setIndexedTypes(
-                Integer.class, Product.class
-            );
-        else
-            throw new IllegalStateException("mode: " + mode);
-
-        return cc;
-    }
-
-
-    /** {@inheritDoc} */
-    @Override protected void beforeTestsStarted() throws Exception {
-        super.beforeTestsStarted();
-
-        Ignite ignite = startGrids(4);
-
-        pCache = ignite.cache("part");
-        
-        rCache = ignite.cache("repl");
-
-        awaitPartitionMapExchange();
-        
-        conn = openH2Connection(false);
-
-        initializeH2Schema();
-
-        initCacheAndDbData();
-
-        checkAllDataEquals();
-    }
-    
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        super.afterTestsStopped();
-        
-        conn.close();
-        
-        stopAllGrids();
-    }
-
-    /**
-     * Populate cache and h2 database with test data.
-     */
-    @SuppressWarnings("unchecked")
-    private void initCacheAndDbData() throws SQLException {
-        int idGen = 0;
-        
-        // Organizations.
-        List<Organization> organizations = new ArrayList<>();
-
-        for (int i = 0; i < 3; i++) {
-            int id = idGen++;
-            
-            Organization org = new Organization(id, "Org" + id);
-            
-            organizations.add(org);
-            
-            pCache.put(org.id, org);
-            
-            insertInDb(org);
-        }
-
-        // Persons.
-        List<Person> persons = new ArrayList<>();
-        
-        for (int i = 0; i < 5; i++) {
-            int id = idGen++;
-
-            Person person = new Person(id, organizations.get(i % 
organizations.size()), 
-                "name" + id, "lastName" + id, id * 100.0);
-            
-            // Add a Person without lastname.
-            if (id == organizations.size() + 1)
-                person.lastName = null;
-
-            persons.add(person);
-
-            pCache.put(person.key(), person);
-            
-            insertInDb(person);
-        }
-
-        // Products.
-        List<Product> products = new ArrayList<>();
-
-        for (int i = 0; i < 10; i++) {
-            int id = idGen++;
-            
-            Product product = new Product(id, "Product" + id, id*1000);
-            
-            products.add(product);
-            
-            rCache.put(product.id, product);
-            
-            insertInDb(product);
-        }
-
-        // Purchases.
-        for (int i = 0; i < products.size() * 2; i++) {
-            int id = idGen++;
-
-            Purchase purchase = new Purchase(id, products.get(i % 
products.size()), persons.get(i % persons.size()));
-
-            pCache.put(purchase.key(), purchase);
-            
-            insertInDb(purchase);
-        }
-    }
-
-    /**
-     * Insert {@link Organization} at h2 database.
-     *  
-     * @param org Organization.
-     * @throws SQLException If exception.
-     */
-    private void insertInDb(Organization org) throws SQLException {
-        try(PreparedStatement st = conn.prepareStatement(
-            "insert into \"part\".ORGANIZATION (_key, _val, id, name) 
values(?, ?, ?, ?)")) {
-            st.setObject(1, org.id);
-            st.setObject(2, org);
-            st.setObject(3, org.id);
-            st.setObject(4, org.name);
-
-            st.executeUpdate();
-        }
-    }
-
-    /**
-     * Insert {@link Person} at h2 database.
-     *
-     * @param p Person.
-     * @throws SQLException If exception.
-     */
-    private void insertInDb(Person p) throws SQLException {
-        try(PreparedStatement st = conn.prepareStatement("insert into 
\"part\".PERSON " +
-            "(_key, _val, id, firstName, lastName, orgId, salary) values(?, ?, 
?, ?, ?, ?, ?)")) {
-            st.setObject(1, p.key());
-            st.setObject(2, p);
-            st.setObject(3, p.id);
-            st.setObject(4, p.firstName);
-            st.setObject(5, p.lastName);
-            st.setObject(6, p.orgId);
-            st.setObject(7, p.salary);
-
-            st.executeUpdate();
-        }
-    }
-
-    /**
-     * Insert {@link Product} at h2 database.
-     *
-     * @param p Product.
-     * @throws SQLException If exception.
-     */
-    private void insertInDb(Product p) throws SQLException {
-        try(PreparedStatement st = conn.prepareStatement(
-            "insert into \"repl\".PRODUCT (_key, _val, id, name, price) 
values(?, ?, ?, ?, ?)")) {
-            st.setObject(1, p.id);
-            st.setObject(2, p);
-            st.setObject(3, p.id);
-            st.setObject(4, p.name);
-            st.setObject(5, p.price);
-
-            st.executeUpdate();
-        }
-    }
-
-    /**
-     * Insert {@link Purchase} at h2 database.
-     *
-     * @param p Purchase.
-     * @throws SQLException If exception.
-     */
-    private void insertInDb(Purchase p) throws SQLException {
-        try(PreparedStatement st = conn.prepareStatement(
-            "insert into \"part\".PURCHASE (_key, _val, id, personId, 
productId) values(?, ?, ?, ?, ?)")) {
-            st.setObject(1, p.key());
-            st.setObject(2, p);
-            st.setObject(3, p.id);
-            st.setObject(4, p.personId);
-            st.setObject(5, p.productId);
-
-            st.executeUpdate();
-        }
-    }
-
-    /**
-     * Initialize h2 database schema.
-     *
-     * @throws SQLException If exception.
-     */
-    private void initializeH2Schema() throws SQLException {
-        Statement st = conn.createStatement();
-
-        st.execute("CREATE SCHEMA \"part\"");
-        st.execute("CREATE SCHEMA \"repl\"");
-
-        st.execute("create table \"part\".ORGANIZATION" +
-            "  (_key int not null," +
-            "  _val other not null," +
-            "  id int unique," +
-            "  name varchar(255))");
-        
-        st.execute("create table \"part\".PERSON" +
-            "  (_key other not null ," +
-            "   _val other not null ," +
-            "  id int unique, " +
-            "  firstName varchar(255), " +
-            "  lastName varchar(255)," +
-            "  orgId int not null," +
-            "  salary double )");
-
-        st.execute("create table \"repl\".PRODUCT" +
-            "  (_key int not null ," +
-            "   _val other not null ," +
-            "  id int unique, " +
-            "  name varchar(255), " +
-            "  price int)");
-
-        st.execute("create table \"part\".PURCHASE" +
-            "  (_key other not null ," +
-            "   _val other not null ," +
-            "  id int unique, " +
-            "  personId int, " +
-            "  productId int)");
-
-        conn.commit();
-    }
-
-    /**
-     * Gets connection from a pool.
-     *
-     * @param autocommit {@code true} If connection should use autocommit mode.
-     * @return Pooled connection.
-     * @throws SQLException In case of error.
-     */
-    private Connection openH2Connection(boolean autocommit) throws 
SQLException {
-        System.setProperty("h2.serializeJavaObject", "false");
-        
-        String dbName = "test";
-        
-        Connection conn = DriverManager.getConnection("jdbc:h2:mem:" + dbName 
+ ";DB_CLOSE_DELAY=-1");
-
-        conn.setAutoCommit(autocommit);
-
-        return conn;
-    }
-
-    /**
-     * Execute given sql query on h2 database and on partitioned ignite cache 
and compare results.
-     *
-     * @param sql SQL query.
-     * @param args SQL arguments.
-     * then results will compare as ordered queries.
-     * @return Result set after SQL query execution. 
-     * @throws SQLException If exception.
-     */
-    private List<List<?>> compareQueryRes0(String sql, @Nullable Object... 
args) throws SQLException {
-        return compareQueryRes0(pCache, sql, args, Order.RANDOM);
-    }
-
-    /**
-     * Execute given sql query on h2 database and on ignite cache and compare 
results. 
-     * Expected that results are not ordered.
-     *
-     * @param cache Ignite cache.
-     * @param sql SQL query.
-     * @param args SQL arguments.
-     * then results will compare as ordered queries.
-     * @return Result set after SQL query execution. 
-     * @throws SQLException If exception.
-     */
-    private List<List<?>> compareQueryRes0(IgniteCache cache, String sql, 
@Nullable Object... args) throws SQLException {
-        return compareQueryRes0(cache, sql, args, Order.RANDOM);
-    }
-
-    /**
-     * Execute given sql query on h2 database and on partitioned ignite cache 
and compare results.
-     * Expected that results are ordered.
-     *
-     * @param sql SQL query.
-     * @param args SQL arguments.
-     * then results will compare as ordered queries.
-     * @return Result set after SQL query execution.
-     * @throws SQLException If exception.
-     */
-    private List<List<?>> compareOrderedQueryRes0(String sql, @Nullable 
Object... args) throws SQLException {
-        return compareQueryRes0(pCache, sql, args, Order.ORDERED);
-    }
-
-    /**
-     * Execute given sql query on h2 database and on ignite cache and compare 
results.
-     *
-     * @param cache Ignite cache.
-     * @param sql SQL query.
-     * @param args SQL arguments.
-     * @param order Expected ordering of SQL results. If {@link Order#ORDERED} 
-     * then results will compare as ordered queries.
-     * @return Result set after SQL query execution.
-     * @throws SQLException If exception.
-     */    
-    @SuppressWarnings("unchecked")
-    private List<List<?>> compareQueryRes0(IgniteCache cache, String sql, 
@Nullable Object[] args, Order order) throws SQLException {
-        if (args == null)
-            args = new Object[] {null};
-        
-        log.info("Sql=\"" + sql + "\", args=" + Arrays.toString(args));
-
-        List<List<?>> h2Res = executeH2Query(sql, args);
-
-        List<List<?>> cacheRes = cache.query(new 
SqlFieldsQuery(sql).setArgs(args)).getAll();
-
-        assertRsEquals(h2Res, cacheRes, order);
-        
-        return cacheRes;
-    }
-
-    /**
-     * Execute SQL query on h2 database.
-     *
-     * @param sql SQL query.
-     * @param args SQL arguments.
-     * @return Result of SQL query on h2 database.
-     * @throws SQLException If exception.
-     */
-    private List<List<?>> executeH2Query(String sql, Object[] args) throws 
SQLException {
-        List<List<?>> res = new ArrayList<>();
-        ResultSet rs = null;
-
-        try(PreparedStatement st = conn.prepareStatement(sql)) {
-            for (int idx = 0; idx < args.length; idx++)
-                st.setObject(idx + 1, args[idx]);
-
-            rs = st.executeQuery();
-
-            int colCnt = rs.getMetaData().getColumnCount();
-
-            while (rs.next()) {
-                List<Object> row = new ArrayList<>(colCnt);
-                
-                for (int i = 1; i <= colCnt; i++)
-                    row.add(rs.getObject(i));
-                
-                res.add(row);
-            }
-        }
-        finally {
-            U.closeQuiet(rs);
-        }
-
-        return res;
-    }
-
-    /**
-     * Assert equals of result sets according to expected ordering.
-     *
-     * @param rs1 Expected result set.
-     * @param rs2 Actual result set.
-     * @param order Expected ordering of SQL results. If {@link Order#ORDERED} 
-     * then results will compare as ordered queries.
-     */
-    private void assertRsEquals(List<List<?>> rs1, List<List<?>> rs2, Order 
order) {
-        assertEquals("Rows count has to be equal.", rs1.size(), rs2.size());
-        
-        switch (order){
-            case ORDERED:
-                for (int rowNum = 0; rowNum < rs1.size(); rowNum++) {
-                    List<?> row1 = rs1.get(rowNum);
-                    List<?> row2 = rs2.get(rowNum);
-
-                    assertEquals("Columns count have to be equal.", 
row1.size(), row2.size());
-
-                    for (int colNum = 0; colNum < row1.size(); colNum++)
-                        assertEquals("Row=" + rowNum + ", column=" + colNum, 
row1.get(colNum), row2.get(colNum));
-                }
-
-                break;
-            case RANDOM:
-                Map<List<?>, Integer> rowsWithCnt1 = 
extractUniqueRowsWithCounts(rs1);
-                Map<List<?>, Integer> rowsWithCnt2 = 
extractUniqueRowsWithCounts(rs2);
-                
-                assertEquals("Unique rows count has to be equal.", 
rowsWithCnt1.size(), rowsWithCnt2.size());
-
-                for (Map.Entry<List<?>, Integer> entry1 : 
rowsWithCnt1.entrySet()) {
-                    List<?> row = entry1.getKey();
-                    Integer cnt1 = entry1.getValue();
-
-                    Integer cnt2 = rowsWithCnt2.get(row);
-
-                    assertEquals("Row has different occurance number.\nRow=" + 
row, cnt1, cnt2);
-                }
-                
-                break;
-            default: 
-                throw new IllegalStateException();
-        }
-    }
-
-    /**
-     * @param rs Result set.
-     * @return Map of unique rows at the result set to number of occuriances 
at the result set.
-     */
-    private Map<List<?>, Integer> 
extractUniqueRowsWithCounts(Iterable<List<?>> rs) {
-        Map<List<?>, Integer> res = new HashMap<>();
-
-        for (List<?> row : rs) {
-            Integer cnt = res.get(row);
-            
-            if (cnt == null)
-                cnt = 0;
-            
-            res.put(row, cnt + 1);
-        }
-        return res;
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    private void checkAllDataEquals() throws Exception {
-        compareQueryRes0("select _key, _val, id, name from 
\"part\".Organization");
-
-        compareQueryRes0("select _key, _val, id, firstName, lastName, orgId, 
salary from \"part\".Person");
-
-        compareQueryRes0("select _key, _val, id, personId, productId from 
\"part\".Purchase");
-
-        compareQueryRes0(rCache, "select _key, _val, id, name, price from 
\"repl\".Product");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void _testSimpleReplSelect() throws Exception {
-        compareQueryRes0("select id, name, price from \"repl\".Product");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testParamSubstitution() throws Exception {
-        compareQueryRes0("select ? from \"part\".Person", "Some arg");
-    }
-
-    /**
-     * @throws SQLException If failed.
-     */
-    public void testAggregateOrderBy() throws SQLException {
-        compareOrderedQueryRes0("select firstName name, count(*) cnt from 
\"part\".Person group by name order by cnt desc");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testNullParamSubstitution() throws Exception {
-        List<List<?>> rs1 = compareQueryRes0("select id from \"part\".Person 
where lastname is ?", null);
-
-        // Ensure we find something.
-        assertNotSame(0, rs1.size());
-    }
-
-    /**
-     *
-     */
-    public void testUnion() throws SQLException {
-        String base = "select _val v from \"part\".Person";
-
-        compareQueryRes0(base + " union all " + base);
-        compareQueryRes0(base + " union " + base);
-
-        base = "select firstName||lastName name, salary from \"part\".Person";
-
-        assertEquals(10, compareOrderedQueryRes0(base + " union all " + base + 
" order by salary desc").size());
-        assertEquals(5, compareOrderedQueryRes0(base + " union " + base + " 
order by salary desc").size());
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testEmptyResult() throws Exception {
-        compareQueryRes0("select id from \"part\".Person where 0 = 1");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testSqlQueryWithAggregation() throws Exception {
-        compareQueryRes0("select avg(salary) from \"part\".Person, 
\"part\".Organization where Person.orgId = Organization.id and "
-            + "lower(Organization.name) = lower(?)", "Org1");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testSqlFieldsQuery() throws Exception {
-        compareQueryRes0("select concat(firstName, ' ', lastName) from 
\"part\".Person");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testSqlFieldsQueryWithJoin() throws Exception {
-        compareQueryRes0("select concat(firstName, ' ', lastName), "
-            + "Organization.name from \"part\".Person, \"part\".Organization 
where "
-            + "Person.orgId = Organization.id");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testOrdered() throws Exception {
-        compareOrderedQueryRes0("select firstName, lastName" +
-                " from \"part\".Person" +
-                " order by lastName, firstName"
-        );
-    }
-
-    /**
-     * //TODO Investigate.
-     *  
-     * @throws Exception If failed.
-     */
-    public void _testSimpleJoin() throws Exception {
-        // Have expected results.
-        compareQueryRes0("select id, firstName, lastName" +
-            "  from \"part\".Person" +
-            "  where Person.id = ?", 3);
-
-        // Ignite cache return 0 results...
-        compareQueryRes0("select pe.firstName" +
-            "  from \"part\".Person pe join \"part\".Purchase pu on pe.id = 
pu.personId " +
-            "  where pe.id = ?", 3);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testSimpleReplicatedSelect() throws Exception {
-        compareQueryRes0(rCache, "select id, name from \"repl\".Product");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void _testCrossCache() throws Exception {
-        //TODO Investigate (should be 20 results instead of 0).
-        compareQueryRes0("select firstName, lastName" +
-            "  from \"part\".Person, \"part\".Purchase" +
-            "  where Person.id = Purchase.personId");
-
-        //TODO Investigate.
-        compareQueryRes0("select concat(firstName, ' ', lastName), 
Product.name " +
-            "  from \"part\".Person, \"part\".Purchase, \"repl\".Product " +
-            "  where Person.id = Purchase.personId and Purchase.productId = 
Product.id" +
-            "  group by Product.id");
-
-        //TODO Investigate.
-        compareQueryRes0("select concat(firstName, ' ', lastName), count 
(Product.id) " +
-            "  from \"part\".Person, \"part\".Purchase, \"repl\".Product " +
-            "  where Person.id = Purchase.personId and Purchase.productId = 
Product.id" +
-            "  group by Product.id");
-    }
-
-    /**
-     * Person class. Stored at partitioned cache.
-     */
-    private static class Person implements Serializable {
-        /** Person ID (indexed). */
-        @QuerySqlField(index = true)
-        private int id;
-
-        /** Organization ID (indexed). */
-        @QuerySqlField(index = true)
-        private int orgId;
-
-        /** First name (not-indexed). */
-        @QuerySqlField
-        private String firstName;
-
-        /** Last name (not indexed). */
-        @QuerySqlField
-        private String lastName;
-
-        /** Salary (indexed). */
-        @QuerySqlField(index = true)
-        private double salary;
-
-        /**
-         * Constructs person record.
-         *
-         * @param org Organization.
-         * @param firstName First name.
-         * @param lastName Last name.
-         * @param salary Salary.
-         */
-        Person(int id, Organization org, String firstName, String lastName, 
double salary) {
-            this.id = id;
-            this.firstName = firstName;
-            this.lastName = lastName;
-            this.salary = salary;
-            orgId = org.id;
-        }
-
-        /**
-         * @return Custom affinity key to guarantee that person is always 
collocated with organization.
-         */
-        public AffinityKey<Integer> key() {
-            return new AffinityKey<>(id, orgId);
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            return this == o || o instanceof Person && id == ((Person)o).id;
-
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            return id;
-        }
-
-        /** {@inheritDoc} */
-        @Override public String toString() {
-            return "Person [firstName=" + firstName +
-                ", lastName=" + lastName +
-                ", id=" + id +
-                ", orgId=" + orgId +
-                ", salary=" + salary + ']';
-        }
-    }
-
-    /**
-     * Organization class. Stored at partitioned cache.
-     */
-    private static class Organization implements Serializable {
-        /** Organization ID (indexed). */
-        @QuerySqlField(index = true)
-        private int id;
-
-        /** Organization name (indexed). */
-        @QuerySqlField(index = true)
-        private String name;
-
-        /**
-         * Create Organization.
-         *
-         * @param id Organization ID.
-         * @param name Organization name.
-         */
-        Organization(int id, String name) {
-            this.id = id;
-            this.name = name;
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            return this == o || o instanceof Organization && id == 
((Organization)o).id;
-
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            return id;
-        }
-
-        /** {@inheritDoc} */
-        @Override public String toString() {
-            return "Organization [id=" + id + ", name=" + name + ']';
-        }
-    }
-
-    /**
-     * Product class. Stored at replicated cache.
-     */
-    private static class Product implements Serializable {
-        /** Primary key. */
-        @QuerySqlField(index = true)
-        private int id;
-
-        /** Product name. */
-        @QuerySqlField
-        private String name;
-
-        /** Product price */
-        @QuerySqlField
-        private int price;
-
-        /**
-         * Create Product.
-         *
-         * @param id Product ID.
-         * @param name Product name.
-         * @param price Product price.
-         */
-        Product(int id, String name, int price) {
-            this.id = id;
-            this.name = name;
-            this.price = price;
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            return this == o || o instanceof Product && id == ((Product)o).id;
-
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            return id;
-        }
-
-        /** {@inheritDoc} */
-        @Override public String toString() {
-            return "Product [id=" + id + ", name=" + name + ", price=" + price 
+ ']';
-        }
-    }
-
-    /**
-     * Purchase class. Stored at partitioned cache.
-     */
-    private static class Purchase implements Serializable {
-        /** Primary key. */
-        @QuerySqlField(index = true)
-        private int id;
-
-        /** Product ID. */
-        @QuerySqlField
-        private int productId;
-
-        /** Person ID. */
-        @QuerySqlField
-        private int personId;
-
-        /**
-         * Create Purchase.
-         *
-         * @param id Purchase ID.
-         * @param product Purchase product.
-         * @param person Purchase person.
-         */
-        Purchase(int id, Product product, Person person) {
-            this.id = id;
-            productId = product.id;
-            personId = person.id;
-        }
-
-        /**
-         * @return Custom affinity key to guarantee that purchase is always 
collocated with person.
-         */
-        public AffinityKey<Integer> key() {
-            return new AffinityKey<>(id, personId);
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            return this == o || o instanceof Purchase && id == 
((Purchase)o).id;
-
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            return id;
-        }
-
-        /** {@inheritDoc} */
-        @Override public String toString() {
-            return "Purchase [id=" + id + ", productId=" + productId + ", 
personId=" + personId + ']';
-        }
-    }
-
-    /**
-     * Order type. 
-     */
-    private enum Order {
-        /** Random. */
-        RANDOM, 
-        /** Ordered. */
-        ORDERED
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index 43e54fe..552205a 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -100,8 +100,9 @@ public class IgniteCacheQuerySelfTestSuite extends 
TestSuite {
 
         suite.addTestSuite(GridOrderedMessageCancelSelfTest.class);
 
-        // H2 comparison.
-        suite.addTestSuite(IgniteVsH2QueryTest.class);
+        // Ignite cache and H2 comparison.
+        suite.addTestSuite(BaseH2CompareQueryTest.class);
+        suite.addTestSuite(H2CompareBigQueryTest.class);
 
         return suite;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe743909/modules/indexing/src/test/resources/org/apache/ignite/internal/processors/query/h2/sql/bigQuery.sql
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/resources/org/apache/ignite/internal/processors/query/h2/sql/bigQuery.sql
 
b/modules/indexing/src/test/resources/org/apache/ignite/internal/processors/query/h2/sql/bigQuery.sql
new file mode 100644
index 0000000..5f5cb74
--- /dev/null
+++ 
b/modules/indexing/src/test/resources/org/apache/ignite/internal/processors/query/h2/sql/bigQuery.sql
@@ -0,0 +1,55 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+select *
+from (
+  select rootOrderId as custOrderId, co.date, co.orderId, 
replace(co.alias,'_ALGO','') as alias, op.parentAlgo
+  from (
+       select  date, orderId, rootOrderId, origOrderId, archSeq, alias 
+       from "part".CustOrder where alias='CUSTOM'
+       
+       union all
+       
+       select  date, orderId, rootOrderId, refOrderId as origOrderId, archSeq, 
alias
+       from "part".ReplaceOrder where alias='CUSTOM'
+  ) co, "part".OrderParams op
+  where co.date = op.date and co.orderId = op.orderId and co.archSeq = -- 
TODO: replace with 'dateToLong(co.date)+archSeq'.
+       (
+         select max(archSeq) -- TODO: replace with 
'dateToLong(co.date)+archSeq'.
+         from (
+                 select  date, orderId, rootOrderId, origOrderId, archSeq, 
alias 
+                 from "part".CustOrder where alias='CUSTOM'
+                 
+                 union all
+                 
+                 select  date, orderId, rootOrderId, refOrderId as 
origOrderId, archSeq, alias
+                 from "part".ReplaceOrder where alias='CUSTOM'
+         ) 
+         where origOrderId = co.origOrderId and date = co.date
+       ) and co.alias='CUSTOM'
+) cop 
+inner join (
+  select e.date, e.rootOrderId as eRootOrderId, e.rootOrderId, 
sum(e.execShares) as execShares, 
+       sum(e.execShares*e.price)/sum(e.execShares) as price,
+       case when min(e.lastMkt) = max(e.lastMkt) then min(e.lastMkt) else 
min('XOFF') end as execMeet
+  from "repl".Exec e
+  group by e.date, e.rootOrderId
+) oep on (cop.date = oep.date and cop.custOrderId = oep.eRootOrderId)
+left outer join (
+  select top 1 refOrderId, date from "part".Cancel
+) cc on (cc.refOrderId = cop.orderId and cc.date = cop.date)
+where cop.alias='CUSTOM'

Reply via email to