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 <[email protected]> Authored: Thu Mar 22 00:06:56 2018 -0500 Committer: Carlos Muñoz <[email protected]> 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(); + } }
