adding missing hadoop dependacy
Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/ff1fddfd Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/ff1fddfd Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/ff1fddfd Branch: refs/heads/master Commit: ff1fddfdb016046cea8933adc2a04d05088c45a5 Parents: 44bf710 Author: Kevin Ratnasekera <djkevi...@yahoo.com> Authored: Fri Aug 5 15:49:45 2016 +0530 Committer: Kevin Ratnasekera <djkevi...@yahoo.com> Committed: Fri Aug 5 15:49:45 2016 +0530 ---------------------------------------------------------------------- .../gora/persistency/impl/PersistentBase.java | 1 - .../gora/mock/persistency/MockPersistent.java | 26 ++++++++++++++------ gora-jcache/pom.xml | 6 +++++ .../apache/gora/jcache/query/JCacheResult.java | 9 ++++++- 4 files changed, 32 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/ff1fddfd/gora-core/src/main/java/org/apache/gora/persistency/impl/PersistentBase.java ---------------------------------------------------------------------- diff --git a/gora-core/src/main/java/org/apache/gora/persistency/impl/PersistentBase.java b/gora-core/src/main/java/org/apache/gora/persistency/impl/PersistentBase.java index fea153f..8c1a30c 100644 --- a/gora-core/src/main/java/org/apache/gora/persistency/impl/PersistentBase.java +++ b/gora-core/src/main/java/org/apache/gora/persistency/impl/PersistentBase.java @@ -198,7 +198,6 @@ public abstract class PersistentBase extends SpecificRecordBase implements return __g__dirty; } - /** * Setter method for assign dirty bytes when deserializing AVRO bean from dirty bytes * preserved in serialized bytes form. http://git-wip-us.apache.org/repos/asf/gora/blob/ff1fddfd/gora-core/src/test/java/org/apache/gora/mock/persistency/MockPersistent.java ---------------------------------------------------------------------- diff --git a/gora-core/src/test/java/org/apache/gora/mock/persistency/MockPersistent.java b/gora-core/src/test/java/org/apache/gora/mock/persistency/MockPersistent.java index 899cd55..7ae7426 100644 --- a/gora-core/src/test/java/org/apache/gora/mock/persistency/MockPersistent.java +++ b/gora-core/src/test/java/org/apache/gora/mock/persistency/MockPersistent.java @@ -101,26 +101,36 @@ public class MockPersistent extends PersistentBase { private static final org.apache.avro.io.DatumReader DATUM_READER$ = new org.apache.avro.specific.SpecificDatumReader(SCHEMA$); + /** + * Writes AVRO data bean to output stream in the form of AVRO Binary encoding format. This will transform + * AVRO data bean from its Java object form to it s serializable form. + * + * @param out java.io.ObjectOutput output stream to write data bean in serializable form + */ @Override public void writeExternal(java.io.ObjectOutput out) throws java.io.IOException { out.write(super.getDirtyBytes().array()); - DATUM_WRITER$.write - (this, org.apache.avro.io.EncoderFactory.get() - .directBinaryEncoder((java.io.OutputStream) out, - null)); + DATUM_WRITER$.write(this, org.apache.avro.io.EncoderFactory.get() + .directBinaryEncoder((java.io.OutputStream) out, + null)); } + /** + * Reads AVRO data bean from input stream in it s AVRO Binary encoding format to Java object format. + * This will transform AVRO data bean from it s serializable form to deserialized Java object form. + * + * @param in java.io.ObjectOutput input stream to read data bean in serializable form + */ @Override public void readExternal(java.io.ObjectInput in) throws java.io.IOException { byte[] __g__dirty = new byte[getFieldsCount()]; in.read(__g__dirty); super.setDirtyBytes(java.nio.ByteBuffer.wrap(__g__dirty)); - DATUM_READER$.read - (this, org.apache.avro.io.DecoderFactory.get() - .directBinaryDecoder((java.io.InputStream) in, - null)); + DATUM_READER$.read(this, org.apache.avro.io.DecoderFactory.get() + .directBinaryDecoder((java.io.InputStream) in, + null)); } } http://git-wip-us.apache.org/repos/asf/gora/blob/ff1fddfd/gora-jcache/pom.xml ---------------------------------------------------------------------- diff --git a/gora-jcache/pom.xml b/gora-jcache/pom.xml index 0dbe0fc..a56fce5 100644 --- a/gora-jcache/pom.xml +++ b/gora-jcache/pom.xml @@ -111,6 +111,12 @@ <artifactId>avro</artifactId> </dependency> + <!-- Hadoop Dependencies --> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </dependency> + <!-- JCache Dependencies --> <dependency> <groupId>com.hazelcast</groupId> http://git-wip-us.apache.org/repos/asf/gora/blob/ff1fddfd/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 83a9779..235f6ac 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 @@ -31,6 +31,7 @@ public class JCacheResult<K, T extends PersistentBase> extends ResultBase<K, T> private NavigableSet<K> cacheKeySet; private Iterator<K> iterator; + private int current; public JCacheResult(DataStore<K, T> dataStore, Query<K, T> query) { super(dataStore, query); @@ -40,6 +41,7 @@ public class JCacheResult<K, T extends PersistentBase> extends ResultBase<K, T> super(dataStore, query); this.cacheKeySet = cacheKeySet; this.iterator = cacheKeySet.iterator(); + this.current = 0; } public JCacheStore<K, T> getDataStore() { @@ -48,7 +50,11 @@ public class JCacheResult<K, T extends PersistentBase> extends ResultBase<K, T> @Override public float getProgress() throws IOException { - return 0; + if (cacheKeySet.size() == 0) { + return 1; + } + float progress = ((float) current / (float) cacheKeySet.size()); + return progress; } @Override @@ -63,6 +69,7 @@ public class JCacheResult<K, T extends PersistentBase> extends ResultBase<K, T> } key = iterator.next(); persistent = dataStore.get(key); + this.current++; return true; }
