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 2018/10/27 13:00:33 UTC
[ignite-teamcity-bot] branch master updated: IGNITE-9848: Unused
stuff removal
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 c0c41de IGNITE-9848: Unused stuff removal
c0c41de is described below
commit c0c41de715a01a3e11c700e4fa5860e6d77103ce
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Sat Oct 27 16:00:31 2018 +0300
IGNITE-9848: Unused stuff removal
---
.../apache/ignite/ci/analysis/FullChainRunCtx.java | 13 -----
.../apache/ignite/ci/analysis/ITestFailures.java | 4 --
.../apache/ignite/ci/analysis/MultBuildRunCtx.java | 65 +++-------------------
.../ci/analysis/MultTestFailureOccurrences.java | 8 ---
.../ignite/ci/tcbot/chain/BuildChainProcessor.java | 12 +---
5 files changed, 10 insertions(+), 92 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/FullChainRunCtx.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/FullChainRunCtx.java
index b8593fa..0e04ccb 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/FullChainRunCtx.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/FullChainRunCtx.java
@@ -102,19 +102,6 @@ public class FullChainRunCtx {
+ (hasFullDurationInfo() ? "" : "+");
}
- private Stream<Long> getSourceUpdateDurations() {
- return suites().stream().map(MultBuildRunCtx::getSourceUpdateDuration);
- }
-
- public Long getTotalSourceUpdateDuration() {
- return getSourceUpdateDurations().filter(Objects::nonNull).mapToLong(t -> t).sum();
- }
-
- @NotNull public String getSourceUpdateDurationPrintable() {
- return (TimeUtil.millisToDurationPrintable(getTotalSourceUpdateDuration()))
- + (hasFullDurationInfo() ? "" : "+");
- }
-
public void addAllSuites(ArrayList<MultBuildRunCtx> suites) {
this.buildCfgsResults.addAll(suites);
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/ITestFailures.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/ITestFailures.java
index af920b5..7cfc21c 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/ITestFailures.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/ITestFailures.java
@@ -28,10 +28,6 @@ public interface ITestFailures {
boolean isInvestigated();
- Stream<String> getOccurrenceIds();
-
- public int occurrencesCount();
-
public int failuresCount();
public long getAvgDurationMs();
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java
index 6f18130..0411fe2 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java
@@ -72,10 +72,10 @@ public class MultBuildRunCtx implements ISuiteResults {
}
/** Currently running builds */
- @Nullable private CompletableFuture<Long> runningBuildCount;
+ private Integer runningBuildCount;
/** Currently scheduled builds */
- @Nullable private CompletableFuture<Long> queuedBuildCount;
+ private Integer queuedBuildCount;
public MultBuildRunCtx(@Nonnull final BuildRef buildInfo) {
this.firstBuildInfo = buildInfo;
@@ -170,31 +170,6 @@ public class MultBuildRunCtx implements ISuiteResults {
return buildsStream().flatMap(SingleBuildRunCtx::getFailedNotMutedTestNames).distinct();
}
- public String getPrintableStatusString() {
- StringBuilder builder = new StringBuilder();
- builder.append("\t[").append(suiteName()).append("]\t");
- builder.append(getResult());
- builder.append(" ");
- builder.append(failedTests());
-
- if (stat != null) {
- final Long durationMs = stat.getBuildDuration();
- if (durationMs != null)
- builder.append(" ").append(TimeUtil.millisToDurationPrintable(durationMs));
- }
-
- builder.append("\n");
- getCriticalFailLastStartedTest().forEach(lastStartedTest ->
- builder.append("\t").append(lastStartedTest).append(" (Last started) \n"));
-
- getFailedTestsNames().forEach(
- name -> {
- builder.append("\t").append(name).append("\n");
- }
- );
- return builder.toString();
- }
-
/**
* Suite Run Result (filled if failed)
*
@@ -316,13 +291,6 @@ public class MultBuildRunCtx implements ISuiteResults {
return stat == null ? null : stat.getBuildDuration();
}
- @Nullable
- public Long getSourceUpdateDuration() {
- return stat == null ? null : stat.getSourceUpdateDuration();
- }
-
-
-
@Nullable public String suiteName() {
return buildsStream().findFirst().map(SingleBuildRunCtx::suiteName).orElse(null);
}
@@ -335,11 +303,11 @@ public class MultBuildRunCtx implements ISuiteResults {
}
- public void setRunningBuildCount(CompletableFuture<Long> runningBuildCount) {
+ public void setRunningBuildCount(int runningBuildCount) {
this.runningBuildCount = runningBuildCount;
}
- public void setQueuedBuildCount(CompletableFuture<Long> queuedBuildCount) {
+ public void setQueuedBuildCount(int queuedBuildCount) {
this.queuedBuildCount = queuedBuildCount;
}
@@ -348,22 +316,11 @@ public class MultBuildRunCtx implements ISuiteResults {
}
public Integer queuedBuildCount() {
- if (queuedBuildCount == null)
- return 0;
-
- Long val = FutureUtil.getResultSilent(queuedBuildCount);
-
- return val == null ? 0 : val.intValue();
-
+ return queuedBuildCount == null ? Integer.valueOf(0) : queuedBuildCount;
}
public Integer runningBuildCount() {
- if (runningBuildCount == null)
- return 0;
-
- Long val = FutureUtil.getResultSilent(runningBuildCount);
-
- return val == null ? 0 : val.intValue();
+ return runningBuildCount == null ? Integer.valueOf(0) : runningBuildCount;
}
/**
@@ -377,15 +334,7 @@ public class MultBuildRunCtx implements ISuiteResults {
}
Stream<? extends Future<?>> getFutures() {
- Stream<CompletableFuture<?>> stream1 = queuedBuildCount != null ? Stream.of(queuedBuildCount) : Stream.empty();
- Stream<CompletableFuture<?>> stream2 = runningBuildCount != null ? Stream.of(runningBuildCount) : Stream.empty();
-
- Stream<? extends Future<?>> stream4 = buildsStream().flatMap(SingleBuildRunCtx::getFutures);
-
- return
- concat(
- concat(stream1, stream2),
- stream4);
+ return buildsStream().flatMap(SingleBuildRunCtx::getFutures);
}
/**
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultTestFailureOccurrences.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultTestFailureOccurrences.java
index 98aa985..fa177f0 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultTestFailureOccurrences.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultTestFailureOccurrences.java
@@ -39,10 +39,6 @@ public class MultTestFailureOccurrences implements ITestFailures {
return occurrences.stream().anyMatch(TestOccurrence::isInvestigated);
}
- @Override public Stream<String> getOccurrenceIds() {
- return occurrences.stream().map(TestOccurrence::getId);
- }
-
public boolean hasFailedButNotMuted() {
return getFailedButNotMutedCount() > 0;
}
@@ -53,10 +49,6 @@ public class MultTestFailureOccurrences implements ITestFailures {
.filter(TestOccurrence::isFailedButNotMuted).count();
}
- public int occurrencesCount() {
- return (int)getOccurrenceIds().count();
- }
-
@Override public int failuresCount() {
return getFailedButNotMutedCount();
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
index 3d44832..cb7a886 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
@@ -273,22 +273,16 @@ public class BuildChainProcessor {
private static void fillBuildCounts(MultBuildRunCtx outCtx,
ITeamcityIgnited teamcityIgnited, boolean includeScheduledInfo) {
if (includeScheduledInfo && !outCtx.hasScheduledBuildsInfo()) {
- Function<List<BuildRef>, Long> cntRelatedToThisBuildType = list ->
- list.stream()
- .filter(ref -> Objects.equals(ref.buildTypeId, outCtx.buildTypeId()))
- .filter(ref -> Objects.equals(normalizeBranch(outCtx.branchName()), normalizeBranch(ref)))
- .count();
-
- //todo queue all builds instead of specific + caching
+ //todo queue compacted instead of full
long cntRunning = teamcityIgnited.getBuildHistory(outCtx.buildTypeId(), outCtx.branchName())
.stream().filter(BuildRef::isNotCancelled).filter(BuildRef::isRunning).count();
- outCtx.setRunningBuildCount(CompletableFuture.completedFuture(cntRunning));
+ outCtx.setRunningBuildCount((int) cntRunning);
long cntQueued = teamcityIgnited.getBuildHistory(outCtx.buildTypeId(), outCtx.branchName())
.stream().filter(BuildRef::isNotCancelled).filter(BuildRef::isQueued).count();
- outCtx.setQueuedBuildCount(CompletableFuture.completedFuture(cntQueued));
+ outCtx.setQueuedBuildCount((int) cntQueued);
}
}