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/03/15 16:46:16 UTC
[ignite-teamcity-bot] branch master updated: Visa days base reduced
to be 21 days.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new 6a81b8d Visa days base reduced to be 21 days.
6a81b8d is described below
commit 6a81b8d96a4d64425b204a4f80575ba5d10159d0
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Fri Mar 15 19:46:10 2019 +0300
Visa days base reduced to be 21 days.
---
.../ci/teamcity/ignited/runhist/Invocation.java | 2 +-
.../teamcity/ignited/runhist/InvocationData.java | 25 ++++++++++++----------
.../teamcity/ignited/runhist/RunHistCompacted.java | 13 ++++++-----
.../ignited/runhist/RunHistCompactedDao.java | 13 +++++------
.../ci/teamcity/ignited/runhist/RunHistKey.java | 12 ++++++-----
.../ci/teamcity/ignited/runhist/RunHistSync.java | 12 +++++------
6 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
index 171f100..5d294ba 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
@@ -59,7 +59,7 @@ public class Invocation {
Preconditions.checkState(failCode < 128);
Preconditions.checkState(failCode >= 0);
- this.status = (byte) failCode;
+ this.status = (byte)failCode;
return this;
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java
index 6e29a3c..88ca10f 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java
@@ -20,18 +20,21 @@ package org.apache.ignite.ci.teamcity.ignited.runhist;
import com.google.common.base.MoreObjects;
import java.time.Duration;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
+import java.util.TreeMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.ignite.ci.analysis.RunStat;
-
-import java.util.Map;
-import java.util.TreeMap;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.NotNull;
+/**
+ *
+ */
public class InvocationData {
- public static final int MAX_DAYS = 30;
+ /** Max days to keep test invocatoin data in run statistics: affects Bot Visa. */
+ public static final int MAX_DAYS = 21;
/** Muted. */
public static final int MUTED = RunStat.RunStatus.RES_MUTED_FAILURE.getCode();
/** Failure. */
@@ -114,9 +117,9 @@ public class InvocationData {
*/
public int notMutedRunsCount() {
return (int)
- invocations()
- .filter(invocation -> invocation.status() != MUTED)
- .count();
+ invocations()
+ .filter(invocation -> invocation.status() != MUTED)
+ .count();
}
/**
@@ -145,10 +148,10 @@ public class InvocationData {
/** {@inheritDoc} */
@Override public String toString() {
return MoreObjects.toStringHelper(this)
- .add("allHistRuns", allHistRuns)
- .add("allHistFailures", allHistFailures)
- .add("invocationMap", invocationMap)
- .toString();
+ .add("allHistRuns", allHistRuns)
+ .add("allHistFailures", allHistFailures)
+ .add("invocationMap", invocationMap)
+ .toString();
}
/** {@inheritDoc} */
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
index 97499a3..8f3ef33 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
@@ -43,7 +43,8 @@ public class RunHistCompacted implements IVersionedEntity, IRunHistory {
/** Data. */
private InvocationData data = new InvocationData();
- public RunHistCompacted() {}
+ public RunHistCompacted() {
+ }
public RunHistCompacted(RunHistKey ignored) {
@@ -123,7 +124,6 @@ public class RunHistCompacted implements IVersionedEntity, IRunHistory {
return data.addInvocation(inv);
}
-
private static int[] concatArr(int[] arr1, int[] arr2) {
int[] arr1and2 = new int[arr1.length + arr2.length];
System.arraycopy(arr1, 0, arr1and2, 0, arr1.length);
@@ -134,7 +134,7 @@ public class RunHistCompacted implements IVersionedEntity, IRunHistory {
@Nullable
public Integer detectTemplate(EventTemplate t) {
- if (data == null)
+ if (data == null)
return null;
int centralEvtBuild = t.beforeEvent().length;
@@ -146,7 +146,6 @@ public class RunHistCompacted implements IVersionedEntity, IRunHistory {
List<Invocation> histAsArr = data.invocations().collect(Collectors.toList());
-
if (histAsArr.size() < template.length)
return null;
@@ -194,9 +193,9 @@ public class RunHistCompacted implements IVersionedEntity, IRunHistory {
/** {@inheritDoc} */
@Override public String toString() {
return MoreObjects.toStringHelper(this)
- .add("failRate", getFailPercentPrintable())
- .add("data", data)
- .toString();
+ .add("failRate", getFailPercentPrintable())
+ .add("data", data)
+ .toString();
}
/** {@inheritDoc} */
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompactedDao.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompactedDao.java
index d22eb39..5cb1502 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompactedDao.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompactedDao.java
@@ -17,10 +17,13 @@
package org.apache.ignite.ci.teamcity.ignited.runhist;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import javax.cache.Cache;
import javax.cache.processor.MutableEntry;
+import javax.inject.Inject;
+import javax.inject.Provider;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.QueryEntity;
@@ -33,10 +36,6 @@ import org.apache.ignite.ci.teamcity.ignited.IRunHistory;
import org.apache.ignite.ci.teamcity.ignited.IRunStat;
import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
import org.apache.ignite.configuration.CacheConfiguration;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-import java.util.Collections;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -52,10 +51,9 @@ public class RunHistCompactedDao {
/** Build Start time Cache name. */
public static final String BUILD_START_TIME_CACHE_NAME = "teamcityBuildStartTime";
- /** Suites history Cache name.*/
+ /** Suites history Cache name. */
public static final String SUITE_HIST_CACHE_NAME = "teamcitySuiteRunHist";
-
/** Ignite provider. */
@Inject
private Provider<Ignite> igniteProvider;
@@ -75,7 +73,7 @@ public class RunHistCompactedDao {
/**
* Initialize
*/
- public void init () {
+ public void init() {
Ignite ignite = igniteProvider.get();
final CacheConfiguration<RunHistKey, RunHistCompacted> cfg = TcHelperDb.getCacheV2Config(TEST_HIST_CACHE_NAME);
@@ -144,7 +142,6 @@ public class RunHistCompactedDao {
return testHistCache.invoke(histKey, RunHistCompactedDao::processEntry, list);
}
-
@AutoProfiling
public Integer addSuiteInvocations(RunHistKey histKey, List<Invocation> list) {
if (list.isEmpty())
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistKey.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistKey.java
index 239e479..11b6d4a 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistKey.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistKey.java
@@ -48,12 +48,14 @@ public class RunHistKey {
/** {@inheritDoc} */
@Override public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- RunHistKey histKey = (RunHistKey) o;
+ if (this == o)
+ return true;
+ if (o == null || getClass() != o.getClass())
+ return false;
+ RunHistKey histKey = (RunHistKey)o;
return srvId == histKey.srvId &&
- testOrSuiteName == histKey.testOrSuiteName &&
- branch == histKey.branch;
+ testOrSuiteName == histKey.testOrSuiteName &&
+ branch == histKey.branch;
}
/** {@inheritDoc} */
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java
index a9e0ffd..3e04bed 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java
@@ -34,9 +34,9 @@ import org.apache.ignite.ci.ITeamcity;
import org.apache.ignite.ci.di.AutoProfiling;
import org.apache.ignite.ci.di.MonitoredTask;
import org.apache.ignite.ci.di.scheduler.IScheduler;
-import org.apache.ignite.ci.teamcity.ignited.buildref.BuildRefDao;
import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnited;
+import org.apache.ignite.ci.teamcity.ignited.buildref.BuildRefDao;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildCompacted;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildDao;
import org.jetbrains.annotations.NotNull;
@@ -142,7 +142,7 @@ public class RunHistSync {
}
}
- @MonitoredTask(name="Save Builds To History(srv, runner)", nameExtArgsIndexes = {0,1})
+ @MonitoredTask(name = "Save Builds To History(srv, runner)", nameExtArgsIndexes = {0, 1})
@SuppressWarnings("WeakerAccess")
protected String saveBuildToHistory(String srvName, int ldrToActivate) {
Map<RunHistKey, List<Invocation>> testsSaveThisRun;
@@ -157,7 +157,7 @@ public class RunHistSync {
testsSaveThisRun = syncTask.takeTests();
}
- if(buildsSaveThisRun.isEmpty() && testsSaveThisRun.isEmpty())
+ if (buildsSaveThisRun.isEmpty() && testsSaveThisRun.isEmpty())
return "Nothing to sync";
return saveInvocationsMap(buildsSaveThisRun, testsSaveThisRun);
@@ -259,7 +259,7 @@ public class RunHistSync {
@NotNull
private String taskName(String taskName, String srvName) {
- return RunHistSync.class.getSimpleName() +"." + taskName + "." + srvName;
+ return RunHistSync.class.getSimpleName() + "." + taskName + "." + srvName;
}
@SuppressWarnings({"WeakerAccess", "UnusedReturnValue"})
@@ -279,7 +279,7 @@ public class RunHistSync {
if (buildsIdsToLoad.size() >= 50) {
totalAskedToLoad += buildsIdsToLoad.size();
- scheduleHistLoad(srvId, buildsIdsToLoad);
+ scheduleHistLoad(srvId, buildsIdsToLoad);
buildsIdsToLoad.clear();
}
buildsIdsToLoad.add(buildId);
@@ -341,7 +341,7 @@ public class RunHistSync {
}
private Map<RunHistKey, List<Invocation>> takeTests() {
- Map<RunHistKey, List<Invocation>> saveThisRun = tests;
+ Map<RunHistKey, List<Invocation>> saveThisRun = tests;
tests = new HashMap<>();
testCnt.set(0);