-Fix formatting code Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/fb4b3552 Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/fb4b3552 Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/fb4b3552
Branch: refs/heads/master Commit: fb4b3552a497ea082cec27c69512e7f91dbca619 Parents: 791e14c Author: dev <[email protected]> Authored: Sun May 6 14:30:26 2018 -0500 Committer: dev <[email protected]> Committed: Sun May 6 14:30:26 2018 -0500 ---------------------------------------------------------------------- .../gora/accumulo/store/AccumuloStoreTest.java | 6 +- .../org/apache/gora/memory/store/MemStore.java | 2 +- .../apache/gora/store/DataStoreTestBase.java | 14 ++--- .../apache/gora/store/DataStoreTestUtil.java | 63 ++++++++++---------- .../apache/gora/hbase/store/TestHBaseStore.java | 6 +- .../apache/gora/jcache/query/JCacheResult.java | 4 +- .../gora/orientdb/query/OrientDBResult.java | 4 +- .../org/apache/gora/solr/query/SolrResult.java | 4 +- 8 files changed, 53 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/fb4b3552/gora-accumulo/src/test/java/org/apache/gora/accumulo/store/AccumuloStoreTest.java ---------------------------------------------------------------------- diff --git a/gora-accumulo/src/test/java/org/apache/gora/accumulo/store/AccumuloStoreTest.java b/gora-accumulo/src/test/java/org/apache/gora/accumulo/store/AccumuloStoreTest.java index 54f5519..adeb8b0 100644 --- a/gora-accumulo/src/test/java/org/apache/gora/accumulo/store/AccumuloStoreTest.java +++ b/gora-accumulo/src/test/java/org/apache/gora/accumulo/store/AccumuloStoreTest.java @@ -67,18 +67,18 @@ public class AccumuloStoreTest extends DataStoreTestBase { @Override public void testResultSize() throws Exception { } - + @Test @Ignore("Accumulo does not support Result#size() without limit set") @Override public void testResultSizeStartKey() throws Exception { } - + @Ignore("Accumulo does not support Result#size() without limit set") @Override public void testResultSizeEndKey() throws Exception { } - + @Test @Ignore("Accumulo does not support Result#size() without limit set") @Override http://git-wip-us.apache.org/repos/asf/gora/blob/fb4b3552/gora-core/src/main/java/org/apache/gora/memory/store/MemStore.java ---------------------------------------------------------------------- diff --git a/gora-core/src/main/java/org/apache/gora/memory/store/MemStore.java b/gora-core/src/main/java/org/apache/gora/memory/store/MemStore.java index ce0d336..4404e03 100644 --- a/gora-core/src/main/java/org/apache/gora/memory/store/MemStore.java +++ b/gora-core/src/main/java/org/apache/gora/memory/store/MemStore.java @@ -93,7 +93,7 @@ public class MemStore<K, T extends PersistentBase> extends DataStoreBase<K, T> { @Override public int size() { int totalSize = map.navigableKeySet().size(); - int intLimit = (int)this.limit; + int intLimit = (int) this.limit; return intLimit > 0 && totalSize > intLimit ? intLimit : totalSize; } } http://git-wip-us.apache.org/repos/asf/gora/blob/fb4b3552/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java ---------------------------------------------------------------------- diff --git a/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java b/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java index 625df39..37a3dea 100644 --- a/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java +++ b/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java @@ -364,43 +364,43 @@ public abstract class DataStoreTestBase { log.info("test method: testResultSize"); DataStoreTestUtil.testResultSizeWebPages(webPageStore); } - + @Test public void testResultSizeStartKey() throws Exception { log.info("test method: testResultSizeStartKey"); DataStoreTestUtil.testResultSizeWebPagesStartKey(webPageStore); } - + @Test public void testResultSizeEndKey() throws Exception { log.info("test method: testResultSizeEndKey"); DataStoreTestUtil.testResultSizeWebPagesEndKey(webPageStore); } - + @Test public void testResultSizeKeyRange() throws Exception { log.info("test method: testResultSizeKeyRange"); DataStoreTestUtil.testResultSizeWebPagesKeyRange(webPageStore); } - + @Test public void testResultSizeWithLimit() throws Exception { log.info("test method: testResultSizeWithLimit"); DataStoreTestUtil.testResultSizeWebPagesWithLimit(webPageStore); } - + @Test public void testResultSizeStartKeyWithLimit() throws Exception { log.info("test method: testResultSizeStartKeyWithLimit"); DataStoreTestUtil.testResultSizeWebPagesStartKeyWithLimit(webPageStore); } - + @Test public void testResultSizeEndKeyWithLimit() throws Exception { log.info("test method: testResultSizeEndKeyWithLimit"); DataStoreTestUtil.testResultSizeWebPagesEndKeyWithLimit(webPageStore); } - + @Test public void testResultSizeKeyRangeWithLimit() throws Exception { log.info("test method: testResultSizeKeyRangeWithLimit"); http://git-wip-us.apache.org/repos/asf/gora/blob/fb4b3552/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java ---------------------------------------------------------------------- diff --git a/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java b/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java index 5a38df4..99cfd6b 100644 --- a/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java +++ b/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java @@ -1210,8 +1210,8 @@ public class DataStoreTestUtil { } public static void testResultSize(DataStore<String, WebPage> store, - boolean setStartKeys, boolean setEndKeys, boolean setLimit) - throws Exception { + boolean setStartKeys, boolean setEndKeys, boolean setLimit) + throws Exception { createWebPageData(store); //create sorted set of urls @@ -1220,19 +1220,20 @@ public class DataStoreTestUtil { Collections.sort(sortedUrls); //try all ranges - for(int i=0; i<sortedUrls.size(); i++) { - for(int j=i; j<sortedUrls.size(); j++) { + for (int i = 0; i < sortedUrls.size(); i++) { + for (int j = i; j < sortedUrls.size(); j++) { Query<String, WebPage> query = store.newQuery(); - if(setStartKeys) + if (setStartKeys) { query.setStartKey(sortedUrls.get(i)); - if(setEndKeys) + } + if (setEndKeys) { query.setEndKey(sortedUrls.get(j)); - int expectedLength = (setEndKeys ? j+1: sortedUrls.size()) - - (setStartKeys ? i: 0); - if (setLimit){ + } + int expectedLength = (setEndKeys ? j + 1 : sortedUrls.size()) - (setStartKeys ? i : 0); + if (setLimit) { //limit half of the expected results - int limit = expectedLength/2; - if (limit > 0){ + int limit = expectedLength / 2; + if (limit > 0) { query.setLimit(limit); } else { continue; @@ -1240,56 +1241,58 @@ public class DataStoreTestUtil { } Result<String, WebPage> result = query.execute(); int size = result.size(); - int r=0; - while(result.next()) { + int r = 0; + while (result.next()) { r++; } assertEquals(r, size); - if(!setEndKeys) + if (!setEndKeys) { break; + } } - if(!setStartKeys) + if (!setStartKeys) { break; + } } } public static void testResultSizeWebPages(DataStore<String, WebPage> store) - throws Exception { + throws Exception { testResultSize(store, false, false, false); } - + public static void testResultSizeWebPagesStartKey(DataStore<String, WebPage> store) - throws Exception { + throws Exception { testResultSize(store, true, false, false); } - + public static void testResultSizeWebPagesEndKey(DataStore<String, WebPage> store) - throws Exception { + throws Exception { testResultSize(store, false, false, false); } - + public static void testResultSizeWebPagesKeyRange(DataStore<String, WebPage> store) - throws Exception { + throws Exception { testResultSize(store, true, true, false); } - + public static void testResultSizeWebPagesWithLimit(DataStore<String, WebPage> store) - throws Exception { + throws Exception { testResultSize(store, false, false, true); } - + public static void testResultSizeWebPagesStartKeyWithLimit(DataStore<String, WebPage> store) - throws Exception { + throws Exception { testResultSize(store, true, false, true); } - + public static void testResultSizeWebPagesEndKeyWithLimit(DataStore<String, WebPage> store) - throws Exception { + throws Exception { testResultSize(store, false, false, true); } - + public static void testResultSizeWebPagesKeyRangeWithLimit(DataStore<String, WebPage> store) - throws Exception { + throws Exception { testResultSize(store, true, true, true); } } http://git-wip-us.apache.org/repos/asf/gora/blob/fb4b3552/gora-hbase/src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java ---------------------------------------------------------------------- diff --git a/gora-hbase/src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java b/gora-hbase/src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java index b4440be..2ed7a09 100644 --- a/gora-hbase/src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java +++ b/gora-hbase/src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java @@ -251,18 +251,18 @@ public class TestHBaseStore extends DataStoreTestBase { @Override public void testResultSize() throws Exception { } - + @Test @Ignore("HBase does not support Result#size() without limit set") @Override public void testResultSizeStartKey() throws Exception { } - + @Ignore("HBase does not support Result#size() without limit set") @Override public void testResultSizeEndKey() throws Exception { } - + @Test @Ignore("HBase does not support Result#size() without limit set") @Override http://git-wip-us.apache.org/repos/asf/gora/blob/fb4b3552/gora-jcache/src/main/java/org/apache/gora/jcache/query/JCacheResult.java ---------------------------------------------------------------------- diff --git a/gora-jcache/src/main/java/org/apache/gora/jcache/query/JCacheResult.java b/gora-jcache/src/main/java/org/apache/gora/jcache/query/JCacheResult.java index 6048e12..913e380 100644 --- a/gora-jcache/src/main/java/org/apache/gora/jcache/query/JCacheResult.java +++ b/gora-jcache/src/main/java/org/apache/gora/jcache/query/JCacheResult.java @@ -85,7 +85,7 @@ public class JCacheResult<K, T extends PersistentBase> extends ResultBase<K, T> @Override public int size() { int totalSize = cacheKeySet.size(); - int intLimit = (int)this.limit; - return intLimit > 0 && totalSize>intLimit ? intLimit : totalSize; + int intLimit = (int) this.limit; + return intLimit > 0 && totalSize > intLimit ? intLimit : totalSize; } } http://git-wip-us.apache.org/repos/asf/gora/blob/fb4b3552/gora-orientdb/src/main/java/org/apache/gora/orientdb/query/OrientDBResult.java ---------------------------------------------------------------------- diff --git a/gora-orientdb/src/main/java/org/apache/gora/orientdb/query/OrientDBResult.java b/gora-orientdb/src/main/java/org/apache/gora/orientdb/query/OrientDBResult.java index 3d6a3e1..3ee0d6f 100644 --- a/gora-orientdb/src/main/java/org/apache/gora/orientdb/query/OrientDBResult.java +++ b/gora-orientdb/src/main/java/org/apache/gora/orientdb/query/OrientDBResult.java @@ -103,7 +103,7 @@ public class OrientDBResult<K, T extends PersistentBase> extends ResultBase<K, T @Override public int size() { int totalSize = size; - int intLimit = (int)this.limit; - return intLimit > 0 && totalSize>intLimit ? intLimit : totalSize; + int intLimit = (int) this.limit; + return intLimit > 0 && totalSize > intLimit ? intLimit : totalSize; } } http://git-wip-us.apache.org/repos/asf/gora/blob/fb4b3552/gora-solr/src/main/java/org/apache/gora/solr/query/SolrResult.java ---------------------------------------------------------------------- diff --git a/gora-solr/src/main/java/org/apache/gora/solr/query/SolrResult.java b/gora-solr/src/main/java/org/apache/gora/solr/query/SolrResult.java index 671b65e..4cb1501 100644 --- a/gora-solr/src/main/java/org/apache/gora/solr/query/SolrResult.java +++ b/gora-solr/src/main/java/org/apache/gora/solr/query/SolrResult.java @@ -127,7 +127,7 @@ public class SolrResult<K, T extends PersistentBase> extends ResultBase<K, T> { @Override public int size() { int totalSize = list.size(); - int intLimit = (int)this.limit; - return intLimit > 0 && totalSize>intLimit ? intLimit : totalSize; + int intLimit = (int) this.limit; + return intLimit > 0 && totalSize > intLimit ? intLimit : totalSize; } }
