You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by aj...@apache.org on 2016/01/05 19:02:18 UTC
falcon git commit: FALCON-1710 dependency API sets totalResults as 0
by default. Contributed by Praveen Adlakha.
Repository: falcon
Updated Branches:
refs/heads/master 054295a7d -> 5e80dcd0d
FALCON-1710 dependency API sets totalResults as 0 by default. Contributed by Praveen Adlakha.
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/5e80dcd0
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/5e80dcd0
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/5e80dcd0
Branch: refs/heads/master
Commit: 5e80dcd0ddaace24582c4e07b99e6032f053c250
Parents: 054295a
Author: Ajay Yadava <aj...@gmail.com>
Authored: Tue Jan 5 20:42:28 2016 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Tue Jan 5 23:31:26 2016 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
client/src/main/java/org/apache/falcon/resource/EntityList.java | 5 +++++
.../test/java/org/apache/falcon/resource/EntityManagerTest.java | 1 +
3 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/5e80dcd0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 597b551..599efca 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -90,6 +90,8 @@ Proposed Release Version: 0.9
OPTIMIZATIONS
BUG FIXES
+ FALCON-1710 dependency API sets totalResults as 0 by default(Praveen Adlakha via Ajay Yadava)
+
FALCON-1714 EntityNotRegisteredException when process with no input/output feed is scheduled(Ajay Yadava)
FALCON-1674 Fix the mapping of InstanceState status to workflow Status in InstancesResult (Pallavi Rao via Ajay Yadava)
http://git-wip-us.apache.org/repos/asf/falcon/blob/5e80dcd0/client/src/main/java/org/apache/falcon/resource/EntityList.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/falcon/resource/EntityList.java b/client/src/main/java/org/apache/falcon/resource/EntityList.java
index f581691..b91bdbe 100644
--- a/client/src/main/java/org/apache/falcon/resource/EntityList.java
+++ b/client/src/main/java/org/apache/falcon/resource/EntityList.java
@@ -43,6 +43,10 @@ public class EntityList {
public static final String INPUT_TAG = "Input";
public static final String OUTPUT_TAG = "Output";
+ public int getTotalResults() {
+ return totalResults;
+ }
+
@XmlElement
private int totalResults;
@@ -141,6 +145,7 @@ public class EntityList {
public EntityList(Entity[] dependentEntities, Entity entity) {
int len = dependentEntities.length;
+ this.totalResults = len;
EntityElement[] items = new EntityElement[len];
for (int i = 0; i < len; i++) {
Entity e = dependentEntities[i];
http://git-wip-us.apache.org/repos/asf/falcon/blob/5e80dcd0/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java
----------------------------------------------------------------------
diff --git a/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java b/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java
index 99a537d..0519cd2 100644
--- a/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java
+++ b/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java
@@ -151,6 +151,7 @@ public class EntityManagerTest extends AbstractEntityManager {
EntityList entityList = this.getEntityList("", "", "", "process", "", "", "", "asc", 0, 10, "");
Assert.assertNotNull(entityList.getElements());
Assert.assertEquals(entityList.getElements().length, 1);
+ Assert.assertEquals(entityList.getTotalResults(), 1);
/*
* Both entities should be returned when the user is SuperUser.