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:24 UTC
[3/8] gora git commit: fix 2 space indents
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();
+ }
}