diff options
| author | Young Gyu Park <younggyu@google.com> | 2018-03-30 16:03:06 +0900 |
|---|---|---|
| committer | Young Gyu Park <younggyu@google.com> | 2018-04-02 10:15:06 +0900 |
| commit | 4a177bd7c3070c93f7e079083677313bd3c87a33 (patch) | |
| tree | 9df0d8b05a8dea291a3d43b15ef09b9434de5f4a | |
| parent | e409e4044306992b9ac101929148098b7a9d94b9 (diff) | |
| download | dashboard-4a177bd7c3070c93f7e079083677313bd3c87a33.tar.gz | |
datastore-index file update to affect green build page's search
Test: Tested with browser on
appengine(go/vts-web-staging/show_green_release?plan=vts-staging-presubmit&type=plan)
Bug: 77299515
Change-Id: Ib9f97771baf35b9aa76af4db61e92b919c7814e6
| -rw-r--r-- | src/main/java/com/android/vts/servlet/ShowGreenReleaseServlet.java | 24 | ||||
| -rw-r--r-- | src/main/webapp/WEB-INF/datastore-indexes.xml | 22 |
2 files changed, 36 insertions, 10 deletions
diff --git a/src/main/java/com/android/vts/servlet/ShowGreenReleaseServlet.java b/src/main/java/com/android/vts/servlet/ShowGreenReleaseServlet.java index 45247bd..43ebe3a 100644 --- a/src/main/java/com/android/vts/servlet/ShowGreenReleaseServlet.java +++ b/src/main/java/com/android/vts/servlet/ShowGreenReleaseServlet.java @@ -227,11 +227,14 @@ public class ShowGreenReleaseServlet extends BaseServlet { DatastoreService datastore = DatastoreServiceFactory.getDatastoreService(); - Query deviceInfoQuery = new Query(DeviceInfoEntity.KIND) - .setAncestor(KeyFactory.createKey(TestPlanEntity.KIND, testPlan)) - .addProjection(new PropertyProjection(DeviceInfoEntity.BRANCH, String.class)) - .addProjection(new PropertyProjection(DeviceInfoEntity.BUILD_FLAVOR, String.class)) - .setDistinct(true); + Query deviceInfoQuery = + new Query(DeviceInfoEntity.KIND) + .setAncestor(KeyFactory.createKey(TestPlanEntity.KIND, testPlan)) + .addProjection( + new PropertyProjection(DeviceInfoEntity.BRANCH, String.class)) + .addProjection( + new PropertyProjection(DeviceInfoEntity.BUILD_FLAVOR, String.class)) + .setDistinct(true); Map<String, List<String>> paramInfoMap = new HashMap<>(); for (Entity entity : datastore.prepare(deviceInfoQuery).asIterable()) { @@ -382,9 +385,10 @@ public class ShowGreenReleaseServlet extends BaseServlet { .stream() .filter( entity -> - entity.testBuildId - .equalsIgnoreCase( - greenBuildId)) + entity.failCount == 0L + && entity.testBuildId + .equalsIgnoreCase( + greenBuildId)) .findFirst(); // Setting the greenBuildId value and timestamp to // deviceBuildInfo object @@ -478,9 +482,9 @@ public class ShowGreenReleaseServlet extends BaseServlet { oneWeekAgoTimestamp)) .project("buildId") .order("__key__") - .order("-candidate_percentile") + .order("-passedTestCaseRatio") .first() - .safe(); + .now(); if (candidateIdEntity == null) { deviceBuildInfo.setCandidateBuildId("N/A"); } else { diff --git a/src/main/webapp/WEB-INF/datastore-indexes.xml b/src/main/webapp/WEB-INF/datastore-indexes.xml index a54495c..1b96cff 100644 --- a/src/main/webapp/WEB-INF/datastore-indexes.xml +++ b/src/main/webapp/WEB-INF/datastore-indexes.xml @@ -101,4 +101,26 @@ <property name="buildFlavor" direction="asc"/> </datastore-index> + <datastore-index kind="TestSuiteResultEntity" ancestor="false" source="manual"> + <property name="suitePlan" direction="asc"/> + <property name="branch" direction="asc"/> + <property name="target" direction="asc"/> + </datastore-index> + + <datastore-index kind="TestSuiteResultEntity" ancestor="false" source="manual"> + <property name="branch" direction="asc"/> + <property name="failedTestCaseCount" direction="asc"/> + <property name="suitePlan" direction="asc"/> + <property name="target" direction="asc"/> + <property name="__key__" direction="asc"/> + <property name="buildId" direction="asc"/> + </datastore-index> + + <datastore-index kind="TestSuiteResultEntity" ancestor="false" source="manual"> + <property name="branch" direction="asc"/> + <property name="suitePlan" direction="asc"/> + <property name="target" direction="asc"/> + <property name="__key__" direction="asc"/> + <property name="buildId" direction="asc"/> + </datastore-index> </datastore-indexes> |