http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberJmxImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberJmxImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberJmxImpl.java index f3a0d75..2e4ddd8 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberJmxImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberJmxImpl.java @@ -57,9 +57,8 @@ import org.apache.geode.internal.logging.LogService; * @since GemFire 3.5 * */ -public class SystemMemberJmxImpl -extends SystemMemberImpl -implements SystemMemberJmx, javax.management.NotificationListener, ManagedResource { +public class SystemMemberJmxImpl extends SystemMemberImpl + implements SystemMemberJmx, javax.management.NotificationListener, ManagedResource { private static final Logger logger = LogService.getLogger(); @@ -89,9 +88,8 @@ implements SystemMemberJmx, javax.management.NotificationListener, ManagedResour * @param system the distributed system this SystemMember is a member of * @param application the internal admin application to delegate actual work */ - public SystemMemberJmxImpl(AdminDistributedSystemJmxImpl system, - ApplicationVM application) - throws AdminException { + public SystemMemberJmxImpl(AdminDistributedSystemJmxImpl system, ApplicationVM application) + throws AdminException { super(system, application); initializeMBean(); } @@ -114,10 +112,9 @@ implements SystemMemberJmx, javax.management.NotificationListener, ManagedResour } /** Create and register the MBean to manage this resource */ - private void initializeMBean() - throws AdminException { - //initialize Managed Resources for stats & cache first. -// initializeManagedResources(); + private void initializeMBean() throws AdminException { + // initialize Managed Resources for stats & cache first. + // initializeManagedResources(); this.mbeanName = new StringBuffer("GemFire.Member:id=") .append(MBeanUtil.makeCompliantMBeanNameProperty(getId())).append(",type=") @@ -299,8 +296,7 @@ implements SystemMemberJmx, javax.management.NotificationListener, ManagedResour * @throws AdminException if constructing StatisticResourceJmxImpl instance fails */ @Override - protected StatisticResource createStatisticResource(StatResource stat) - throws AdminException { + protected StatisticResource createStatisticResource(StatResource stat) throws AdminException { StatisticResourceJmxImpl managedStatisticResource = null; synchronized (this.managedStatisticsResourcesMap) { @@ -328,8 +324,7 @@ implements SystemMemberJmx, javax.management.NotificationListener, ManagedResour * @throws AdminException if constructing SystemMemberCacheJmxImpl instance fails */ @Override - protected SystemMemberCache createSystemMemberCache(GemFireVM vm) - throws AdminException { + protected SystemMemberCache createSystemMemberCache(GemFireVM vm) throws AdminException { if (managedSystemMemberCache == null) { managedSystemMemberCache = new SystemMemberCacheJmxImpl(vm); }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberRegionJmxImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberRegionJmxImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberRegionJmxImpl.java index 500f0ee..2829b98 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberRegionJmxImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberRegionJmxImpl.java @@ -25,14 +25,11 @@ import javax.management.ObjectName; import javax.management.modelmbean.ModelMBean; /** - * MBean representation of {@link - * SystemMemberRegion}. + * MBean representation of {@link SystemMemberRegion}. * * @since GemFire 3.5 */ -public class SystemMemberRegionJmxImpl -extends SystemMemberRegionImpl -implements ManagedResource { +public class SystemMemberRegionJmxImpl extends SystemMemberRegionImpl implements ManagedResource { /** The object name of this managed resource */ private ObjectName objectName; @@ -47,17 +44,15 @@ implements ManagedResource { * @param cache the cache this region belongs to * @param region internal region to delegate real work to */ - public SystemMemberRegionJmxImpl(SystemMemberCacheImpl cache, - Region region) - throws AdminException { + public SystemMemberRegionJmxImpl(SystemMemberCacheImpl cache, Region region) + throws AdminException { super(cache, region); initializeMBean(cache); } /** Create and register the MBean to manage this resource */ - private void initializeMBean(SystemMemberCacheImpl cache) - throws AdminException { - + private void initializeMBean(SystemMemberCacheImpl cache) throws AdminException { + GemFireVM vm = cache.getVM(); this.mbeanName = new StringBuffer("GemFire.Cache:").append("path=") .append(MBeanUtil.makeCompliantMBeanNameProperty(getFullPath())).append(",name=") http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java index 63d7d89..3ad94bd 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java @@ -16,10 +16,10 @@ package org.apache.geode.internal.admin.remote; -//import org.apache.geode.*; +// import org.apache.geode.*; import org.apache.geode.internal.admin.api.GemFireHealthConfig; -//import org.apache.geode.internal.*; -//import org.apache.geode.internal.admin.*; +// import org.apache.geode.internal.*; +// import org.apache.geode.internal.admin.*; import org.apache.geode.distributed.internal.*; import java.io.*; // import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRegion.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRegion.java index 199a623..5d87977 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminRegion.java @@ -16,7 +16,7 @@ package org.apache.geode.internal.admin.remote; -//import org.apache.geode.*; +// import org.apache.geode.*; import org.apache.geode.internal.admin.api.RuntimeAdminException; import org.apache.geode.cache.*; import org.apache.geode.cache.query.SelectResults; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java index ae9c982..f344b40 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java @@ -18,8 +18,8 @@ package org.apache.geode.internal.admin.remote; import org.apache.geode.*; import org.apache.geode.internal.admin.api.GemFireHealth; -//import org.apache.geode.internal.*; -//import org.apache.geode.internal.admin.*; +// import org.apache.geode.internal.*; +// import org.apache.geode.internal.admin.*; import org.apache.geode.distributed.internal.*; import java.io.*; // import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java index bb5f331..7bc3f49 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java @@ -20,8 +20,8 @@ import org.apache.geode.distributed.internal.*; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.*; import org.apache.geode.internal.admin.api.GemFireHealth; -//import org.apache.geode.internal.*; -//import org.apache.geode.internal.admin.*; +// import org.apache.geode.internal.*; +// import org.apache.geode.internal.admin.*; import java.io.*; // import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java index 9eb7013..62a3313 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java @@ -21,8 +21,8 @@ import org.apache.geode.internal.admin.api.GemFireMemberStatus; import java.io.*; /** - * A message that is sent to a particular distribution manager to get its - * current {@link GemFireMemberStatus} + * A message that is sent to a particular distribution manager to get its current + * {@link GemFireMemberStatus} * */ public class RefreshMemberSnapshotRequest extends AdminRequest { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java index 57b5601..d0b47ae 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java @@ -28,8 +28,8 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe import org.apache.geode.internal.cache.GemFireCacheImpl; /** - * A message that is sent to a particular distribution manager to get its - * current {@link GemFireMemberStatus}. + * A message that is sent to a particular distribution manager to get its current + * {@link GemFireMemberStatus}. * */ public class RefreshMemberSnapshotResponse extends AdminResponse { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGemFireVM.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGemFireVM.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGemFireVM.java index 979b6ca..0909b31 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGemFireVM.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGemFireVM.java @@ -423,9 +423,9 @@ public abstract class RemoteGemFireVM implements GemFireVM { } /** - * Returns the runtime {@link GemFireMemberStatus} from the vm - * The idea is this snapshot is similar to stats that represent the current state of a - * running VM. However, this is a bit higher level than a stat + * Returns the runtime {@link GemFireMemberStatus} from the vm The idea is this snapshot is + * similar to stats that represent the current state of a running VM. However, this is a bit + * higher level than a stat */ public GemFireMemberStatus getSnapshot() { RefreshMemberSnapshotResponse response = @@ -434,8 +434,8 @@ public abstract class RemoteGemFireVM implements GemFireVM { } /** - * Returns the runtime {@link RegionSubRegionSnapshot} from the vm - * The idea is this snapshot is quickly salvageable to present a cache's region's info + * Returns the runtime {@link RegionSubRegionSnapshot} from the vm The idea is this snapshot is + * quickly salvageable to present a cache's region's info */ public RegionSubRegionSnapshot getRegionSnapshot() { RegionSubRegionsSizeResponse response = http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java index 00402ca..ade1450 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java @@ -197,7 +197,9 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { Assert.fail("Failed to get QueryService.", e); } - queryString = "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + regionName; + queryString = + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + + regionName; try { Query query = qService.newQuery(queryString); @@ -209,7 +211,9 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { assertEquals(numberOfEntries, results.size()); assertTrue(!results.getCollectionType().allowsDuplicates()); - queryString = "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + regionName + " where ticker = 'ibm'"; + queryString = + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + + regionName + " where ticker = 'ibm'"; try { Query query = qService.newQuery(queryString); results = (SelectResults) query.execute(); @@ -219,7 +223,9 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { assertEquals(numberOfEntries, results.size()); assertTrue(!results.getCollectionType().allowsDuplicates()); - queryString = "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + regionName + " where ticker = 'IBM'"; + queryString = + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + + regionName + " where ticker = 'IBM'"; try { Query query = qService.newQuery(queryString); results = (SelectResults) query.execute(); @@ -229,7 +235,9 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { assertEquals(0, results.size()); assertTrue(!results.getCollectionType().allowsDuplicates()); - queryString = "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + regionName + " where price > 49"; + queryString = + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + + regionName + " where price > 49"; try { Query query = qService.newQuery(queryString); results = (SelectResults) query.execute(); @@ -239,7 +247,9 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { assertEquals(numberOfEntries / 2, results.size()); assertTrue(!results.getCollectionType().allowsDuplicates()); - queryString = "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + regionName + " where price = 50"; + queryString = + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + + regionName + " where price = 50"; try { Query query = qService.newQuery(queryString); results = (SelectResults) query.execute(); @@ -249,8 +259,9 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { assertEquals(1, results.size()); assertTrue(!results.getCollectionType().allowsDuplicates()); - queryString = "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + regionName - + " where ticker = 'ibm' and price = 50"; + queryString = + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + + regionName + " where ticker = 'ibm' and price = 50"; try { Query query = qService.newQuery(queryString); results = (SelectResults) query.execute(); @@ -306,7 +317,9 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { Assert.fail("Failed to get QueryService.", e); } - queryString = "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + regionName; + queryString = + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + + regionName; try { Query query = qService.newQuery(queryString); results = (SelectResults) query.execute(); @@ -318,7 +331,8 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { && results.getCollectionType().getElementType().isStructType()); queryString = - "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + regionName + " where ticker = 'ibm'"; + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + + regionName + " where ticker = 'ibm'"; try { Query query = qService.newQuery(queryString); results = (SelectResults) query.execute(); @@ -330,7 +344,8 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { && results.getCollectionType().getElementType().isStructType()); queryString = - "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + regionName + " where ticker = 'IBM'"; + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + + regionName + " where ticker = 'IBM'"; try { Query query = qService.newQuery(queryString); results = (SelectResults) query.execute(); @@ -342,7 +357,8 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { && results.getCollectionType().getElementType().isStructType()); queryString = - "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + regionName + " where price > 49"; + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + + regionName + " where price > 49"; try { Query query = qService.newQuery(queryString); results = (SelectResults) query.execute(); @@ -354,7 +370,8 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { && results.getCollectionType().getElementType().isStructType()); queryString = - "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + regionName + " where price = 50"; + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + + regionName + " where price = 50"; try { Query query = qService.newQuery(queryString); results = (SelectResults) query.execute(); @@ -365,8 +382,9 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType()); - queryString = "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + regionName - + " where ticker = 'ibm' and price = 50"; + queryString = + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + + regionName + " where ticker = 'ibm' and price = 50"; try { Query query = qService.newQuery(queryString); results = (SelectResults) query.execute(); @@ -1636,7 +1654,8 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { } try { - String importString = "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject;"; + String importString = + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject;"; qService.createIndex("test", IndexType.FUNCTIONAL, "ticker", regionName1, importString); } catch (UnsupportedOperationException e) { // Expected behavior. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java index 34ddf3d..8088374 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java @@ -279,64 +279,18 @@ public class RemoteQueryDUnitTest extends JUnit4CacheTestCase { // Execute client queries vm1.invoke(new CacheSerializableRunnable("Execute queries") { - public void run2() throws CacheException { - Region region = getRootRegion().getSubregion(name); - String queryString = null; - SelectResults results = null; - - queryString = "import org.apache.geode.query.dunit.RemoteQueryDUnitTest.TestObject; select distinct * from " + region.getFullPath(); - try { - results = region.query(queryString); - } catch (Exception e) { - Assert.fail("Failed executing " + queryString, e); - } - assertEquals(numberOfEntries, results.size()); - assertTrue(!results.getCollectionType().allowsDuplicates()); - - queryString = "import org.apache.geode.query.dunit.RemoteQueryDUnitTest.TestObject; select distinct * from " + region.getFullPath() + " where ticker = 'ibm'"; - try { - results = region.query(queryString); - } catch (Exception e) { - Assert.fail("Failed executing " + queryString, e); - } - assertEquals(numberOfEntries, results.size()); - assertTrue(!results.getCollectionType().allowsDuplicates()); - - queryString = "import org.apache.geode.query.dunit.RemoteQueryDUnitTest.TestObject; select distinct * from " + region.getFullPath() + " where ticker = 'IBM'"; - try { - results = region.query(queryString); - } catch (Exception e) { - Assert.fail("Failed executing " + queryString, e); - } - assertEquals(0, results.size()); - assertTrue(!results.getCollectionType().allowsDuplicates()); - - queryString = "import org.apache.geode.query.dunit.RemoteQueryDUnitTest.TestObject; select distinct * from " + region.getFullPath() + " where price > 49"; - try { - results = region.query(queryString); - } catch (Exception e) { - Assert.fail("Failed executing " + queryString, e); - } - assertEquals(numberOfEntries/2, results.size()); - assertTrue(!results.getCollectionType().allowsDuplicates()); - - queryString = "import org.apache.geode.query.dunit.RemoteQueryDUnitTest.TestObject; select distinct * from " + region.getFullPath() + " where price = 50"; - try { - results = region.query(queryString); - } catch (Exception e) { - Assert.fail("Failed executing " + queryString, e); - } - assertEquals(1, results.size()); - assertTrue(!results.getCollectionType().allowsDuplicates()); + public void run2() throws CacheException { + Region region = getRootRegion().getSubregion(name); + String queryString = null; + SelectResults results = null; - queryString = "import org.apache.geode.query.dunit.RemoteQueryDUnitTest.TestObject; select distinct * from " + region.getFullPath() + " where ticker = 'ibm' and price = 50"; - try { - results = region.query(queryString); - } catch (Exception e) { - Assert.fail("Failed executing " + queryString, e); - } - assertEquals(1, results.size()); - assertTrue(!results.getCollectionType().allowsDuplicates()); + queryString = + "import org.apache.geode.admin.RemoteQueryDUnitTest.TestObject; select distinct * from " + + region.getFullPath(); + try { + results = region.query(queryString); + } catch (Exception e) { + Assert.fail("Failed executing " + queryString, e); } assertEquals(numberOfEntries, results.size()); assertTrue(!results.getCollectionType().allowsDuplicates()); @@ -466,64 +420,66 @@ public class RemoteQueryDUnitTest extends JUnit4CacheTestCase { // Execute client queries vm1.invoke(new CacheSerializableRunnable("Execute queries") { - public void run2() throws CacheException { - Region region = getRootRegion().getSubregion(name); - String queryString = null; - SelectResults results = null; - - queryString = "import org.apache.geode.query.dunit.RemoteQueryDUnitTest.TestObject; select distinct ticker, price from " + region.getFullPath(); - try { - results = region.query(queryString); - } catch (Exception e) { - Assert.fail("Failed executing " + queryString, e); - } - assertEquals(numberOfEntries, results.size()); - assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType()); + public void run2() throws CacheException { + Region region = getRootRegion().getSubregion(name); + String queryString = null; + SelectResults results = null; - queryString = "import org.apache.geode.query.dunit.RemoteQueryDUnitTest.TestObject; select distinct ticker, price from " + region.getFullPath() + " where ticker = 'ibm'"; - try { - results = region.query(queryString); - } catch (Exception e) { - Assert.fail("Failed executing " + queryString, e); - } - assertEquals(numberOfEntries, results.size()); - assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType()); + queryString = + "import org.apache.geode.admin.RemoteQueryDUnitTest.TestObject; select distinct ticker, price from " + + region.getFullPath(); + try { + results = region.query(queryString); + } catch (Exception e) { + Assert.fail("Failed executing " + queryString, e); + } + assertEquals(numberOfEntries, results.size()); + assertTrue(!results.getCollectionType().allowsDuplicates() + && results.getCollectionType().getElementType().isStructType()); - queryString = "import org.apache.geode.query.dunit.RemoteQueryDUnitTest.TestObject; select distinct ticker, price from " + region.getFullPath() + " where ticker = 'IBM'"; - try { - results = region.query(queryString); - } catch (Exception e) { - Assert.fail("Failed executing " + queryString, e); - } - assertEquals(0, results.size()); - assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType()); + queryString = + "import org.apache.geode.admin.RemoteQueryDUnitTest.TestObject; select distinct ticker, price from " + + region.getFullPath() + " where ticker = 'ibm'"; + try { + results = region.query(queryString); + } catch (Exception e) { + Assert.fail("Failed executing " + queryString, e); + } + assertEquals(numberOfEntries, results.size()); + assertTrue(!results.getCollectionType().allowsDuplicates() + && results.getCollectionType().getElementType().isStructType()); - queryString = "import org.apache.geode.query.dunit.RemoteQueryDUnitTest.TestObject; select distinct ticker, price from " + region.getFullPath() + " where price > 49"; - try { - results = region.query(queryString); - } catch (Exception e) { - Assert.fail("Failed executing " + queryString, e); - } - assertEquals(numberOfEntries/2, results.size()); - assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType()); + queryString = + "import org.apache.geode.admin.RemoteQueryDUnitTest.TestObject; select distinct ticker, price from " + + region.getFullPath() + " where ticker = 'IBM'"; + try { + results = region.query(queryString); + } catch (Exception e) { + Assert.fail("Failed executing " + queryString, e); + } + assertEquals(0, results.size()); + assertTrue(!results.getCollectionType().allowsDuplicates() + && results.getCollectionType().getElementType().isStructType()); - queryString = "import org.apache.geode.query.dunit.RemoteQueryDUnitTest.TestObject; select distinct ticker, price from " + region.getFullPath() + " where price = 50"; - try { - results = region.query(queryString); - } catch (Exception e) { - Assert.fail("Failed executing " + queryString, e); - } - assertEquals(1, results.size()); - assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType()); + queryString = + "import org.apache.geode.admin.RemoteQueryDUnitTest.TestObject; select distinct ticker, price from " + + region.getFullPath() + " where price > 49"; + try { + results = region.query(queryString); + } catch (Exception e) { + Assert.fail("Failed executing " + queryString, e); + } + assertEquals(numberOfEntries / 2, results.size()); + assertTrue(!results.getCollectionType().allowsDuplicates() + && results.getCollectionType().getElementType().isStructType()); - queryString = "import org.apache.geode.query.dunit.RemoteQueryDUnitTest.TestObject; select distinct ticker, price from " + region.getFullPath() + " where ticker = 'ibm' and price = 50"; - try { - results = region.query(queryString); - } catch (Exception e) { - Assert.fail("Failed executing " + queryString, e); - } - assertEquals(1, results.size()); - assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType()); + queryString = + "import org.apache.geode.admin.RemoteQueryDUnitTest.TestObject; select distinct ticker, price from " + + region.getFullPath() + " where price = 50"; + try { + results = region.query(queryString); + } catch (Exception e) { + Assert.fail("Failed executing " + queryString, e); } assertEquals(1, results.size()); assertTrue(!results.getCollectionType().allowsDuplicates() http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/HealthEvaluatorTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/HealthEvaluatorTestCase.java b/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/HealthEvaluatorTestCase.java index dc369f4..858603f 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/HealthEvaluatorTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/HealthEvaluatorTestCase.java @@ -26,9 +26,7 @@ import java.util.Properties; import static org.apache.geode.distributed.ConfigurationProperties.*; /** - * Superclass of tests for the {@linkplain - * AbstractHealthEvaluator health - * evaluator} classes. + * Superclass of tests for the {@linkplain AbstractHealthEvaluator health evaluator} classes. * * * @since GemFire 3.5
