You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gora.apache.org by dj...@apache.org on 2018/05/17 06:47:22 UTC
[1/8] gora git commit: Add #size() to Result API: Aerospike, Cassandra,
CouchDB, DynamoDB, MongoDB, OrientDB, JCache, Solr, Mock, Mem.
Repository: gora
Updated Branches:
refs/heads/master dc70b14b5 -> fb4b3552a
Add #size() to Result API: Aerospike, Cassandra, CouchDB, DynamoDB, MongoDB, OrientDB, JCache, Solr, Mock, Mem.
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/76cc89cd
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/76cc89cd
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/76cc89cd
Branch: refs/heads/master
Commit: 76cc89cddd2cbda42518de8e304e92e3f341a744
Parents: e2d7341
Author: Carlos Muñoz <ca...@gmail.com>
Authored: Thu Mar 22 00:06:56 2018 -0500
Committer: Carlos Muñoz <ca...@gmail.com>
Committed: Thu Mar 22 00:11:05 2018 -0500
----------------------------------------------------------------------
.../java/org/apache/gora/accumulo/query/AccumuloResult.java | 5 +++++
.../org/apache/gora/aerospike/query/AerospikeQueryResult.java | 5 +++++
.../org/apache/gora/cassandra/query/CassandraResultSet.java | 5 +++++
.../src/main/java/org/apache/gora/avro/query/AvroResult.java | 5 +++++
.../java/org/apache/gora/avro/query/DataFileAvroResult.java | 5 +++++
.../src/main/java/org/apache/gora/memory/store/MemStore.java | 5 +++++
gora-core/src/main/java/org/apache/gora/query/Result.java | 7 ++++++-
.../test/java/org/apache/gora/mock/store/MockDataStore.java | 5 +++++
.../java/org/apache/gora/couchdb/query/CouchDBResult.java | 5 +++++
.../java/org/apache/gora/dynamodb/query/DynamoDBResult.java | 5 +++++
.../main/java/org/apache/gora/hbase/query/HBaseGetResult.java | 5 +++++
.../java/org/apache/gora/hbase/query/HBaseScannerResult.java | 5 +++++
.../org/apache/gora/infinispan/query/InfinispanResult.java | 1 +
.../main/java/org/apache/gora/jcache/query/JCacheResult.java | 5 +++++
.../java/org/apache/gora/mongodb/query/MongoDBResult.java | 5 +++++
.../java/org/apache/gora/orientdb/query/OrientDBResult.java | 5 +++++
.../src/main/java/org/apache/gora/solr/query/SolrResult.java | 5 +++++
17 files changed, 82 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
----------------------------------------------------------------------
diff --git a/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java b/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
index 08ebeca..072c004 100644
--- a/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
+++ b/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
@@ -88,5 +88,10 @@ public class AccumuloResult<K,T extends PersistentBase> extends ResultBase<K,T>
return true;
}
+
+ @Override
+ public int size() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/gora-aerospike/src/main/java/org/apache/gora/aerospike/query/AerospikeQueryResult.java
----------------------------------------------------------------------
diff --git a/gora-aerospike/src/main/java/org/apache/gora/aerospike/query/AerospikeQueryResult.java b/gora-aerospike/src/main/java/org/apache/gora/aerospike/query/AerospikeQueryResult.java
index c843082..bc5288f 100644
--- a/gora-aerospike/src/main/java/org/apache/gora/aerospike/query/AerospikeQueryResult.java
+++ b/gora-aerospike/src/main/java/org/apache/gora/aerospike/query/AerospikeQueryResult.java
@@ -85,4 +85,9 @@ public class AerospikeQueryResult<K, T extends Persistent> extends ResultBase<K,
.createPersistentInstance(resultRecords.get((int) this.offset).getRecord(), fields);
return true;
}
+
+ @Override
+ public int size() {
+ return resultRecords.size();
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java
----------------------------------------------------------------------
diff --git a/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java
index f34cc66..c1a5f8a 100644
--- a/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java
+++ b/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java
@@ -107,4 +107,9 @@ public class CassandraResultSet<K, T extends Persistent> extends ResultBase<K, T
protected boolean isLimitReached() {
return (limit > 0 && offset >= limit) || (offset >= size);
}
+
+ @Override
+ public int size() {
+ return size;
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java
----------------------------------------------------------------------
diff --git a/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java b/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java
index 2e86fd4..75d470f 100644
--- a/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java
+++ b/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java
@@ -67,4 +67,9 @@ public class AvroResult<K, T extends PersistentBase> extends ResultBase<K, T> {
return persistent != null;
}
+
+ @Override
+ public int size() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
----------------------------------------------------------------------
diff --git a/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java b/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
index 2530235..45029a2 100644
--- a/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
+++ b/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
@@ -81,5 +81,10 @@ public class DataFileAvroResult<K, T extends PersistentBase> extends ResultBase<
persistent = reader.next(persistent);
return true;
}
+
+ @Override
+ public int size() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/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 06596d5..76ac936 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
@@ -89,6 +89,11 @@ public class MemStore<K, T extends PersistentBase> extends DataStoreBase<K, T> {
return true;
}
+
+ @Override
+ public int size() {
+ return map.navigableKeySet().size();
+ }
}
// This map behaves like DB, has to be static and concurrent collection
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/gora-core/src/main/java/org/apache/gora/query/Result.java
----------------------------------------------------------------------
diff --git a/gora-core/src/main/java/org/apache/gora/query/Result.java b/gora-core/src/main/java/org/apache/gora/query/Result.java
index 3a7bffe..d1ead9a 100644
--- a/gora-core/src/main/java/org/apache/gora/query/Result.java
+++ b/gora-core/src/main/java/org/apache/gora/query/Result.java
@@ -95,5 +95,10 @@ public interface Result<K, T extends Persistent> {
float getProgress() throws IOException, InterruptedException;
void close() throws IOException;
-
+ /**
+ * Returns the number items the result has.
+ *
+ * @return the number of items
+ */
+ int size();
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/gora-core/src/test/java/org/apache/gora/mock/store/MockDataStore.java
----------------------------------------------------------------------
diff --git a/gora-core/src/test/java/org/apache/gora/mock/store/MockDataStore.java b/gora-core/src/test/java/org/apache/gora/mock/store/MockDataStore.java
index afb8104..8be4e66 100644
--- a/gora-core/src/test/java/org/apache/gora/mock/store/MockDataStore.java
+++ b/gora-core/src/test/java/org/apache/gora/mock/store/MockDataStore.java
@@ -166,5 +166,10 @@ public class MockDataStore extends DataStoreBase<String, MockPersistent> {
public boolean nextInner() throws IOException {
return false ;
}
+
+ @Override
+ public int size() {
+ return 0;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/gora-couchdb/src/main/java/org/apache/gora/couchdb/query/CouchDBResult.java
----------------------------------------------------------------------
diff --git a/gora-couchdb/src/main/java/org/apache/gora/couchdb/query/CouchDBResult.java b/gora-couchdb/src/main/java/org/apache/gora/couchdb/query/CouchDBResult.java
index 7d43682..63f74dc 100644
--- a/gora-couchdb/src/main/java/org/apache/gora/couchdb/query/CouchDBResult.java
+++ b/gora-couchdb/src/main/java/org/apache/gora/couchdb/query/CouchDBResult.java
@@ -87,4 +87,9 @@ public class CouchDBResult<K, T extends Persistent> extends ResultBase<K, T> {
public List<Map> getResultData() {
return result;
}
+
+ @Override
+ public int size() {
+ return result.size();
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java
----------------------------------------------------------------------
diff --git a/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java b/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java
index 9aab6a3..0013f4f 100644
--- a/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java
+++ b/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java
@@ -84,4 +84,9 @@ public class DynamoDBResult<K, T extends Persistent> extends ResultWSBase<K, T>
public void close() throws IOException {
}
+ @Override
+ public int size() {
+ return dynamoDBResultSet.size();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java
----------------------------------------------------------------------
diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java b/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java
index ddd13aa..48923e7 100644
--- a/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java
+++ b/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java
@@ -61,4 +61,9 @@ public class HBaseGetResult<K, T extends PersistentBase> extends HBaseResult<K,T
@Override
public void close() throws IOException {
}
+
+ @Override
+ public int size() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
----------------------------------------------------------------------
diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java b/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
index 8e48212..b299eaf 100644
--- a/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
+++ b/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
@@ -66,5 +66,10 @@ public class HBaseScannerResult<K, T extends PersistentBase> extends HBaseResult
//TODO: if limit is set, we know how far we have gone
return 0;
}
+
+ @Override
+ public int size() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/gora-infinispan/src/main/java/org/apache/gora/infinispan/query/InfinispanResult.java
----------------------------------------------------------------------
diff --git a/gora-infinispan/src/main/java/org/apache/gora/infinispan/query/InfinispanResult.java b/gora-infinispan/src/main/java/org/apache/gora/infinispan/query/InfinispanResult.java
index 3429a27..10fb17c 100644
--- a/gora-infinispan/src/main/java/org/apache/gora/infinispan/query/InfinispanResult.java
+++ b/gora-infinispan/src/main/java/org/apache/gora/infinispan/query/InfinispanResult.java
@@ -68,6 +68,7 @@ public class InfinispanResult<K, T extends PersistentBase> extends ResultBase<K,
return true;
}
+ @Override
public int size() {
return list.size();
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/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 dfe8083..ea730e9 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
@@ -82,4 +82,9 @@ public class JCacheResult<K, T extends PersistentBase> extends ResultBase<K, T>
return true;
}
+ @Override
+ public int size() {
+ return cacheKeySet.size();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/gora-mongodb/src/main/java/org/apache/gora/mongodb/query/MongoDBResult.java
----------------------------------------------------------------------
diff --git a/gora-mongodb/src/main/java/org/apache/gora/mongodb/query/MongoDBResult.java b/gora-mongodb/src/main/java/org/apache/gora/mongodb/query/MongoDBResult.java
index f20da31..c0f88a7 100644
--- a/gora-mongodb/src/main/java/org/apache/gora/mongodb/query/MongoDBResult.java
+++ b/gora-mongodb/src/main/java/org/apache/gora/mongodb/query/MongoDBResult.java
@@ -90,4 +90,9 @@ public class MongoDBResult<K, T extends PersistentBase> extends
this.cursor = cursor;
this.size = cursor.size();
}
+
+ @Override
+ public int size() {
+ return size;
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/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 23df5fa..4a8d9d9 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
@@ -100,4 +100,9 @@ public class OrientDBResult<K, T extends PersistentBase> extends ResultBase<K, T
}
}
+ @Override
+ public int size() {
+ return size;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/gora/blob/76cc89cd/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 1f2cfe1..d69ad92 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
@@ -124,4 +124,9 @@ public class SolrResult<K, T extends PersistentBase> extends ResultBase<K, T> {
return 0;
}
}
+
+ @Override
+ public int size() {
+ return list.size();
+ }
}
[8/8] gora git commit: -Fix formatting code
Posted by dj...@apache.org.
-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 <ca...@gmail.com>
Authored: Sun May 6 14:30:26 2018 -0500
Committer: dev <ca...@gmail.com>
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;
}
}
[2/8] gora git commit: Add #size() to Result API: Accumulo, Avro,
HBase Set batch size using query.limit
Posted by dj...@apache.org.
Add #size() to Result API: Accumulo, Avro, HBase
Set batch size using query.limit
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/0ee48ab3
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/0ee48ab3
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/0ee48ab3
Branch: refs/heads/master
Commit: 0ee48ab3d96445a280852a1fd04206efb883baa9
Parents: 76cc89c
Author: Carlos Muñoz <ca...@gmail.com>
Authored: Thu Mar 22 00:59:02 2018 -0500
Committer: Carlos Muñoz <ca...@gmail.com>
Committed: Thu Mar 22 00:59:02 2018 -0500
----------------------------------------------------------------------
.../org/apache/gora/accumulo/query/AccumuloResult.java | 13 +++++++++----
.../java/org/apache/gora/avro/query/AvroResult.java | 9 ++++++---
.../org/apache/gora/avro/query/DataFileAvroResult.java | 2 +-
.../org/apache/gora/hbase/query/HBaseGetResult.java | 2 +-
.../apache/gora/hbase/query/HBaseScannerResult.java | 9 ++++++---
.../java/org/apache/gora/hbase/store/HBaseStore.java | 2 +-
6 files changed, 24 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/0ee48ab3/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
----------------------------------------------------------------------
diff --git a/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java b/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
index 072c004..23fdc1c 100644
--- a/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
+++ b/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
@@ -53,7 +53,9 @@ public class AccumuloResult<K,T extends PersistentBase> extends ResultBase<K,T>
public AccumuloResult(DataStore<K,T> dataStore, Query<K,T> query, Scanner scanner) {
super(dataStore, query);
- // TODO set batch size based on limit, and construct iterator later
+ if (this.limit>-1){
+ scanner.setBatchSize((int)this.limit);
+ }
iterator = new RowIterator(scanner.iterator());
}
@@ -62,8 +64,11 @@ public class AccumuloResult<K,T extends PersistentBase> extends ResultBase<K,T>
*/
@Override
public float getProgress() throws IOException {
- // TODO Auto-generated method stub
- return 0;
+ if (this.limit!=-1){
+ return (float)this.offset/(float)this.limit;
+ }else{
+ return 0;
+ }
}
@Override
@@ -91,7 +96,7 @@ public class AccumuloResult<K,T extends PersistentBase> extends ResultBase<K,T>
@Override
public int size() {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ return (int)this.limit;
}
}
http://git-wip-us.apache.org/repos/asf/gora/blob/0ee48ab3/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java
----------------------------------------------------------------------
diff --git a/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java b/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java
index 75d470f..ab421de 100644
--- a/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java
+++ b/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java
@@ -48,8 +48,11 @@ public class AvroResult<K, T extends PersistentBase> extends ResultBase<K, T> {
@Override
public float getProgress() throws IOException {
- //TODO: FIXME
- return 0;
+ if (this.limit!=-1){
+ return (float)this.offset/(float)this.limit;
+ }else{
+ return 0;
+ }
}
@Override
@@ -70,6 +73,6 @@ public class AvroResult<K, T extends PersistentBase> extends ResultBase<K, T> {
@Override
public int size() {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ return (int)limit;
}
}
http://git-wip-us.apache.org/repos/asf/gora/blob/0ee48ab3/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
----------------------------------------------------------------------
diff --git a/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java b/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
index 45029a2..23dd879 100644
--- a/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
+++ b/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
@@ -84,7 +84,7 @@ public class DataFileAvroResult<K, T extends PersistentBase> extends ResultBase<
@Override
public int size() {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ return (int) (end - start);
}
}
http://git-wip-us.apache.org/repos/asf/gora/blob/0ee48ab3/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java
----------------------------------------------------------------------
diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java b/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java
index 48923e7..c6c75ca 100644
--- a/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java
+++ b/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java
@@ -64,6 +64,6 @@ public class HBaseGetResult<K, T extends PersistentBase> extends HBaseResult<K,T
@Override
public int size() {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ return result != null && !result.isEmpty() ? 1 : 0;
}
}
http://git-wip-us.apache.org/repos/asf/gora/blob/0ee48ab3/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
----------------------------------------------------------------------
diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java b/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
index b299eaf..7f1dd90 100644
--- a/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
+++ b/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
@@ -63,13 +63,16 @@ public class HBaseScannerResult<K, T extends PersistentBase> extends HBaseResult
@Override
public float getProgress() throws IOException {
- //TODO: if limit is set, we know how far we have gone
- return 0;
+ if (this.limit!=-1){
+ return (float)this.offset/(float)this.limit;
+ }else{
+ return 0;
+ }
}
@Override
public int size() {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ return (int)this.limit;
}
}
http://git-wip-us.apache.org/repos/asf/gora/blob/0ee48ab3/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
----------------------------------------------------------------------
diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
index 349c6d9..75e9180 100644
--- a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
+++ b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
@@ -498,7 +498,7 @@ implements Configurable {
public ResultScanner createScanner(Query<K, T> query) throws IOException {
final Scan scan = new Scan();
-
+ scan.setBatch((int)query.getLimit());
scan.setCaching(this.getScannerCaching()) ;
if (query.getStartKey() != null) {
[3/8] gora git commit: fix 2 space indents
Posted by dj...@apache.org.
fix 2 space indents
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/eb493741
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/eb493741
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/eb493741
Branch: refs/heads/master
Commit: eb4937418e700af5f8518f66e3d29bfc4d110798
Parents: 0ee48ab
Author: Carlos Muñoz <ca...@gmail.com>
Authored: Sat Mar 24 14:53:46 2018 -0500
Committer: Carlos Muñoz <ca...@gmail.com>
Committed: Sat Mar 24 14:53:46 2018 -0500
----------------------------------------------------------------------
.../gora/accumulo/query/AccumuloResult.java | 22 ++++++++++----------
.../aerospike/query/AerospikeQueryResult.java | 8 +++----
.../cassandra/query/CassandraResultSet.java | 8 +++----
.../org/apache/gora/avro/query/AvroResult.java | 18 ++++++++--------
.../gora/avro/query/DataFileAvroResult.java | 8 +++----
.../org/apache/gora/memory/store/MemStore.java | 8 +++----
.../apache/gora/mock/store/MockDataStore.java | 8 +++----
.../gora/couchdb/query/CouchDBResult.java | 8 +++----
.../gora/dynamodb/query/DynamoDBResult.java | 8 +++----
.../apache/gora/hbase/query/HBaseGetResult.java | 8 +++----
.../gora/hbase/query/HBaseScannerResult.java | 18 ++++++++--------
.../org/apache/gora/hbase/store/HBaseStore.java | 2 +-
.../apache/gora/jcache/query/JCacheResult.java | 8 +++----
.../gora/mongodb/query/MongoDBResult.java | 8 +++----
.../gora/orientdb/query/OrientDBResult.java | 8 +++----
.../org/apache/gora/solr/query/SolrResult.java | 8 +++----
16 files changed, 78 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
----------------------------------------------------------------------
diff --git a/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java b/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
index 23fdc1c..7c208f8 100644
--- a/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
+++ b/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
@@ -53,8 +53,8 @@ public class AccumuloResult<K,T extends PersistentBase> extends ResultBase<K,T>
public AccumuloResult(DataStore<K,T> dataStore, Query<K,T> query, Scanner scanner) {
super(dataStore, query);
- if (this.limit>-1){
- scanner.setBatchSize((int)this.limit);
+ if (this.limit > -1) {
+ scanner.setBatchSize((int) this.limit);
}
iterator = new RowIterator(scanner.iterator());
}
@@ -64,11 +64,11 @@ public class AccumuloResult<K,T extends PersistentBase> extends ResultBase<K,T>
*/
@Override
public float getProgress() throws IOException {
- if (this.limit!=-1){
- return (float)this.offset/(float)this.limit;
- }else{
- return 0;
- }
+ if (this.limit != -1) {
+ return (float) this.offset / (float) this.limit;
+ } else {
+ return 0;
+ }
}
@Override
@@ -94,9 +94,9 @@ public class AccumuloResult<K,T extends PersistentBase> extends ResultBase<K,T>
return true;
}
- @Override
- public int size() {
- return (int)this.limit;
- }
+ @Override
+ public int size() {
+ return (int) this.limit;
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/gora-aerospike/src/main/java/org/apache/gora/aerospike/query/AerospikeQueryResult.java
----------------------------------------------------------------------
diff --git a/gora-aerospike/src/main/java/org/apache/gora/aerospike/query/AerospikeQueryResult.java b/gora-aerospike/src/main/java/org/apache/gora/aerospike/query/AerospikeQueryResult.java
index bc5288f..beef25d 100644
--- a/gora-aerospike/src/main/java/org/apache/gora/aerospike/query/AerospikeQueryResult.java
+++ b/gora-aerospike/src/main/java/org/apache/gora/aerospike/query/AerospikeQueryResult.java
@@ -86,8 +86,8 @@ public class AerospikeQueryResult<K, T extends Persistent> extends ResultBase<K,
return true;
}
- @Override
- public int size() {
- return resultRecords.size();
- }
+ @Override
+ public int size() {
+ return resultRecords.size();
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java
----------------------------------------------------------------------
diff --git a/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java
index c1a5f8a..215d7c7 100644
--- a/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java
+++ b/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java
@@ -108,8 +108,8 @@ public class CassandraResultSet<K, T extends Persistent> extends ResultBase<K, T
return (limit > 0 && offset >= limit) || (offset >= size);
}
- @Override
- public int size() {
- return size;
- }
+ @Override
+ public int size() {
+ return size;
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java
----------------------------------------------------------------------
diff --git a/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java b/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java
index ab421de..1f34b91 100644
--- a/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java
+++ b/gora-core/src/main/java/org/apache/gora/avro/query/AvroResult.java
@@ -48,11 +48,11 @@ public class AvroResult<K, T extends PersistentBase> extends ResultBase<K, T> {
@Override
public float getProgress() throws IOException {
- if (this.limit!=-1){
- return (float)this.offset/(float)this.limit;
- }else{
- return 0;
- }
+ if (this.limit != -1) {
+ return (float) this.offset / (float) this.limit;
+ } else {
+ return 0;
+ }
}
@Override
@@ -71,8 +71,8 @@ public class AvroResult<K, T extends PersistentBase> extends ResultBase<K, T> {
return persistent != null;
}
- @Override
- public int size() {
- return (int)limit;
- }
+ @Override
+ public int size() {
+ return (int) limit;
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
----------------------------------------------------------------------
diff --git a/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java b/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
index 23dd879..089f692 100644
--- a/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
+++ b/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
@@ -82,9 +82,9 @@ public class DataFileAvroResult<K, T extends PersistentBase> extends ResultBase<
return true;
}
- @Override
- public int size() {
- return (int) (end - start);
- }
+ @Override
+ public int size() {
+ return (int) (end - start);
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/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 76ac936..e1fe7f2 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
@@ -90,10 +90,10 @@ public class MemStore<K, T extends PersistentBase> extends DataStoreBase<K, T> {
return true;
}
- @Override
- public int size() {
- return map.navigableKeySet().size();
- }
+ @Override
+ public int size() {
+ return map.navigableKeySet().size();
+ }
}
// This map behaves like DB, has to be static and concurrent collection
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/gora-core/src/test/java/org/apache/gora/mock/store/MockDataStore.java
----------------------------------------------------------------------
diff --git a/gora-core/src/test/java/org/apache/gora/mock/store/MockDataStore.java b/gora-core/src/test/java/org/apache/gora/mock/store/MockDataStore.java
index 8be4e66..98524d3 100644
--- a/gora-core/src/test/java/org/apache/gora/mock/store/MockDataStore.java
+++ b/gora-core/src/test/java/org/apache/gora/mock/store/MockDataStore.java
@@ -167,9 +167,9 @@ public class MockDataStore extends DataStoreBase<String, MockPersistent> {
return false ;
}
- @Override
- public int size() {
- return 0;
- }
+ @Override
+ public int size() {
+ return 0;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/gora-couchdb/src/main/java/org/apache/gora/couchdb/query/CouchDBResult.java
----------------------------------------------------------------------
diff --git a/gora-couchdb/src/main/java/org/apache/gora/couchdb/query/CouchDBResult.java b/gora-couchdb/src/main/java/org/apache/gora/couchdb/query/CouchDBResult.java
index 63f74dc..28a628c 100644
--- a/gora-couchdb/src/main/java/org/apache/gora/couchdb/query/CouchDBResult.java
+++ b/gora-couchdb/src/main/java/org/apache/gora/couchdb/query/CouchDBResult.java
@@ -88,8 +88,8 @@ public class CouchDBResult<K, T extends Persistent> extends ResultBase<K, T> {
return result;
}
- @Override
- public int size() {
- return result.size();
- }
+ @Override
+ public int size() {
+ return result.size();
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java
----------------------------------------------------------------------
diff --git a/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java b/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java
index 0013f4f..c191880 100644
--- a/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java
+++ b/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java
@@ -84,9 +84,9 @@ public class DynamoDBResult<K, T extends Persistent> extends ResultWSBase<K, T>
public void close() throws IOException {
}
- @Override
- public int size() {
- return dynamoDBResultSet.size();
- }
+ @Override
+ public int size() {
+ return dynamoDBResultSet.size();
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java
----------------------------------------------------------------------
diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java b/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java
index c6c75ca..3476434 100644
--- a/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java
+++ b/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseGetResult.java
@@ -62,8 +62,8 @@ public class HBaseGetResult<K, T extends PersistentBase> extends HBaseResult<K,T
public void close() throws IOException {
}
- @Override
- public int size() {
- return result != null && !result.isEmpty() ? 1 : 0;
- }
+ @Override
+ public int size() {
+ return result != null && !result.isEmpty() ? 1 : 0;
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
----------------------------------------------------------------------
diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java b/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
index 7f1dd90..ce4ea51 100644
--- a/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
+++ b/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
@@ -63,16 +63,16 @@ public class HBaseScannerResult<K, T extends PersistentBase> extends HBaseResult
@Override
public float getProgress() throws IOException {
- if (this.limit!=-1){
- return (float)this.offset/(float)this.limit;
- }else{
- return 0;
- }
+ if (this.limit != -1) {
+ return (float) this.offset / (float) this.limit;
+ } else {
+ return 0;
+ }
}
- @Override
- public int size() {
- return (int)this.limit;
- }
+ @Override
+ public int size() {
+ return (int) this.limit;
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
----------------------------------------------------------------------
diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
index 75e9180..51fdc9c 100644
--- a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
+++ b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
@@ -498,7 +498,7 @@ implements Configurable {
public ResultScanner createScanner(Query<K, T> query) throws IOException {
final Scan scan = new Scan();
- scan.setBatch((int)query.getLimit());
+ scan.setMaxResultSize(query.getLimit());
scan.setCaching(this.getScannerCaching()) ;
if (query.getStartKey() != null) {
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/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 ea730e9..0eba8f1 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
@@ -82,9 +82,9 @@ public class JCacheResult<K, T extends PersistentBase> extends ResultBase<K, T>
return true;
}
- @Override
- public int size() {
- return cacheKeySet.size();
- }
+ @Override
+ public int size() {
+ return cacheKeySet.size();
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/gora-mongodb/src/main/java/org/apache/gora/mongodb/query/MongoDBResult.java
----------------------------------------------------------------------
diff --git a/gora-mongodb/src/main/java/org/apache/gora/mongodb/query/MongoDBResult.java b/gora-mongodb/src/main/java/org/apache/gora/mongodb/query/MongoDBResult.java
index c0f88a7..3965333 100644
--- a/gora-mongodb/src/main/java/org/apache/gora/mongodb/query/MongoDBResult.java
+++ b/gora-mongodb/src/main/java/org/apache/gora/mongodb/query/MongoDBResult.java
@@ -91,8 +91,8 @@ public class MongoDBResult<K, T extends PersistentBase> extends
this.size = cursor.size();
}
- @Override
- public int size() {
- return size;
- }
+ @Override
+ public int size() {
+ return size;
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/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 4a8d9d9..c0bf7e5 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
@@ -100,9 +100,9 @@ public class OrientDBResult<K, T extends PersistentBase> extends ResultBase<K, T
}
}
- @Override
- public int size() {
- return size;
- }
+ @Override
+ public int size() {
+ return size;
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/eb493741/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 d69ad92..e4f3c69 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
@@ -125,8 +125,8 @@ public class SolrResult<K, T extends PersistentBase> extends ResultBase<K, T> {
}
}
- @Override
- public int size() {
- return list.size();
- }
+ @Override
+ public int size() {
+ return list.size();
+ }
}
[7/8] gora git commit: Add ending line
Posted by dj...@apache.org.
Add ending line
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/791e14cb
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/791e14cb
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/791e14cb
Branch: refs/heads/master
Commit: 791e14cb9c8ac13fe4506470f2b8921c3cc542da
Parents: 3dada3a
Author: carlosrmng <37...@users.noreply.github.com>
Authored: Wed May 2 22:44:02 2018 -0500
Committer: GitHub <no...@github.com>
Committed: Wed May 2 22:44:02 2018 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/gora/jcache/query/JCacheResult.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/791e14cb/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 ee26c74..6048e12 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
@@ -88,4 +88,4 @@ public class JCacheResult<K, T extends PersistentBase> extends ResultBase<K, T>
int intLimit = (int)this.limit;
return intLimit > 0 && totalSize>intLimit ? intLimit : totalSize;
}
-}
\ No newline at end of file
+}
[6/8] gora git commit: Fix formatting code
Posted by dj...@apache.org.
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/3dada3ae
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/3dada3ae
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/3dada3ae
Branch: refs/heads/master
Commit: 3dada3ae68d58491197deb8a3c1cc3f5504a48f8
Parents: 5c3acdc
Author: Carlos Rodrigo Muñoz <ca...@gmail.com>
Authored: Wed May 2 14:48:22 2018 -0500
Committer: Carlos Rodrigo Muñoz <ca...@gmail.com>
Committed: Wed May 2 14:48:22 2018 -0500
----------------------------------------------------------------------
gora-core/src/main/java/org/apache/gora/memory/store/MemStore.java | 2 +-
.../src/main/java/org/apache/gora/jcache/query/JCacheResult.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/3dada3ae/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 5d204eb..ce0d336 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
@@ -94,7 +94,7 @@ public class MemStore<K, T extends PersistentBase> extends DataStoreBase<K, T> {
public int size() {
int totalSize = map.navigableKeySet().size();
int intLimit = (int)this.limit;
- return intLimit > 0 && totalSize>intLimit ? intLimit : totalSize;
+ return intLimit > 0 && totalSize > intLimit ? intLimit : totalSize;
}
}
http://git-wip-us.apache.org/repos/asf/gora/blob/3dada3ae/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..ee26c74 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
@@ -88,4 +88,4 @@ public class JCacheResult<K, T extends PersistentBase> extends ResultBase<K, T>
int intLimit = (int)this.limit;
return intLimit > 0 && totalSize>intLimit ? intLimit : totalSize;
}
-}
+}
\ No newline at end of file
[5/8] gora git commit: Merge https://github.com/apache/gora into
GORA-444
Posted by dj...@apache.org.
Merge https://github.com/apache/gora into GORA-444
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/5c3acdcb
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/5c3acdcb
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/5c3acdcb
Branch: refs/heads/master
Commit: 5c3acdcbe14ee0d5174ae0a22c4222676342d82e
Parents: 8d99c05 dc70b14
Author: dev <ca...@gmail.com>
Authored: Tue May 1 00:54:48 2018 -0500
Committer: dev <ca...@gmail.com>
Committed: Tue May 1 00:54:48 2018 -0500
----------------------------------------------------------------------
.../gora/accumulo/store/AccumuloStore.java | 55 ++++++----------
.../gora/aerospike/store/AerospikeStore.java | 6 --
.../cassandra/serializers/AvroSerializer.java | 5 --
.../serializers/CassandraSerializer.java | 5 --
.../cassandra/serializers/NativeSerializer.java | 5 --
.../gora/cassandra/store/CassandraStore.java | 5 --
.../org/apache/gora/avro/store/AvroStore.java | 2 -
.../gora/avro/store/DataFileAvroStore.java | 2 -
.../org/apache/gora/memory/store/MemStore.java | 1 -
.../gora/persistency/impl/BeanFactoryImpl.java | 3 -
.../apache/gora/store/impl/DataStoreBase.java | 2 -
.../store/impl/FileBackedDataStoreBase.java | 2 -
.../store/ws/impl/WSBackedDataStoreBase.java | 1 -
.../apache/gora/couchdb/store/CouchDBStore.java | 15 +----
.../dynamodb/store/DynamoDBNativeStore.java | 6 --
.../gora/dynamodb/store/DynamoDBStore.java | 3 -
.../org/apache/gora/hbase/store/HBaseStore.java | 14 +---
.../gora/infinispan/store/InfinispanClient.java | 2 -
.../gora/infinispan/store/InfinispanStore.java | 8 ---
.../apache/gora/jcache/store/JCacheStore.java | 68 +++++++++-----------
.../apache/gora/mongodb/store/MongoStore.java | 9 ---
.../gora/orientdb/store/OrientDBStore.java | 11 ----
.../org/apache/gora/solr/query/SolrResult.java | 1 -
.../org/apache/gora/solr/store/SolrStore.java | 16 +----
pom.xml | 9 +++
25 files changed, 63 insertions(+), 193 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/5c3acdcb/gora-core/src/main/java/org/apache/gora/memory/store/MemStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/5c3acdcb/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/5c3acdcb/gora-solr/src/main/java/org/apache/gora/solr/query/SolrResult.java
----------------------------------------------------------------------
[4/8] gora git commit: -Remove empty lines. -Implement tests within
DataStoreTestBase and DataStoreTestUtil. -Fix size() implementation for
MemStore, Accumulo, Solr, JCache and OrientDB.
Posted by dj...@apache.org.
-Remove empty lines.
-Implement tests within DataStoreTestBase and DataStoreTestUtil.
-Fix size() implementation for MemStore, Accumulo, Solr, JCache and OrientDB.
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/8d99c055
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/8d99c055
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/8d99c055
Branch: refs/heads/master
Commit: 8d99c0554f4dcd620489eefd7963bce4d0a89dab
Parents: eb49374
Author: dev <ca...@gmail.com>
Authored: Tue May 1 00:49:33 2018 -0500
Committer: dev <ca...@gmail.com>
Committed: Tue May 1 00:49:33 2018 -0500
----------------------------------------------------------------------
.../gora/accumulo/query/AccumuloResult.java | 3 +-
.../gora/accumulo/store/AccumuloStoreTest.java | 27 +++++++
.../gora/avro/query/DataFileAvroResult.java | 1 -
.../org/apache/gora/memory/store/MemStore.java | 4 +-
.../main/java/org/apache/gora/query/Result.java | 2 +-
.../apache/gora/store/DataStoreTestBase.java | 48 +++++++++++
.../apache/gora/store/DataStoreTestUtil.java | 85 +++++++++++++++++++-
.../gora/dynamodb/query/DynamoDBResult.java | 1 -
.../gora/hbase/query/HBaseScannerResult.java | 1 -
.../apache/gora/hbase/store/TestHBaseStore.java | 24 +++++-
.../apache/gora/jcache/query/JCacheResult.java | 5 +-
.../gora/mongodb/store/TestMongoStore.java | 14 +++-
.../gora/orientdb/query/OrientDBResult.java | 5 +-
.../org/apache/gora/solr/query/SolrResult.java | 4 +-
14 files changed, 209 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/8d99c055/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
----------------------------------------------------------------------
diff --git a/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java b/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
index 7c208f8..217a0c3 100644
--- a/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
+++ b/gora-accumulo/src/main/java/org/apache/gora/accumulo/query/AccumuloResult.java
@@ -53,7 +53,7 @@ public class AccumuloResult<K,T extends PersistentBase> extends ResultBase<K,T>
public AccumuloResult(DataStore<K,T> dataStore, Query<K,T> query, Scanner scanner) {
super(dataStore, query);
- if (this.limit > -1) {
+ if (this.limit > 0) {
scanner.setBatchSize((int) this.limit);
}
iterator = new RowIterator(scanner.iterator());
@@ -98,5 +98,4 @@ public class AccumuloResult<K,T extends PersistentBase> extends ResultBase<K,T>
public int size() {
return (int) this.limit;
}
-
}
http://git-wip-us.apache.org/repos/asf/gora/blob/8d99c055/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 f8b7526..54f5519 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
@@ -24,9 +24,13 @@ import org.apache.gora.examples.generated.WebPage;
import org.apache.gora.store.DataStore;
import org.apache.gora.store.DataStoreFactory;
import org.apache.gora.store.DataStoreTestBase;
+import static org.apache.gora.store.DataStoreTestBase.log;
+import org.apache.gora.store.DataStoreTestUtil;
+import static org.apache.gora.store.DataStoreTestUtil.testResultSize;
import org.apache.hadoop.conf.Configuration;
import org.junit.Before;
import org.junit.Ignore;
+import org.junit.Test;
/**
* Tests extending {@link org.apache.gora.store.DataStoreTestBase}
@@ -57,4 +61,27 @@ public class AccumuloStoreTest extends DataStoreTestBase {
@Override
public void testDeleteByQueryFields() throws IOException {
}
+
+ @Test
+ @Ignore("Accumulo does not support Result#size() without limit set")
+ @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
+ public void testResultSizeKeyRange() throws Exception {
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/8d99c055/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
----------------------------------------------------------------------
diff --git a/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java b/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
index 089f692..0adeb90 100644
--- a/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
+++ b/gora-core/src/main/java/org/apache/gora/avro/query/DataFileAvroResult.java
@@ -86,5 +86,4 @@ public class DataFileAvroResult<K, T extends PersistentBase> extends ResultBase<
public int size() {
return (int) (end - start);
}
-
}
http://git-wip-us.apache.org/repos/asf/gora/blob/8d99c055/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 e1fe7f2..6f1b3e2 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
@@ -92,7 +92,9 @@ public class MemStore<K, T extends PersistentBase> extends DataStoreBase<K, T> {
@Override
public int size() {
- return map.navigableKeySet().size();
+ int totalSize = map.navigableKeySet().size();
+ int intLimit = (int)this.limit;
+ return intLimit > 0 && totalSize>intLimit ? intLimit : totalSize;
}
}
http://git-wip-us.apache.org/repos/asf/gora/blob/8d99c055/gora-core/src/main/java/org/apache/gora/query/Result.java
----------------------------------------------------------------------
diff --git a/gora-core/src/main/java/org/apache/gora/query/Result.java b/gora-core/src/main/java/org/apache/gora/query/Result.java
index d1ead9a..6854d89 100644
--- a/gora-core/src/main/java/org/apache/gora/query/Result.java
+++ b/gora-core/src/main/java/org/apache/gora/query/Result.java
@@ -96,7 +96,7 @@ public interface Result<K, T extends Persistent> {
void close() throws IOException;
/**
- * Returns the number items the result has.
+ * Returns the number of items the result has.
*
* @return the number of items
*/
http://git-wip-us.apache.org/repos/asf/gora/blob/8d99c055/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 2de6a41..625df39 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
@@ -358,4 +358,52 @@ public abstract class DataStoreTestBase {
log.info("test method: testGetPartitions");
DataStoreTestUtil.testGetPartitions(webPageStore);
}
+
+ @Test
+ public void testResultSize() throws Exception {
+ 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");
+ DataStoreTestUtil.testResultSizeWebPagesKeyRangeWithLimit(webPageStore);
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/8d99c055/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 b6e3d7c..5a38df4 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
@@ -814,7 +814,7 @@ public class DataStoreTestUtil {
if(setEndKeys)
query.setEndKey(sortedUrls.get(j));
Result<String, WebPage> result = query.execute();
-
+
int r=0;
while(result.next()) {
WebPage page = result.get();
@@ -1209,4 +1209,87 @@ public class DataStoreTestUtil {
return fieldNames;
}
+ public static void testResultSize(DataStore<String, WebPage> store,
+ boolean setStartKeys, boolean setEndKeys, boolean setLimit)
+ throws Exception {
+ createWebPageData(store);
+
+ //create sorted set of urls
+ List<String> sortedUrls = new ArrayList<>();
+ Collections.addAll(sortedUrls, URLS);
+ Collections.sort(sortedUrls);
+
+ //try all ranges
+ for(int i=0; i<sortedUrls.size(); i++) {
+ for(int j=i; j<sortedUrls.size(); j++) {
+ Query<String, WebPage> query = store.newQuery();
+ if(setStartKeys)
+ query.setStartKey(sortedUrls.get(i));
+ if(setEndKeys)
+ query.setEndKey(sortedUrls.get(j));
+ 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){
+ query.setLimit(limit);
+ } else {
+ continue;
+ }
+ }
+ Result<String, WebPage> result = query.execute();
+ int size = result.size();
+ int r=0;
+ while(result.next()) {
+ r++;
+ }
+ assertEquals(r, size);
+ if(!setEndKeys)
+ break;
+ }
+ if(!setStartKeys)
+ break;
+ }
+ }
+
+ public static void testResultSizeWebPages(DataStore<String, WebPage> store)
+ throws Exception {
+ testResultSize(store, false, false, false);
+ }
+
+ public static void testResultSizeWebPagesStartKey(DataStore<String, WebPage> store)
+ throws Exception {
+ testResultSize(store, true, false, false);
+ }
+
+ public static void testResultSizeWebPagesEndKey(DataStore<String, WebPage> store)
+ throws Exception {
+ testResultSize(store, false, false, false);
+ }
+
+ public static void testResultSizeWebPagesKeyRange(DataStore<String, WebPage> store)
+ throws Exception {
+ testResultSize(store, true, true, false);
+ }
+
+ public static void testResultSizeWebPagesWithLimit(DataStore<String, WebPage> store)
+ throws Exception {
+ testResultSize(store, false, false, true);
+ }
+
+ public static void testResultSizeWebPagesStartKeyWithLimit(DataStore<String, WebPage> store)
+ throws Exception {
+ testResultSize(store, true, false, true);
+ }
+
+ public static void testResultSizeWebPagesEndKeyWithLimit(DataStore<String, WebPage> store)
+ throws Exception {
+ testResultSize(store, false, false, true);
+ }
+
+ public static void testResultSizeWebPagesKeyRangeWithLimit(DataStore<String, WebPage> store)
+ throws Exception {
+ testResultSize(store, true, true, true);
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/8d99c055/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java
----------------------------------------------------------------------
diff --git a/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java b/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java
index c191880..61810e4 100644
--- a/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java
+++ b/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/query/DynamoDBResult.java
@@ -88,5 +88,4 @@ public class DynamoDBResult<K, T extends Persistent> extends ResultWSBase<K, T>
public int size() {
return dynamoDBResultSet.size();
}
-
}
http://git-wip-us.apache.org/repos/asf/gora/blob/8d99c055/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
----------------------------------------------------------------------
diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java b/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
index ce4ea51..72a64fa 100644
--- a/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
+++ b/gora-hbase/src/main/java/org/apache/gora/hbase/query/HBaseScannerResult.java
@@ -74,5 +74,4 @@ public class HBaseScannerResult<K, T extends PersistentBase> extends HBaseResult
public int size() {
return (int) this.limit;
}
-
}
http://git-wip-us.apache.org/repos/asf/gora/blob/8d99c055/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 c79588a..b4440be 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
@@ -245,5 +245,27 @@ public class TestHBaseStore extends DataStoreTestBase {
exceptionalConf.set("gora.hbase.mapping.file","gora-hbase-mapping-mismatch.xml");
DataStoreFactory.createDataStore(HBaseStore.class, String.class, WebPage.class, exceptionalConf);
}
-
+
+ @Test
+ @Ignore("HBase does not support Result#size() without limit set")
+ @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
+ public void testResultSizeKeyRange() throws Exception {
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/8d99c055/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 0eba8f1..6048e12 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
@@ -84,7 +84,8 @@ public class JCacheResult<K, T extends PersistentBase> extends ResultBase<K, T>
@Override
public int size() {
- return cacheKeySet.size();
+ int totalSize = cacheKeySet.size();
+ int intLimit = (int)this.limit;
+ return intLimit > 0 && totalSize>intLimit ? intLimit : totalSize;
}
-
}
http://git-wip-us.apache.org/repos/asf/gora/blob/8d99c055/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore.java
----------------------------------------------------------------------
diff --git a/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore.java b/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore.java
index 9deb906..824cc9a 100644
--- a/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore.java
+++ b/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore.java
@@ -65,7 +65,19 @@ public abstract class TestMongoStore extends DataStoreTestBase {
public void testQueryKeyRange() throws Exception {
// Skip until GORA-66 is fixed: need better semantic for end/start keys
}
-
+
+ @Ignore("Skip until GORA-66 is fixed: need better semantic for end/start keys")
+ @Override
+ public void testResultSizeKeyRange() throws Exception {
+ // Skip until GORA-66 is fixed: need better semantic for end/start keys
+ }
+
+ @Ignore("Skip until GORA-66 is fixed: need better semantic for end/start keys")
+ @Override
+ public void testResultSizeKeyRangeWithLimit() throws Exception {
+ // Skip until GORA-66 is fixed: need better semantic for end/start keys
+ }
+
@Ignore("MongoStore doesn't support 3 types union field yet")
@Override
public void testGet3UnionField() throws Exception {
http://git-wip-us.apache.org/repos/asf/gora/blob/8d99c055/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 c0bf7e5..3d6a3e1 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
@@ -102,7 +102,8 @@ public class OrientDBResult<K, T extends PersistentBase> extends ResultBase<K, T
@Override
public int size() {
- return size;
+ int totalSize = size;
+ int intLimit = (int)this.limit;
+ return intLimit > 0 && totalSize>intLimit ? intLimit : totalSize;
}
-
}
http://git-wip-us.apache.org/repos/asf/gora/blob/8d99c055/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 e4f3c69..8524c87 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,6 +127,8 @@ public class SolrResult<K, T extends PersistentBase> extends ResultBase<K, T> {
@Override
public int size() {
- return list.size();
+ int totalSize = list.size();
+ int intLimit = (int)this.limit;
+ return intLimit > 0 && totalSize>intLimit ? intLimit : totalSize;
}
}