Repository: geode Updated Branches: refs/heads/develop 0bd9fc97a -> 18d3e17b6
GEODE-2183: Cleaning out some print statements from tests Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/18d3e17b Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/18d3e17b Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/18d3e17b Branch: refs/heads/develop Commit: 18d3e17b6bc017fa6fea22ce3db5d318646ebff8 Parents: 0bd9fc9 Author: Jason Huynh <[email protected]> Authored: Fri Dec 2 14:59:56 2016 -0800 Committer: Jason Huynh <[email protected]> Committed: Tue Dec 6 10:01:57 2016 -0800 ---------------------------------------------------------------------- .../apache/geode/cache/query/BugJUnitTest.java | 5 -- .../geode/cache/query/RegionJUnitTest.java | 9 -- .../cache/query/TypedIteratorJUnitTest.java | 4 - .../query/functional/INOperatorJUnitTest.java | 14 --- .../functional/IUM6Bug32345ReJUnitTest.java | 9 +- .../cache/query/functional/IUMJUnitTest.java | 1 - .../IUMRCompositeIteratorJUnitTest.java | 2 - ...ependentOperandsInWhereClause2JUnitTest.java | 2 - .../functional/IndexCreationJUnitTest.java | 11 +-- .../IndexMaintenanceAsynchJUnitTest.java | 93 ++++++++------------ .../functional/IndexOperatorJUnitTest.java | 3 - .../IndexPrimaryKeyUsageJUnitTest.java | 33 ++----- .../IndexUsageInNestedQueryJUnitTest.java | 6 +- .../IndexUseMultFrmSnglCondJUnitTest.java | 10 +-- ...ndexWithSngleFrmAndMultCondQryJUnitTest.java | 30 +------ .../functional/IteratorTypeDefEmpJUnitTest.java | 1 - .../functional/IteratorTypeDefJUnitTest.java | 4 - .../IteratorTypeDefaultTypesJUnitTest.java | 13 --- .../query/functional/NestedQueryJUnitTest.java | 23 +---- .../functional/StructMemberAccessJUnitTest.java | 10 +-- .../TestNewFunctionSSorRSIntegrationTest.java | 10 +-- .../index/IndexMaintainceJUnitTest.java | 1 - 22 files changed, 55 insertions(+), 239 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/BugJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/BugJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/BugJUnitTest.java index 6d1c52a..80a7ced 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/BugJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/BugJUnitTest.java @@ -147,9 +147,7 @@ public class BugJUnitTest { + "select distinct * from /pos, (select distinct * from /pos p TYPE Portfolio, p.positions where value!=null)"; q = qs.newQuery(queryStr); // DebuggerSupport.waitForJavaDebugger(cache.getLogger()); - CacheUtils.getLogger().fine(queryStr); r = q.execute(); - CacheUtils.getLogger().fine(Utils.printResult(r)); } @@ -168,9 +166,7 @@ public class BugJUnitTest { queryStr = "Select distinct ID from /pos"; q = qs.newQuery(queryStr); // DebuggerSupport.waitForJavaDebugger(cache.getLogger()); - CacheUtils.getLogger().fine(queryStr); r = q.execute(); - CacheUtils.getLogger().fine(Utils.printResult(r)); Set expectedSet = createAndPopulateSet(4); assertEquals(expectedSet, ((SelectResults) r).asSet()); @@ -294,7 +290,6 @@ public class BugJUnitTest { CacheUtils.getLogger().info("Executing query: " + queries); // DebuggerSupport.waitForJavaDebugger(CacheUtils.getLogger()); SelectResults rs = (SelectResults) q.execute(); - CacheUtils.log(Utils.printResult(rs)); assertTrue("Resultset size should be > 0", rs.size() > 0); } catch (Exception e) { e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java index 1ba858b..ad82077 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java @@ -58,19 +58,15 @@ public class RegionJUnitTest { @Test public void testShortcutMethods() throws Exception { for (int i = 0; i < queries.length; i++) { - CacheUtils.log("Query = " + queries[i]); Object r = region.query(queries[i]); - CacheUtils.getLogger().fine(Utils.printResult(r)); } } @Test public void testQueryServiceInterface() throws Exception { for (int i = 0; i < queries.length; i++) { - CacheUtils.log("Query = select distinct * from /pos where " + queries[i]); Query q = qs.newQuery("select distinct * from /pos where " + queries[i]); Object r = q.execute(); - CacheUtils.getLogger().fine(Utils.printResult(r)); } } @@ -80,12 +76,10 @@ public class RegionJUnitTest { Query q = qs.newQuery("select distinct * from /pos where ID = $1"); Object[] params = new Object[] {new Integer(0)};// {"active"}; Object r = q.execute(params); - CacheUtils.getLogger().fine(Utils.printResult(r)); q = qs.newQuery("select distinct * from $1 where status = $2 and ID = $3"); params = new Object[] {this.region, "active", new Integer(0)}; r = q.execute(params); - CacheUtils.getLogger().fine(Utils.printResult(r)); } @@ -98,10 +92,8 @@ public class RegionJUnitTest { "select distinct * from /pos.entries where value.status = 'active'"}; for (int i = 0; i < queries.length; i++) { - CacheUtils.log("Query = " + queries[i]); Query q = qs.newQuery(queries[i]); Object r = q.execute(); - CacheUtils.getLogger().fine(Utils.printResult(r)); } } @@ -147,7 +139,6 @@ public class RegionJUnitTest { @Test public void testRegionNames() { - String queryStrs[] = new String[] {"SELECT * FROM /pos", "SELECT * FROM /pos where status='active'"}; http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java index 50a9773..0e3de99 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java @@ -65,14 +65,12 @@ public class TypedIteratorJUnitTest { "IMPORT org.apache.geode.cache.\"query\".data.Portfolio;\n" + "SELECT DISTINCT *\n" + "FROM /pos TYPE Portfolio\n" + "WHERE ID = 3 "); Object r = q.execute(); - CacheUtils.getLogger().fine(Utils.printResult(r)); q = this.qs.newQuery( // must quote "query" because it is a reserved word "IMPORT org.apache.geode.cache.\"query\".data.Portfolio;\n" + "SELECT DISTINCT *\n" + "FROM /pos ptfo TYPE Portfolio\n" + "WHERE ID = 3 "); r = q.execute(); - CacheUtils.getLogger().fine(Utils.printResult(r)); } @@ -83,14 +81,12 @@ public class TypedIteratorJUnitTest { + "FROM (collection<Portfolio>)/pos\n" + "WHERE ID = 3 "); // org.apache.geode.internal.util.DebuggerSupport.waitForJavaDebugger(this.cache.getLogger()); Object r = q.execute(); - CacheUtils.getLogger().fine(Utils.printResult(r)); q = this.qs.newQuery( // must quote "query" because it is a reserved word "IMPORT org.apache.geode.cache.\"query\".data.Position;\n" + "SELECT DISTINCT *\n" + "FROM /pos p, (collection<Position>)p.positions.values\n" + "WHERE secId = 'IBM'"); // org.apache.geode.internal.util.DebuggerSupport.waitForJavaDebugger(this.cache.getLogger()); r = q.execute(); - CacheUtils.getLogger().fine(Utils.printResult(r)); } @Before http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java index 870411b..89ed85c 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java @@ -144,7 +144,6 @@ public class INOperatorJUnitTest { Query q = CacheUtils.getQueryService().newQuery("2 IN SET(1,2,3)"); Object result = q.execute(); - CacheUtils.log(Utils.printResult(result)); if (!result.equals(Boolean.TRUE)) fail("Failed for IN operator"); } @@ -155,7 +154,6 @@ public class INOperatorJUnitTest { Query q = CacheUtils.getQueryService().newQuery("'a' IN SET('x','y','z')"); Object result = q.execute(); - CacheUtils.log(Utils.printResult(result)); if (!result.equals(Boolean.FALSE)) fail("Failed for StringSet with IN operator"); } @@ -165,11 +163,8 @@ public class INOperatorJUnitTest { Short num = Short.valueOf("1"); Object params[] = new Object[1]; params[0] = num; - Query q = CacheUtils.getQueryService().newQuery("$1 IN SET(1,2,3)"); - Object result = q.execute(params); - CacheUtils.log(Utils.printResult(result)); if (!result.equals(Boolean.TRUE)) fail("Failed for ShortNum with IN operator"); } @@ -190,7 +185,6 @@ public class INOperatorJUnitTest { Query q = CacheUtils.getQueryService().newQuery("$3 IN $2"); Object result = q.execute(params); - CacheUtils.log(Utils.printResult(result)); if (!result.equals(Boolean.TRUE)) fail("Failed for Collection with IN operator"); } @@ -207,7 +201,6 @@ public class INOperatorJUnitTest { params[1] = H1; Query q = CacheUtils.getQueryService().newQuery("$1 IN $2"); Object result = q.execute(params); - CacheUtils.log(Utils.printResult(result)); if (!result.equals(Boolean.TRUE)) fail("Failed for String set with IN operator"); } @@ -225,7 +218,6 @@ public class INOperatorJUnitTest { params[2] = AL1; Query q = CacheUtils.getQueryService().newQuery("$1 IN $3"); Object result = q.execute(params); - CacheUtils.log(Utils.printResult(result)); if (!result.equals(Boolean.TRUE)) fail("Failed for ArrayList with IN operator"); } @@ -234,13 +226,11 @@ public class INOperatorJUnitTest { public void testNULL() throws Exception { Query q = CacheUtils.getQueryService().newQuery(" null IN SET('x','y','z')"); Object result = q.execute(); - CacheUtils.log(Utils.printResult(result)); if (!result.equals(Boolean.FALSE)) fail("Failed for NULL in IN operator Test"); q = CacheUtils.getQueryService().newQuery(" null IN SET(null)"); result = q.execute(); - CacheUtils.log(Utils.printResult(result)); if (!result.equals(Boolean.TRUE)) fail("Failed for NULL in IN operator Test"); @@ -250,19 +240,16 @@ public class INOperatorJUnitTest { public void testUNDEFINED() throws Exception { Query q = CacheUtils.getQueryService().newQuery(" UNDEFINED IN SET(1,2,3)"); Object result = q.execute(); - CacheUtils.log(Utils.printResult(result)); if (!result.equals(Boolean.FALSE)) fail("Failed for UNDEFINED with IN operator"); q = CacheUtils.getQueryService().newQuery(" UNDEFINED IN SET(UNDEFINED)"); result = q.execute(); - CacheUtils.log(Utils.printResult(result)); if (!result.equals(QueryService.UNDEFINED)) fail("Failed for UNDEFINED with IN operator"); q = CacheUtils.getQueryService().newQuery(" UNDEFINED IN SET(UNDEFINED,UNDEFINED)"); result = q.execute(); - CacheUtils.log(Utils.printResult(result)); if (!result.equals(QueryService.UNDEFINED)) fail("Failed for UNDEFINED with IN operator"); } @@ -275,7 +262,6 @@ public class INOperatorJUnitTest { for (int i = 1; i < params.length; i++) { params[0] = params[i]; Object result = q.execute(params); - CacheUtils.log(Utils.printResult(result)); if (!result.equals(Boolean.TRUE)) fail("Failed for Mix set with IN operator"); } http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java index b8e696f..fa30a48 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java @@ -104,10 +104,6 @@ public class IUM6Bug32345ReJUnitTest { QueryObserverImpl observer = new QueryObserverImpl(); QueryObserverHolder.setInstance(observer); sr[i][0] = (SelectResults) q.execute(); - if (!observer.isIndexesUsed) { - CacheUtils.log("NO INDEX USED"); - } - CacheUtils.log(Utils.printResult(sr[i][0])); resType1 = (StructType) (sr[i][0]).getCollectionType().getElementType(); resSize1 = ((sr[i][0]).size()); @@ -146,12 +142,9 @@ public class IUM6Bug32345ReJUnitTest { QueryObserverImpl observer2 = new QueryObserverImpl(); QueryObserverHolder.setInstance(observer2); sr[i][1] = (SelectResults) q.execute(); - if (observer2.isIndexesUsed) { - CacheUtils.log("YES INDEX IS USED!"); - } else { + if (!observer2.isIndexesUsed) { fail("Index NOT Used"); } - CacheUtils.log(Utils.printResult(sr[i][1])); resType2 = (StructType) (sr[i][1]).getCollectionType().getElementType(); resSize2 = ((sr[i][1]).size()); // CacheUtils.log(resType2); http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java index 76d918d..465ff87 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java @@ -183,7 +183,6 @@ public class IUMJUnitTest { try { q = CacheUtils.getQueryService().newQuery(queries[i]); Object r3 = q.execute(); - CacheUtils.log(Utils.printResult(r3)); resType3 = (StructType) ((SelectResults) r3).getCollectionType().getElementType(); resSize3 = (((SelectResults) r3).size()); // CacheUtils.log(resType3); http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java index a8bb730..7a2f633 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java @@ -181,9 +181,7 @@ public class IUMRCompositeIteratorJUnitTest { Query q = null; try { q = CacheUtils.getQueryService().newQuery(queries[i]); - CacheUtils.getLogger().info("Executing query: " + queries[i]); r[i][0] = (SelectResults) q.execute(); - CacheUtils.log(Utils.printResult(r[i][0])); } catch (Exception e) { e.printStackTrace(); fail(q.getQueryString()); http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java index e31ee50..5350078 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java @@ -149,7 +149,6 @@ public class IndependentOperandsInWhereClause2JUnitTest { if (!observer.isIndexesUsed) { CacheUtils.log("NO INDEX USED"); } - CacheUtils.log(Utils.printResult(r)); if (((Collection) r).size() != sizeOfResult[i]) { fail("SIZE NOT as expected for QUery no :" + (i + 1)); } @@ -173,7 +172,6 @@ public class IndependentOperandsInWhereClause2JUnitTest { Object r2 = q2.execute(); sr[j][1] = (SelectResults) r2; - CacheUtils.log("With Index =" + Utils.printResult(r2)); if (((Collection) r2).size() != sizeOfResult[j]) { fail("SIZE NOT as expected for QUery no :" + (j + 1)); } http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java index afae38a..f126146 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java @@ -317,14 +317,8 @@ public class IndexCreationJUnitTest { QueryObserverHolder.setInstance(observer); r[i][0] = (SelectResults) q.execute(params); - if (!observer.isIndexesUsed) { - CacheUtils.log("NO INDEX USED"); - } - CacheUtils.log(Utils.printResult(r[i][0])); resType1 = (r[i][0]).getCollectionType().getElementType(); resSize1 = ((r[i][0]).size()); - CacheUtils.log("Result Type= " + resType1); - CacheUtils.log("Result Size= " + resSize1); set1 = ((r[i][0]).asSet()); // Iterator iter=set1.iterator(); } @@ -342,12 +336,9 @@ public class IndexCreationJUnitTest { QueryObserverImpl observer2 = new QueryObserverImpl(); QueryObserverHolder.setInstance(observer2); r[i][1] = (SelectResults) q.execute(params); - if (observer2.isIndexesUsed) { - CacheUtils.log("YES INDEX IS USED!"); - } else { + if (!observer2.isIndexesUsed) { fail("FAILED: Index NOT Used"); } - CacheUtils.log(Utils.printResult(r[i][1])); resType2 = (r[i][1]).getCollectionType().getElementType(); resSize2 = ((r[i][1]).size()); set2 = ((r[i][1]).asSet()); http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java index f8321eb..bbe10eb 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java @@ -25,6 +25,8 @@ import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.Collection; +import org.apache.geode.cache.query.SelectResults; +import org.apache.geode.cache.query.internal.ResultsSet; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -90,7 +92,6 @@ public class IndexMaintenanceAsynchJUnitTest { query = CacheUtils.getQueryService().newQuery(queryString); result = query.execute(); - CacheUtils.log(Utils.printResult(result)); } catch (Exception e) { e.printStackTrace(); @@ -100,70 +101,49 @@ public class IndexMaintenanceAsynchJUnitTest { @Test public void testAddEntry() throws Exception { - - new NewThread(region, index); - // assertIndexDetailsEquals(5, stats.getNumberOfValues()); - Thread.sleep(12000); - } - - - class NewThread implements Runnable { String queryString; - Query query; Object result; - Thread t; - Region region; - IndexProtocol index; - - NewThread(Region region, IndexProtocol index) { - t = new Thread(this, "Demo"); - this.region = region; - this.index = index; - t.setPriority(10); - t.start(); - } - - public void run() { - try { - IndexStatistics stats = index.getStatistics(); - for (int i = 5; i < 9; i++) { - region.put("" + i, new Portfolio(i)); - } - final IndexStatistics st = stats; - WaitCriterion ev = new WaitCriterion() { - public boolean done() { - return st.getNumUpdates() == 8; - } - - public String description() { - return "index updates never became 8"; - } - }; - Wait.waitForCriterion(ev, 5000, 200, true); - - // queryString= "SELECT DISTINCT * FROM /portfolios p, p.positions.values pos where - // pos.secId='IBM'"; - queryString = "SELECT DISTINCT * FROM /portfolios where status = 'active'"; - query = CacheUtils.getQueryService().newQuery(queryString); - QueryObserverImpl observer = new QueryObserverImpl(); - QueryObserverHolder.setInstance(observer); - - result = query.execute(); - if (!observer.isIndexesUsed) { - fail("NO INDEX USED"); + Query query; + try { + IndexStatistics stats = index.getStatistics(); + for (int i = 5; i < 9; i++) { + region.put("" + i, new Portfolio(i)); + } + final IndexStatistics st = stats; + WaitCriterion ev = new WaitCriterion() { + public boolean done() { + return st.getNumUpdates() == 8; } - CacheUtils.log(Utils.printResult(result)); - if (((Collection) result).size() != 4) { - fail("Did not obtain expected size of result for the query"); + + public String description() { + return "index updates never became 8"; } - // Task ID: IMA 1 + }; + Wait.waitForCriterion(ev, 5000, 200, true); - } catch (Exception e) { - e.printStackTrace(); + // queryString= "SELECT DISTINCT * FROM /portfolios p, p.positions.values pos where + // pos.secId='IBM'"; + queryString = "SELECT DISTINCT * FROM /portfolios where status = 'active'"; + query = CacheUtils.getQueryService().newQuery(queryString); + QueryObserverImpl observer = new QueryObserverImpl(); + QueryObserverHolder.setInstance(observer); + + result = query.execute(); + if (!observer.isIndexesUsed) { + fail("NO INDEX USED"); + } + if (((Collection) result).size() != 4) { + fail("Did not obtain expected size of result for the query"); } + // Task ID: IMA 1 + + } catch (Exception e) { + e.printStackTrace(); + } } + class QueryObserverImpl extends QueryObserverAdapter { boolean isIndexesUsed = false; ArrayList indexesUsed = new ArrayList(); @@ -178,4 +158,5 @@ public class IndexMaintenanceAsynchJUnitTest { } } } + } http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java index 1081807..68d3af0 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java @@ -131,7 +131,6 @@ public class IndexOperatorJUnitTest { Query q = CacheUtils.getQueryService().newQuery("$1[0][0]"); Object params[] = {array, new Integer(0)}; Character result = (Character) q.execute(params); - CacheUtils.log(Utils.printResult(result)); if (result == null || result.charValue() != 'a') fail(); } @@ -206,7 +205,6 @@ public class IndexOperatorJUnitTest { Query q = CacheUtils.getQueryService().newQuery("$1[$2]"); Object params[] = {array, index}; Object result = q.execute(params); - CacheUtils.log(Utils.printResult(result)); return result; } @@ -214,7 +212,6 @@ public class IndexOperatorJUnitTest { Query q = CacheUtils.getQueryService().newQuery("$1[$2]"); Object params[] = {array, new Integer(index)}; Object result = q.execute(params); - CacheUtils.log(Utils.printResult(result)); return result; } http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java index 6df6b93..b2b12f7 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java @@ -89,7 +89,6 @@ public class IndexPrimaryKeyUsageJUnitTest { if (!observer.isIndexesUsed) { CacheUtils.log("NO INDEX USED"); } - CacheUtils.log(Utils.printResult(r[i][0])); if ((r[i][0]).size() != 0) { CacheUtils.log("As Expected, Results Size is NON ZERO"); } else { @@ -120,10 +119,7 @@ public class IndexPrimaryKeyUsageJUnitTest { } else { fail("FAILED: INDEX IS NOT USED!"); } - CacheUtils.log(Utils.printResult(r[i][1])); - if ((r[i][1]).size() != 0) { - CacheUtils.log("As Expected, Results Size is NON ZERO"); - } else { + if ((r[i][1]).size() == 0) { fail("FAILED:Search result Size is zero"); } } catch (Exception e) { @@ -154,13 +150,8 @@ public class IndexPrimaryKeyUsageJUnitTest { r[i] = q.execute(); if (!observer.isIndexesUsed == false) { fail("FAILED: INDEX IS USED!"); - } else { - CacheUtils.log("As Expected, INDEX is NOT USED"); } - CacheUtils.log(Utils.printResult(r[i])); - if (((SelectResults) r[i]).size() != 0) { - CacheUtils.log("As Expected, Results Size is NON ZERO"); - } else { + if (((SelectResults) r[i]).size() == 0) { fail("FAILED:Search result Size is zero"); } } catch (Exception e) { @@ -192,10 +183,7 @@ public class IndexPrimaryKeyUsageJUnitTest { } else { CacheUtils.log("As Expected, Index Is Not Used"); } - CacheUtils.log(Utils.printResult(r[i])); - if (((SelectResults) r[i]).size() != 0) { - CacheUtils.log("As Expected, Results Size is NON ZERO"); - } else { + if (((SelectResults) r[i]).size() == 0) { fail("FAILED:Search result Size is zero"); } } catch (Exception e) { @@ -229,12 +217,9 @@ public class IndexPrimaryKeyUsageJUnitTest { q = CacheUtils.getQueryService().newQuery(queries[i]); r[i] = q.execute(); - if (observer.isIndexesUsed) { - CacheUtils.log("YES, INDEX IS USED!"); - } else { + if (!observer.isIndexesUsed) { fail("ERROR:Index Is Not Used"); } - CacheUtils.log(Utils.printResult(r[i])); if (observer.IndexTypeFunctional != 1) { fail("IMPROPER INDEX USAGE: INDEX USED IS NOT OF TYPE FUNCTIONAL"); } @@ -278,19 +263,13 @@ public class IndexPrimaryKeyUsageJUnitTest { q = CacheUtils.getQueryService().newQuery(queries[i]); r[i] = q.execute(); - if (observer.isIndexesUsed) { - CacheUtils.log("YES, INDEX IS USED!"); - - } else { + if (!observer.isIndexesUsed) { fail("FAILED:Index Is Not Used"); } - CacheUtils.log(Utils.printResult(r[i])); if (observer.IndexTypePrimKey != 2) { fail("IMPROPER INDEX USAGE: INDEX USED IS NOT OF TYPE PRIMARY_KEY"); } - if (((SelectResults) r[i]).size() != 0) { - CacheUtils.log("As Expected, Results Size is NON ZERO"); - } else { + if (((SelectResults) r[i]).size() == 0) { fail("FAILED:Search result Size is zero"); } } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java index 6eb35d6..e3e061e 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java @@ -98,7 +98,6 @@ public class IndexUsageInNestedQueryJUnitTest { if (!observer.isIndexesUsed) { CacheUtils.log("NO INDEX USED"); } - CacheUtils.log(Utils.printResult(r[i][0])); } catch (Exception e) { e.printStackTrace(); } @@ -119,10 +118,7 @@ public class IndexUsageInNestedQueryJUnitTest { QueryObserverHolder.setInstance(observer2); q = CacheUtils.getQueryService().newQuery(queries[i]); r[i][1] = (SelectResults) q.execute(); - if (observer2.isIndexesUsed == true) { - CacheUtils.log("YES INDEX IS USED!"); - } - CacheUtils.log(Utils.printResult(r[i][1])); + } catch (Exception e) { e.printStackTrace(); fail(q.getQueryString()); http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java index cc59c0f..a03eb23 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java @@ -96,12 +96,9 @@ public class IndexUseMultFrmSnglCondJUnitTest { QueryObserverHolder.setInstance(observer); r[i][0] = (SelectResults) q.execute(); - if (!observer.isIndexesUsed) { - CacheUtils.log("NO INDEX USED"); - } else { + if (observer.isIndexesUsed) { fail("If index were not there how did they get used ???? "); } - CacheUtils.log(Utils.printResult(r)); resArType1 = (StructType) (r[i][0]).getCollectionType().getElementType(); resArSize1 = ((r[i][0]).size()); CacheUtils.log(resArType1); @@ -132,12 +129,9 @@ public class IndexUseMultFrmSnglCondJUnitTest { QueryObserverImpl observer2 = new QueryObserverImpl(); QueryObserverHolder.setInstance(observer2); r[j][1] = (SelectResults) q2.execute(); - if (observer2.isIndexesUsed == true) - CacheUtils.log("YES,INDEX IS USED!!"); - else { + if (observer2.isIndexesUsed != true) { fail("FAILED: Index NOT Used"); } - CacheUtils.log(Utils.printResult(r[j][1])); resArType2 = (StructType) (r[j][1]).getCollectionType().getElementType(); CacheUtils.log(resArType2); resArSize2 = (r[j][1]).size(); http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java index 63b5aaa..2da970f 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java @@ -156,15 +156,11 @@ public class IndexWithSngleFrmAndMultCondQryJUnitTest { QueryObserverImpl observer2 = new QueryObserverImpl(); QueryObserverHolder.setInstance(observer2); sr[i][1] = (SelectResults) q.execute(); - if (observer2.isIndexesUsed) { - CacheUtils.log("YES INDEX IS USED!"); - } else { + if (!observer2.isIndexesUsed) { fail("FAILED: Index NOT Used"); } - CacheUtils.log(Utils.printResult(sr[i][1])); resType2 = (StructType) ((SelectResults) sr[i][1]).getCollectionType().getElementType(); resSize2 = (((SelectResults) sr[i][1]).size()); - CacheUtils.log(resType2); strg2 = resType2.getFieldNames(); set2 = (((SelectResults) sr[i][1]).asSet()); @@ -274,17 +270,13 @@ public class IndexWithSngleFrmAndMultCondQryJUnitTest { QueryObserverImpl observer2 = new QueryObserverImpl(); QueryObserverHolder.setInstance(observer2); sr[i][1] = (SelectResults) q.execute(); - if (observer2.isIndexesUsed) { - CacheUtils.log("YES INDEX IS USED!"); - } else { + if (!observer2.isIndexesUsed) { fail("FAILED: Index NOT Used"); } assertTrue(observer2.indexesUsed.size() < 2); - CacheUtils.log(Utils.printResult(sr[i][1])); resType2 = (StructType) ((SelectResults) sr[i][1]).getCollectionType().getElementType(); resSize2 = (((SelectResults) sr[i][1]).size()); - CacheUtils.log(resType2); strg2 = resType2.getFieldNames(); set2 = (((SelectResults) sr[i][1]).asSet()); @@ -395,14 +387,11 @@ public class IndexWithSngleFrmAndMultCondQryJUnitTest { QueryObserverImpl observer2 = new QueryObserverImpl(); QueryObserverHolder.setInstance(observer2); sr[i][1] = (SelectResults) q.execute(); - if (observer2.isIndexesUsed) { - CacheUtils.log("YES INDEX IS USED!"); - } else { + if (!observer2.isIndexesUsed) { fail("FAILED: Index NOT Used"); } assertEquals(observer2.indexesUsed.size(), 1); - CacheUtils.log(Utils.printResult(sr[i][1])); resType2 = (StructType) ((SelectResults) sr[i][1]).getCollectionType().getElementType(); resSize2 = (((SelectResults) sr[i][1]).size()); CacheUtils.log(resType2); @@ -551,13 +540,10 @@ public class IndexWithSngleFrmAndMultCondQryJUnitTest { QueryObserverHolder.setInstance(observer2); sr[i][1] = (SelectResults) q.execute(); if (observer2.isIndexesUsed) { - CacheUtils.log("YES INDEX IS USED!"); - CacheUtils.log("Indexes used =" + observer2.indexesUsed); assertEquals(1, observer2.indexesUsed.size()); } else { fail("FAILED: Index NOT Used"); } - CacheUtils.log(Utils.printResult(sr[i][1])); resType2 = ((SelectResults) sr[i][1]).getCollectionType().getElementType(); resSize2 = (((SelectResults) sr[i][1]).size()); CacheUtils.log(resType2); @@ -711,13 +697,10 @@ public class IndexWithSngleFrmAndMultCondQryJUnitTest { QueryObserverHolder.setInstance(observer2); sr[i][1] = (SelectResults) q.execute(); if (observer2.isIndexesUsed) { - CacheUtils.log("YES INDEX IS USED!"); - CacheUtils.log("Indexes used =" + observer2.indexesUsed); assertEquals(1, observer2.indexesUsed.size()); } else { fail("FAILED: Index NOT Used"); } - CacheUtils.log(Utils.printResult(sr[i][1])); resType2 = ((SelectResults) sr[i][1]).getCollectionType().getElementType(); resSize2 = (((SelectResults) sr[i][1]).size()); CacheUtils.log(resType2); @@ -935,13 +918,10 @@ public class IndexWithSngleFrmAndMultCondQryJUnitTest { QueryObserverHolder.setInstance(observer2); sr[i][1] = (SelectResults) q.execute(); if (observer2.isIndexesUsed) { - CacheUtils.log("YES INDEX IS USED!"); - CacheUtils.log("Indexes used =" + observer2.indexesUsed); assertEquals(1, observer2.indexesUsed.size()); } else { fail("FAILED: Index NOT Used"); } - CacheUtils.log(Utils.printResult(sr[i][1])); resType2 = ((SelectResults) sr[i][1]).getCollectionType().getElementType(); resSize2 = (((SelectResults) sr[i][1]).size()); CacheUtils.log(resType2); @@ -1148,16 +1128,12 @@ public class IndexWithSngleFrmAndMultCondQryJUnitTest { QueryObserverHolder.setInstance(observer2); sr[i][1] = (SelectResults) q.execute(); if (observer2.isIndexesUsed) { - CacheUtils.log("YES INDEX IS USED!"); - CacheUtils.log("Indexes used =" + observer2.indexesUsed); assertEquals(1, observer2.indexesUsed.size()); } else { fail("FAILED: Index NOT Used"); } - CacheUtils.log(Utils.printResult(sr[i][1])); resType2 = ((SelectResults) sr[i][1]).getCollectionType().getElementType(); resSize2 = (((SelectResults) sr[i][1]).size()); - CacheUtils.log(resType2); // strg2=resType2.getFieldNames(); set2 = (((SelectResults) sr[i][1]).asSet()); http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java index a5c287f..090d686 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java @@ -73,7 +73,6 @@ public class IteratorTypeDefEmpJUnitTest { try { q = CacheUtils.getQueryService().newQuery(queries[i]); Object r = q.execute(); - CacheUtils.log(Utils.printResult(r)); } catch (Exception e) { e.printStackTrace(); fail(q.getQueryString()); http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java index e7f45ff..098d9c3 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java @@ -71,7 +71,6 @@ public class IteratorTypeDefJUnitTest { try { q = CacheUtils.getQueryService().newQuery(queries[i]); Object r = q.execute(); - CacheUtils.log(Utils.printResult(r)); } catch (Exception e) { e.printStackTrace(); fail(q.getQueryString()); @@ -89,7 +88,6 @@ public class IteratorTypeDefJUnitTest { try { q = CacheUtils.getQueryService().newQuery(queries[i]); Object r = q.execute(); - CacheUtils.log(Utils.printResult(r)); if (!(r instanceof SelectResults)) fail( "testIteratorDefSyntaxForObtainingResultBag: Test failed as obtained Result Data not an instance of SelectResults. Query= " @@ -116,7 +114,6 @@ public class IteratorTypeDefJUnitTest { try { q = CacheUtils.getQueryService().newQuery(queries[i]); Object r = q.execute(); - CacheUtils.log(Utils.printResult(r)); } catch (Exception e) { e.printStackTrace(); fail(q.getQueryString()); @@ -140,7 +137,6 @@ public class IteratorTypeDefJUnitTest { try { q = CacheUtils.getQueryService().newQuery(queries[i]); Object r = q.execute(); - CacheUtils.log(Utils.printResult(r)); } catch (Exception e) { e.printStackTrace(); fail(q.getQueryString()); http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java index 7b57986..0a6d59e 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java @@ -74,8 +74,6 @@ public class IteratorTypeDefaultTypesJUnitTest { SelectResults rs = (SelectResults) q.execute(params); if (rs.size() < 1) fail("testIteratorDefIntegerArray: Query fetched zero results "); - CacheUtils.log(Utils.printResult(rs)); - } catch (Exception e) { e.printStackTrace(); @@ -103,7 +101,6 @@ public class IteratorTypeDefaultTypesJUnitTest { SelectResults rs = (SelectResults) q.execute(params); if (rs.size() < 1) fail("testIteratorDefIntegerArrayList: Query fetched zero results "); - CacheUtils.log(Utils.printResult(rs)); } catch (Exception e) { e.printStackTrace(); fail(q.getQueryString()); @@ -130,7 +127,6 @@ public class IteratorTypeDefaultTypesJUnitTest { SelectResults rs = (SelectResults) q.execute(params); if (rs.size() < 1) fail("testIteratorDefString: Query fetched zero results "); - CacheUtils.log(Utils.printResult(rs)); } catch (Exception e) { e.printStackTrace(); @@ -157,7 +153,6 @@ public class IteratorTypeDefaultTypesJUnitTest { SelectResults rs = (SelectResults) q.execute(params); if (rs.size() < 1) fail("testIteratorDefBoolean: Query fetched zero results "); - CacheUtils.log(Utils.printResult(rs)); } catch (Exception e) { e.printStackTrace(); fail(q.getQueryString()); @@ -184,7 +179,6 @@ public class IteratorTypeDefaultTypesJUnitTest { SelectResults rs = (SelectResults) q.execute(params); if (rs.size() < 1) fail("testIteratorDefByte: Query fetched zero results "); - CacheUtils.log(Utils.printResult(rs)); } catch (Exception e) { e.printStackTrace(); fail(q.getQueryString()); @@ -210,7 +204,6 @@ public class IteratorTypeDefaultTypesJUnitTest { SelectResults rs = (SelectResults) q.execute(params); if (rs.size() < 1) fail("testIteratorDefShort: Query fetched zero results "); - CacheUtils.log(Utils.printResult(rs)); } catch (Exception e) { e.printStackTrace(); fail(q.getQueryString()); @@ -236,7 +229,6 @@ public class IteratorTypeDefaultTypesJUnitTest { SelectResults rs = (SelectResults) q.execute(params); if (rs.size() < 1) fail("testIteratorDefLong: Query fetched zero results "); - CacheUtils.log(Utils.printResult(rs)); } catch (Exception e) { e.printStackTrace(); fail(q.getQueryString()); @@ -262,7 +254,6 @@ public class IteratorTypeDefaultTypesJUnitTest { SelectResults rs = (SelectResults) q.execute(params); if (rs.size() < 1) fail("testIteratorDefDouble: Query fetched zero results "); - CacheUtils.log(Utils.printResult(rs)); } catch (Exception e) { e.printStackTrace(); fail(q.getQueryString()); @@ -288,7 +279,6 @@ public class IteratorTypeDefaultTypesJUnitTest { SelectResults rs = (SelectResults) q.execute(params); if (rs.size() < 1) fail("testIteratorDefFloat: Query fetched zero results "); - CacheUtils.log(Utils.printResult(rs)); } catch (Exception e) { e.printStackTrace(); fail(q.getQueryString()); @@ -314,7 +304,6 @@ public class IteratorTypeDefaultTypesJUnitTest { SelectResults rs = (SelectResults) q.execute(params); if (rs.size() < 1) fail("testIteratorDefChar: Query fetched zero results "); - CacheUtils.log(Utils.printResult(rs)); } catch (Exception e) { e.printStackTrace(); fail(q.getQueryString()); @@ -348,7 +337,6 @@ public class IteratorTypeDefaultTypesJUnitTest { try { q = CacheUtils.getQueryService().newQuery(queries[i]); SelectResults rs = (SelectResults) q.execute(params); - CacheUtils.log(Utils.printResult(rs)); if (rs.size() != 1) fail("testNonStaticInnerClassTypeDef: Query fetched results with size =" + rs.size() + " FOr Query number = " + (i + 1)); @@ -386,7 +374,6 @@ public class IteratorTypeDefaultTypesJUnitTest { try { q = CacheUtils.getQueryService().newQuery(queries[i]); SelectResults rs = (SelectResults) q.execute(params); - CacheUtils.log(Utils.printResult(rs)); if (rs.size() != 1) fail("testStaticInnerClassTypeDef: Query fetched results with size =" + rs.size() + " FOr Query number = " + (i + 1)); http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java index de2b75f..75817f3 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java @@ -94,31 +94,26 @@ public class NestedQueryJUnitTest { "SELECT DISTINCT * FROM /Portfolios WHERE NOT(SELECT DISTINCT * FROM positions.values p WHERE p.secId = 'IBM').isEmpty"; query = CacheUtils.getQueryService().newQuery(queryString); result = query.execute(); - CacheUtils.log(Utils.printResult(result)); // Fails queryString = "SELECT DISTINCT * FROM /Portfolios where status = ELEMENT(SELECT DISTINCT * FROM /Portfolios p where p.ID = 0).status"; query = CacheUtils.getQueryService().newQuery(queryString); result = query.execute(); - CacheUtils.log(Utils.printResult(result)); // Executes successfully queryString = "SELECT DISTINCT * FROM /Portfolios x where status = ELEMENT(SELECT DISTINCT * FROM /Portfolios p where x.ID = p.ID).status"; query = CacheUtils.getQueryService().newQuery(queryString); result = query.execute(); - CacheUtils.log(Utils.printResult(result)); // Fails queryString = "SELECT DISTINCT * FROM /Portfolios x where status = ELEMENT(SELECT DISTINCT * FROM /Portfolios p where p.ID = x.ID).status"; query = CacheUtils.getQueryService().newQuery(queryString); result = query.execute(); - CacheUtils.log(Utils.printResult(result)); queryString = "SELECT DISTINCT * FROM /Portfolios x where status = ELEMENT(SELECT DISTINCT * FROM /Portfolios p where p.ID = 0).status"; query = CacheUtils.getQueryService().newQuery(queryString); result = query.execute(); - CacheUtils.log(Utils.printResult(result)); } @Test @@ -173,11 +168,8 @@ public class NestedQueryJUnitTest { if (!observer.isIndexesUsed) { CacheUtils.log("NO INDEX USED"); } - CacheUtils.log(Utils.printResult(r)); resType1 = (r[i][0]).getCollectionType().getElementType(); resSize1 = ((r[i][0]).size()); - CacheUtils.log("Result Type= " + resType1); - CacheUtils.log("Result Size= " + resSize1); set1 = ((r[i][0]).asSet()); // Iterator iter=set1.iterator(); @@ -204,15 +196,11 @@ public class NestedQueryJUnitTest { r[i][1] = (SelectResults) q.execute(); if (observer2.isIndexesUsed == true) { - CacheUtils.log("YES INDEX IS USED!"); } else if (i != 3) { fail("Index not used"); } - CacheUtils.log(Utils.printResult(r[i][1])); resType2 = (r[i][1]).getCollectionType().getElementType(); resSize2 = ((r[i][1]).size()); - // CacheUtils.log("Result Type= "+resType2); - // CacheUtils.log("Result Size= "+resSize2); set2 = ((r[i][1]).asSet()); } catch (Exception e) { @@ -284,14 +272,9 @@ public class NestedQueryJUnitTest { r[i][0] = (SelectResults) q.execute(); QueryObserverImpl observer = new QueryObserverImpl(); QueryObserverHolder.setInstance(observer); - if (!observer.isIndexesUsed) { - CacheUtils.log("NO INDEX USED"); - } - CacheUtils.log(Utils.printResult(r[i][0])); + resType1 = (r[i][0]).getCollectionType().getElementType(); resSize1 = ((r[i][0]).size()); - CacheUtils.log("Result Type= " + resType1); - CacheUtils.log("Result Size= " + resSize1); set1 = ((r[i][0]).asSet()); // Iterator iter=set1.iterator(); @@ -313,10 +296,6 @@ public class NestedQueryJUnitTest { QueryObserverImpl observer2 = new QueryObserverImpl(); QueryObserverHolder.setInstance(observer2); - if (observer2.isIndexesUsed == true) { - CacheUtils.log("YES INDEX IS USED!"); - } - CacheUtils.log(Utils.printResult(r[i][1])); resType2 = (r[i][1]).getCollectionType().getElementType(); resSize2 = ((r[i][1]).size()); set2 = ((r[i][1]).asSet()); http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java index 0585b57..4da1e52 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java @@ -81,7 +81,6 @@ public class StructMemberAccessJUnitTest { try { Query q = CacheUtils.getQueryService().newQuery(queries[i]); Object r = q.execute(); - CacheUtils.log(Utils.printResult(r)); fail(queries[i]); } catch (Exception e) { // e.printStackTrace(); @@ -116,7 +115,6 @@ public class StructMemberAccessJUnitTest { try { Query q = CacheUtils.getQueryService().newQuery(queries[i]); Object r = q.execute(); - CacheUtils.log(Utils.printResult(r)); } catch (Exception e) { e.printStackTrace(); fail(queries[i]); @@ -192,12 +190,9 @@ public class StructMemberAccessJUnitTest { for (int i = 0; i < queries.length; i++) { Query q = CacheUtils.getQueryService().newQuery(queries[i]); Object r = q.execute(); - CacheUtils.log(Utils.printResult(r)); String className = (((SelectResults) r).getCollectionType()).getElementType().getSimpleClassName(); - if (className.equals("Employee")) { - CacheUtils.log("pass"); - } else { + if (!className.equals("Employee")) { fail( "StructMemberAccessTest::testSubClassQuery:failed .Expected class name Employee. Actualy obtained=" + className); @@ -223,12 +218,10 @@ public class StructMemberAccessJUnitTest { for (i = 0; i < queries.length; i++) { Query q = CacheUtils.getQueryService().newQuery(queries[i]); Object r = q.execute(); - CacheUtils.log(Utils.printResult(r)); StructType type = ((StructType) ((SelectResults) r).getCollectionType().getElementType()); String fieldNames[] = type.getFieldNames(); for (i = 0; i < fieldNames.length; ++i) { String name = fieldNames[i]; - CacheUtils.log("Struct Field name = " + name); if (name.equals("/root/portfolios") || name.equals("positions.values")) { fail("The field name in struct = " + name); } @@ -249,7 +242,6 @@ public class StructMemberAccessJUnitTest { for (i = 0; i < queries.length; i++) { Query q = CacheUtils.getQueryService().newQuery(queries[i]); Object r = q.execute(); - CacheUtils.log(Utils.printResult(r)); StructType type = ((StructType) ((SelectResults) r).getCollectionType().getElementType()); String fieldNames[] = type.getFieldNames(); for (i = 0; i < fieldNames.length; ++i) { http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java index 7528cfb..6723243 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java @@ -19,6 +19,7 @@ */ package org.apache.geode.cache.query.functional; +import static javafx.scene.input.KeyCode.Q; import static org.junit.Assert.*; import java.util.ArrayList; @@ -81,10 +82,6 @@ public class TestNewFunctionSSorRSIntegrationTest { QueryObserverImpl observer1 = new QueryObserverImpl(); QueryObserverHolder.setInstance(observer1); r[i][0] = q.execute(); - if (!observer1.isIndexesUsed) { - CacheUtils.log("NO INDEX IS USED!"); - } - CacheUtils.log(Utils.printResult(r[i][0])); } qs.createIndex("sIndex", IndexType.FUNCTIONAL, "status", "/portfolios"); @@ -95,12 +92,9 @@ public class TestNewFunctionSSorRSIntegrationTest { QueryObserverImpl observer2 = new QueryObserverImpl(); QueryObserverHolder.setInstance(observer2); r[i][1] = q.execute(); - if (observer2.isIndexesUsed) { - CacheUtils.log("YES INDEX IS USED!"); - } else { + if (!observer2.isIndexesUsed) { fail("Index NOT Used"); } - CacheUtils.log(Utils.printResult(r[i][1])); } StructSetOrResultsSet ssORrs = new StructSetOrResultsSet(); http://git-wip-us.apache.org/repos/asf/geode/blob/18d3e17b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java index 01ccf28..8911931 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java @@ -195,7 +195,6 @@ public class IndexMaintainceJUnitTest { // index.query("active", OQLLexerTokenTypes.TOK_EQ, results, new ExecutionContext(null, // CacheUtils.getCache())); SelectResults results = region.query("status = 'active'"); - CacheUtils.log(Utils.printResult(results)); assertEquals(3, results.size()); }
