You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/09/08 23:06:23 UTC
[20/50] usergrid git commit: added size to metadata
added size to metadata
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/28d966fe
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/28d966fe
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/28d966fe
Branch: refs/heads/usergrid-103-upgrade-jersey
Commit: 28d966fef1b0421660dfeeb9a70b80fbb2f92088
Parents: a566720
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Aug 31 16:07:58 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Aug 31 16:07:58 2015 -0600
----------------------------------------------------------------------
.../apache/usergrid/corepersistence/CpEntityManager.java | 2 +-
.../corepersistence/results/EntityQueryExecutor.java | 1 +
.../org/apache/usergrid/persistence/AbstractEntity.java | 9 ++++++---
.../test/java/org/apache/usergrid/persistence/IndexIT.java | 6 +++---
4 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/28d966fe/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 92464f8..d19d6e3 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -2615,7 +2615,7 @@ public class CpEntityManager implements EntityManager {
} );
}
- cpEntity = ecm.write( cpEntity ).toBlocking().last();
+ cpEntity = ecm.write( cpEntity ).toBlocking().last();
entity.setSize(cpEntity.getSize());
if(logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/28d966fe/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/EntityQueryExecutor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/EntityQueryExecutor.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/EntityQueryExecutor.java
index 5e80d24..7a8b273 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/EntityQueryExecutor.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/EntityQueryExecutor.java
@@ -80,6 +80,7 @@ public abstract class EntityQueryExecutor extends ObservableQueryExecutor<Entity
Map<String, Object> entityMap = CpEntityMapUtils.toMap( cpEntity );
entity.addProperties( entityMap );
+ entity.setMetadata("size", cpEntity.getSize());
return entity;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/28d966fe/stack/core/src/main/java/org/apache/usergrid/persistence/AbstractEntity.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/AbstractEntity.java b/stack/core/src/main/java/org/apache/usergrid/persistence/AbstractEntity.java
index 59106ba..49d0cf9 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/AbstractEntity.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/AbstractEntity.java
@@ -98,11 +98,14 @@ public abstract class AbstractEntity implements Entity {
}
@Override
- public void setSize(final long size){this.size = size;}
-
+ public void setSize(final long size){this.setMetadata("size",size);}
+ @JsonIgnore
@Override
- public long getSize(){return size;}
+ public long getSize() {
+ Object size = this.getMetadata("size");
+ return size != null && size instanceof Long ? (Long) size : 0;
+ }
@Override
@EntityProperty(indexed = true, required = true, mutable = false)
http://git-wip-us.apache.org/repos/asf/usergrid/blob/28d966fe/stack/core/src/test/java/org/apache/usergrid/persistence/IndexIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/IndexIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/IndexIT.java
index 50b0ba3..15c6f61 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/IndexIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/IndexIT.java
@@ -305,21 +305,21 @@ public class IndexIT extends AbstractCoreIT {
Results r = em.searchCollection( em.getApplicationRef(), "names", query );
assertTrue(r.getEntities() != null && r.getEntities().size() > 0);
Entity first = r.getEntities().get(0);
- assertTrue(first.getDynamicProperties().size() == 1);
+ assertTrue(first.getDynamicProperties().size() == 2);
//should return valid values
query = Query.fromQL("select uuid where status = 'pickled'");
r = em.searchCollection( em.getApplicationRef(), "names", query );
assertTrue(r.getEntities() != null && r.getEntities().size() > 0);
first = r.getEntities().get(0);
- assertTrue(first.getDynamicProperties().size() == 0);
+ assertTrue(first.getDynamicProperties().size() == 1);
//should return valid values
query = Query.fromQL("select uuid:myid where status = 'pickled'");
r = em.searchCollection( em.getApplicationRef(), "names", query );
assertTrue(r.getEntities() != null && r.getEntities().size() > 0);
first = r.getEntities().get(0);
- assertTrue(first.getDynamicProperties().size() == 0);
+ assertTrue(first.getDynamicProperties().size() == 1);
}
@Test