You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/08/03 23:02:09 UTC
[ignite-teamcity-bot] branch filter-hist-by-tag updated: Filtering
history by build tag selected at tracked page: parameter value filter done
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch filter-hist-by-tag
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/filter-hist-by-tag by this push:
new 7107415 Filtering history by build tag selected at tracked page: parameter value filter done
7107415 is described below
commit 7107415180bfa7aecb5f6e74dde667abbc2948db
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Sun Aug 4 02:02:06 2019 +0300
Filtering history by build tag selected at tracked page: parameter value filter done
---
.../tcbot/engine/chain/BuildChainProcessor.java | 15 ++-------------
.../ci/teamcity/ignited/runhist/Invocation.java | 22 ++++++++++++++++++++--
.../teamcity/ignited/runhist/RunHistCompacted.java | 10 +++-------
.../ignite/tcignited/build/SuiteHistory.java | 7 ++-----
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/BuildChainProcessor.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/BuildChainProcessor.java
index cf0dc94..300f272 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/BuildChainProcessor.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/BuildChainProcessor.java
@@ -41,6 +41,7 @@ import javax.inject.Inject;
import org.apache.ignite.ci.teamcity.ignited.BuildRefCompacted;
import org.apache.ignite.ci.teamcity.ignited.buildtype.ParametersCompacted;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildCompacted;
+import org.apache.ignite.ci.teamcity.ignited.runhist.Invocation;
import org.apache.ignite.tcbot.common.interceptor.AutoProfiling;
import org.apache.ignite.tcbot.common.util.FutureUtil;
import org.apache.ignite.tcbot.engine.pool.TcUpdatePool;
@@ -398,19 +399,7 @@ public class BuildChainProcessor {
private boolean hasAnyParameterValue(@Nonnull Map<Integer, Integer> requireParamVal, FatBuildCompacted fatBuild) {
ParametersCompacted parameters = fatBuild.parameters();
- if (parameters == null)
- return false;
-
- Set<Map.Entry<Integer, Integer>> entries = requireParamVal.entrySet();
- for (Map.Entry<Integer, Integer> next : entries) {
- Integer key = next.getKey();
-
- int valId = parameters.findPropertyStringId(key);
- if (Objects.equals(next.getValue(), valId))
- return true;
- }
-
- return false;
+ return Invocation.hasAnyParameterValue(parameters, requireParamVal);
}
@SuppressWarnings("WeakerAccess")
diff --git a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
index 6b11d2b..e46aba4 100644
--- a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
+++ b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
@@ -25,6 +25,8 @@ import org.apache.ignite.tcbot.persistence.Persisted;
import org.apache.ignite.tcignited.history.ChangesState;
import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -134,8 +136,24 @@ public class Invocation {
return this;
}
- public boolean containsParameters(Map<Integer, Integer> requireParameters) {
- //todo implement contains parameters (compacted).
+
+ public static boolean hasAnyParameterValue(ParametersCompacted parameters, @Nonnull Map<Integer, Integer> requireParamVal) {
+ if (parameters == null)
+ return false;
+
+ Set<Map.Entry<Integer, Integer>> entries = requireParamVal.entrySet();
+ for (Map.Entry<Integer, Integer> next : entries) {
+ Integer key = next.getKey();
+
+ int valId = parameters.findPropertyStringId(key);
+ if (java.util.Objects.equals(next.getValue(), valId))
+ return true;
+ }
+
return false;
}
+
+ public boolean containsParameterValue(Map<Integer, Integer> requireParameters) {
+ return hasAnyParameterValue(this.parameters, requireParameters);
+ }
}
diff --git a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
index 244129e..722ff7a 100644
--- a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
+++ b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
@@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
/**
*
@@ -207,15 +206,12 @@ public class RunHistCompacted implements IRunHistory {
data.sort();
}
-
public RunHistCompacted filterSuiteInvByParms(Map<Integer, Integer> requireParameters) {
RunHistCompacted copy = new RunHistCompacted();
- Stream<Invocation> invocationStream = data.invocations().filter(
- invocation -> invocation.containsParameters(requireParameters)
- );
-
- invocationStream.forEach(invocation -> copy.data.add(invocation));
+ data.invocations()
+ .filter(invocation -> invocation.containsParameterValue(requireParameters))
+ .forEach(invocation -> copy.data.add(invocation));
return copy;
}
diff --git a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/build/SuiteHistory.java b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/build/SuiteHistory.java
index c00e243..7d1b24f 100644
--- a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/build/SuiteHistory.java
+++ b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/build/SuiteHistory.java
@@ -68,12 +68,9 @@ public class SuiteHistory implements ISuiteRunHistory {
Set<Integer> builds = suitesFiltered.buildIds();
SuiteHistory res = new SuiteHistory();
- res.suiteHist = suitesFiltered;
- this.testsHistory.forEach((tName,invList)->{
- RunHistCompacted filteredByBuild = invList.filterByBuilds(builds);
- res.testsHistory.put(tName, filteredByBuild);
- });
+ res.suiteHist = suitesFiltered;
+ this.testsHistory.forEach((tName,invList)-> res.testsHistory.put(tName, invList.filterByBuilds(builds)));
return res;
}