ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: # ignite-437: fill args, add all data validation, add tests, support ordering and small fixes
Date Mon, 16 Mar 2015 18:23:19 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-437-sqltests 835c1448c -> f8f3be0d3


# ignite-437: fill args, add all data validation, add tests, support ordering and small fixes


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f8f3be0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f8f3be0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f8f3be0d

Branch: refs/heads/ignite-437-sqltests
Commit: f8f3be0d3c739204d0291646e6cec4c2a8fd2d6d
Parents: 835c144
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Mon Mar 16 21:23:24 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Mon Mar 16 21:23:24 2015 +0300

----------------------------------------------------------------------
 .../query/h2/sql/IgniteVsH2QueryTest.java       | 227 +++++++++++++------
 1 file changed, 155 insertions(+), 72 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f8f3be0d/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
index 7b1460b..27f5d24 100644
--- 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
@@ -126,7 +126,9 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
 
         initializeH2Schema();
 
-        fillOutCacheAndDbWithData();
+        initCacheAndDbData();
+
+        checkAllDataEquals();
     }
     
     /** {@inheritDoc} */
@@ -142,7 +144,7 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
      * Populate cache with test data.
      */
     @SuppressWarnings("unchecked")
-    private void fillOutCacheAndDbWithData() throws SQLException {
+    private void initCacheAndDbData() throws SQLException {
         int idGen = 0;
         
         // Organizations.
@@ -212,11 +214,12 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
     }
 
     private void insertInDb(Person p) throws SQLException {
-        try(PreparedStatement st = conn.prepareStatement("insert into PERSON (id, firstName,
lastName, orgId) values(?, ?, ?, ?)")) {
+        try(PreparedStatement st = conn.prepareStatement("insert into PERSON (id, firstName,
lastName, orgId, salary) values(?, ?, ?, ?, ?)")) {
             st.setInt(1, p.id);
             st.setString(2, p.firstName);
             st.setString(3, p.lastName);
             st.setInt(4, p.orgId);
+            st.setDouble(5, p.salary);
 
             st.executeUpdate();
         }
@@ -285,51 +288,86 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
         return conn;
     }
 
-    @SuppressWarnings("unchecked")
+    private void test0(String sql, Object... args) throws SQLException {
+        test0(pCache, sql, args, Order.RANDOM);
+    }
+
     private void test0(IgniteCache cache, String sql, Object... args) throws SQLException
{
+        test0(cache, sql, args, Order.RANDOM);
+    }
+
+    private void test0Ordered(String sql, Object... args) throws SQLException {
+        test0(pCache, sql, args, Order.ORDERED);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void test0(IgniteCache cache, String sql, Object[] args, Order order) throws
SQLException {
         log.info("Sql=" + sql + ", args=" + Arrays.toString(args));
-        
+
         ResultSet h2Rs = null;
         PreparedStatement st = null;
 
         try {
             st = conn.prepareStatement(sql);
-            
-            //TODO apply args to statment.
+
+            for (int idx = 0; idx < args.length; idx++) {
+                Object arg = args[idx];
+
+                fillArgByType(st, idx + 1, arg);
+            }
 
             h2Rs = st.executeQuery();
 
             List<List<?>> cacheRes = cache.queryFields(new SqlFieldsQuery(sql).setArgs(args)).getAll();
 
-            assertRsEquals(h2Rs, cacheRes);
+            assertRsEquals(h2Rs, cacheRes, order);
         }
         finally {
             U.closeQuiet(st);
             U.closeQuiet(h2Rs);
         }
     }
-    
-    private static void assertRsEquals(ResultSet rs, List<List<?>> actualRs)
throws SQLException {
+
+    private void assertRsEquals(ResultSet rs, List<List<?>> actualRs, Order order)
throws SQLException {
+        if (!rs.next()) {
+            assertTrue("Actual result set have to be empty.", actualRs.isEmpty());
+
+            return;
+        }
+
+        assertTrue("Actual result set cannot be empty.", !actualRs.isEmpty());
+
+        assertEquals("Column count have to be equal.", rs.getMetaData().getColumnCount(),
actualRs.get(0).size());
+
         int rsRowsCnt = 0;
 
-        assertEquals("Column count have to be equal.", rs.getMetaData().getColumnCount(),

-            actualRs.isEmpty() ? 0 : actualRs.get(0).size());
+        do {
+            if (order == Order.ORDERED) {
+                assertTrue("Current rows counter have to be less than size of actual rs.",
rsRowsCnt < actualRs.size());
+
+                List<?> row = actualRs.get(rsRowsCnt);
+
+                boolean rowsAreEqual = rowEqualsCurrentRsRow(rs, row);
 
-        while (rs.next()) {
-            boolean currRowIsFound = false;
+                assertTrue("Rows " + currentRsRow2String(rs) + " and " + row + " have to
be equal.",
+                    rowsAreEqual);
+            }
+            else {
+                boolean currRowIsFound = false;
 
-            for (List<?> row : actualRs) {
-                if (rowEqualsCurrentRsRow(rs, row)) {
-                    currRowIsFound = true;
+                for (List<?> row : actualRs) {
+                    if (rowEqualsCurrentRsRow(rs, row)) {
+                        currRowIsFound = true;
 
-                    break;
+                        break;
+                    }
                 }
+
+                assertTrue("A row " + currentRsRow2String(rs) + " not found at " + actualRs
+ '.', currRowIsFound);
             }
-            
-            assertTrue("A row " + currentRsRow2String(rs) + " not found at " + actualRs +
'.', currRowIsFound);
 
             rsRowsCnt++;
-        }
+        } while (rs.next());
 
         assertEquals("Count of results.", rsRowsCnt, actualRs.size());
     }
@@ -337,11 +375,13 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
     private static String currentRsRow2String(ResultSet rs) throws SQLException {
         GridStringBuilder sb = new GridStringBuilder("[");
 
-        for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++)
-            sb.a(rs.getObject(i).toString()).a(',');
-        
+        for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
+            Object o = rs.getObject(i);
+            sb.a(o != null ? o.toString() : "null").a(',');
+        }
+
         sb.d(sb.length() - 1).a(']');
-        
+
         return sb.toString();
     }
 
@@ -349,10 +389,11 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
         for (int colNum = 0; colNum < row.size(); colNum++) {
             Object o1 = row.get(colNum);
 
+            assertNotNull("Unexpected null value. Row=" + row + ", column=" + colNum + '.',
o1);
+
             Object o2 = extractColumn(rs, colNum + 1, o1.getClass());
 
-            assertNotNull("Unexpected null value.", o1);
-            assertNotNull("Unexpected null value.", o2);
+            assertNotNull("Unexpected null value. Column=" + colNum + '.', o2);
 
             if (!(o1.equals(o2)))
                 return false;
@@ -361,6 +402,33 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
         return true;
     }
 
+    private void fillArgByType(PreparedStatement st, int idx, Object arg) throws SQLException
{
+        Class<?> propType = arg.getClass();
+
+        if (propType.equals(String.class))
+            st.setString(idx, (String)arg);
+        else if (propType.equals(Integer.TYPE) || propType.equals(Integer.class))
+            st.setInt(idx, (Integer)arg);
+        else if (propType.equals(Boolean.TYPE) || propType.equals(Boolean.class))
+            st.setBoolean(idx, (Boolean)arg);
+        else if (propType.equals(Long.TYPE) || propType.equals(Long.class))
+            st.setLong(idx, (Long)arg);
+        else if (propType.equals(Double.TYPE) || propType.equals(Double.class))
+            st.setDouble(idx, (Double)arg);
+        else if (propType.equals(Float.TYPE) || propType.equals(Float.class))
+            st.setFloat(idx, (Float)arg);
+        else if (propType.equals(Short.TYPE) || propType.equals(Short.class))
+            st.setShort(idx, (Short)arg);
+        else if (propType.equals(Byte.TYPE) || propType.equals(Byte.class))
+            st.setByte(idx, (Byte)arg);
+        else if (propType.equals(Timestamp.class))
+            st.setTimestamp(idx, (Timestamp)arg);
+        else if (propType.equals(SQLXML.class))
+            st.setSQLXML(idx, (SQLXML)arg);
+        else // Object.
+            st.setObject(idx, arg);
+    }
+
     private static Object extractColumn(ResultSet rs, int idx, Class<?> propType) throws
SQLException {
         if (!propType.isPrimitive() && rs.getObject(idx) == null)
             return null;
@@ -389,33 +457,38 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
             return rs.getObject(idx);
     }
 
-    // TODO delete.
-    private void assertRsEquals(List<List<?>> expRs, List<List<?>>
actualRs) {
-        assertEquals("Count of results.", expRs.size(), actualRs.size());
+    /**
+     * @throws Exception If failed.
+     */
+    private void checkAllDataEquals() throws Exception {
+        test0("select id, name from Organization");
 
-        for (List<?> expectedRow : expRs)
-            assertTrue("An actual result set=" + actualRs + " have to contains row=" + expectedRow,
-                actualRs.contains(expectedRow));
-    }
+        test0("select id, firstName, lastName, orgId, salary from Person");
 
-    // TODO delete.
-    private void assertOrderedRsEquals(List<List<?>> expRs, List<List<?>>
actualRs) {
-        assertEquals("Count of results.", expRs.size(), actualRs.size());
+        test0("select id, personId, productId from Purchase");
 
-        for (int rowNum = 0; rowNum < expRs.size(); rowNum++) {
-            List<?> expRow = expRs.get(rowNum);
-            List<?> actualRow = actualRs.get(rowNum);
+        test0(rCache, "select id, name, price from Product");
+    }
 
-            assertEquals("Count of results at row=" + rowNum + '.', expRow.size(), actualRow.size());
+    /**
+     * @throws Exception If failed.
+     */
+    public void testEmptyResult() throws Exception {
+        test0("select id from Person where 0 = 1");
+    }
 
-            for (int colNum = 0; colNum < expRow.size(); colNum++)
-                assertEquals("Values at row=" + rowNum + ", column=" + colNum + '.',
-                    expRow.get(colNum), actualRow.get(colNum));
-        }
+    /**
+     * @throws Exception If failed.
+     */
+    public void testSelectWithStar() throws Exception {
+        test0("select * from Person");
     }
 
-    private void test0(String sql, Object... args) throws SQLException {
-        test0(pCache, sql, args);
+    /**
+     * @throws Exception If failed.
+     */
+    public void testSelectWithStar2() throws Exception {
+        test0("select Person.* from Person");
     }
 
     /**
@@ -423,7 +496,7 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
      */
     public void testSqlQueryWithAggregation() throws Exception {
         test0("select avg(salary) from Person, Organization where Person.orgId = Organization.id
and "
-            + "lower(Organization.name) = lower(?)", "GridGain");
+            + "lower(Organization.name) = lower(?)", "Org1");
     }
 
     /**
@@ -445,48 +518,45 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
-    public void testAllColumns() throws Exception {
-        test0("select * from Organization");
+    public void testOrdered() throws Exception {
+        test0Ordered("select firstName, lastName" +
+            "  from Person" +
+            "  order by lastName, firstName");
     }
 
     /**
+     * //TODO Investigate
+     *  
      * @throws Exception If failed.
      */
-    public void testCrossCache() throws Exception {
-        log.info("-- Organizations --");
-        test0("select id, name from Organization");
-
-        log.info("-- Persons --");
-        test0("select id, firstName, lastName, orgId from Person");
-
-        log.info("-- Purchases --");
-        test0("select id, personId, productId from Purchase");
-
-        log.info("-- Products --");
-        test0(rCache, "select * from \"replicated\".Product");
-
-        log.info("-- Person.id=3 --");
-        test0("select *" +
+    public void testSimpleJoin() throws Exception {
+        // Have expected results.
+        test0("select id, firstName, lastName" +
             "  from Person" +
             "  where Person.id = ?", 3);
 
-        log.info("-- Person.id=3 with Purchase --"); //TODO Investigate
-        test0("select *" +
+        // Ignite cache return 0 results...
+        test0("select Person.firstName" +
             "  from Person, Purchase" +
             "  where Person.id = ?", 3);
+    }
 
-        log.info("-- Person.id = Purchase.personId --"); //TODO Investigate (should be 20
results instead of 8)
-        test0("select *" +
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCrossCache() throws Exception {
+        //TODO Investigate (should be 20 results instead of 8)
+        test0("select firstName, lastName" +
             "  from Person, Purchase" +
             "  where Person.id = Purchase.personId");
 
-        log.info("-- Cross query --"); //TODO Investigate
+        //TODO Investigate
         test0("select concat(firstName, ' ', lastName), Product.name " +
             "  from Person, Purchase, \"replicated\".Product " +
             "  where Person.id = Purchase.personId and Purchase.productId = Product.id" +
             "  group by Product.id");
 
-        log.info("-- Cross query with group by --"); //TODO Investigate
+        //TODO Investigate
         test0("select concat(firstName, ' ', lastName), count (Product.id) " +
             "  from Person, Purchase, \"replicated\".Product " +
             "  where Person.id = Purchase.personId and Purchase.productId = Product.id" +
@@ -642,7 +712,13 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
         /** Custom cache key to guarantee that purchase is always collocated with its person.
*/
         private transient CacheAffinityKey<Integer> key;
 
-        //TODO
+        /**
+         * 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;
@@ -668,4 +744,11 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
             return "Purchase [id=" + id + ", productId=" + productId + ", personId=" + personId
+ ']';
         }
     }
+    
+    private enum Order {
+        /** Random. */
+        RANDOM, 
+        /** Ordered. */
+        ORDERED
+    }
 }


Mime
View raw message