This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10372
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-10372 by this push:
new 53fe393 IGNITE-10372 Optimize master trends page step 3: Tests fixed,
now data is shown correctly
53fe393 is described below
commit 53fe3939b3c02d5e1e5c8026f68cbac16482285d
Author: Dmitriy Pavlov <[email protected]>
AuthorDate: Thu Nov 22 21:57:12 2018 +0300
IGNITE-10372 Optimize master trends page step 3: Tests fixed, now data is
shown correctly
---
.../main/java/org/apache/ignite/ci/ITeamcity.java | 4 ---
.../apache/ignite/ci/IgnitePersistentTeamcity.java | 18 ----------
.../apache/ignite/ci/IgniteTeamcityConnection.java | 9 -----
.../java/org/apache/ignite/ci/db/DbMigrations.java | 4 +--
.../ci/tcbot/trends/MasterTrendsService.java | 4 ++-
.../ci/web/rest/build/GetBuildTestFailures.java | 38 ----------------------
6 files changed, 5 insertions(+), 72 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
index 8be2cf6..a50ab94 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
@@ -78,10 +78,6 @@ public interface ITeamcity extends ITeamcityConn {
return "app/rest/latest/builds/id:" + id;
}
-
- @Deprecated
- CompletableFuture<TestRef> getTestRef(FullQueryParams key);
-
/**
* List of build's related issues.
*
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
index 02efe12..bce9cc5 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
@@ -90,7 +90,6 @@ public class IgnitePersistentTeamcity implements
IAnalyticsEnabledTeamcity, ITea
private static final String ISSUES_USAGES_LIST = "issuesUsagesList";
public static final String BOT_DETECTED_ISSUES = "botDetectedIssues";
- public static final String TEST_REFS = "testRefs";
//todo need separate cache or separate key for 'execution time' because it
is placed in statistics
private static final String BUILDS_FAILURE_RUN_STAT =
"buildsFailureRunStat";
@@ -177,13 +176,6 @@ public class IgnitePersistentTeamcity implements
IAnalyticsEnabledTeamcity, ITea
return getOrCreateCacheV2(ignCacheNme(BUILDS));
}
- /**
- * @return {@link TestRef} instances cache, 32 parts.
- */
- private IgniteCache<String, TestRef> testRefsCache() {
- return getOrCreateCacheV2(ignCacheNme(TEST_REFS));
- }
-
/** {@inheritDoc} */
@AutoProfiling
@Override public CompletableFuture<List<BuildType>>
getProjectSuites(String projectId) {
@@ -413,16 +405,6 @@ public class IgnitePersistentTeamcity implements
IAnalyticsEnabledTeamcity, ITea
}
}
- /** {@inheritDoc} */
- @AutoProfiling
- @Override public CompletableFuture<TestRef> getTestRef(FullQueryParams
key) {
- return CacheUpdateUtil.loadAsyncIfAbsent(
- testRefsCache(),
- key.toString(),
- testRefsFutures,
- k -> teamcity.getTestRef(key));
- }
-
@AutoProfiling
@Override public IssuesUsagesList getIssuesUsagesList(String href) {
IssuesUsagesList issuesUsages = loadIfAbsentV2(ISSUES_USAGES_LIST,
href, href1 -> {
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityConnection.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityConnection.java
index b1089ab..fbec0a5 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityConnection.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgniteTeamcityConnection.java
@@ -462,15 +462,6 @@ public class IgniteTeamcityConnection implements ITeamcity
{
return getJaxbUsingHref(href, Build.class);
}
-
- /** {@inheritDoc} */
- @AutoProfiling
- @Override public CompletableFuture<TestRef> getTestRef(FullQueryParams
key) {
- return supplyAsync(() -> {
- return getJaxbUsingHref("app/rest/latest/tests/name:" +
key.getTestName(), TestRef.class);
- }, executor);
- }
-
/** {@inheritDoc} */
@AutoProfiling
@Override public IssuesUsagesList getIssuesUsagesList(String href) {
return getJaxbUsingHref(href, IssuesUsagesList.class); }
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/DbMigrations.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/DbMigrations.java
index 48188e4..8ead279 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/DbMigrations.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/DbMigrations.java
@@ -114,10 +114,9 @@ public class DbMigrations {
String CONFIGURATIONS = "configurations";
String TESTS_OCCURRENCES = "testOccurrences";
String TESTS = "tests";
+ String TEST_REFS = "testRefs";
}
- public static final int SUITES_CNT = 100;
-
private final Ignite ignite;
private final String serverId;
private IgniteCache<String, Object> doneMigrations;
@@ -395,6 +394,7 @@ public class DbMigrations {
applyDestroyIgnCacheMigration(Old.CONFIGURATIONS);
applyDestroyIgnCacheMigration(Old.TESTS_OCCURRENCES);
+ applyDestroyIgnCacheMigration(Old.TEST_REFS);
}
private void applyDestroyIgnCacheMigration(String cacheName) {
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trends/MasterTrendsService.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trends/MasterTrendsService.java
index 4eaf51a..64cb544 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trends/MasterTrendsService.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trends/MasterTrendsService.java
@@ -59,7 +59,9 @@ public class MasterTrendsService {
@AutoProfiling
public BuildStatisticsSummary getBuildSummary(ITeamcityIgnited ignited,
int buildId) {
String msg = "Loading build [" + buildId + "] summary";
- System.out.println(msg);
+
+ if (DEBUG)
+ System.out.println(msg);
BuildStatisticsSummary buildsStatistic = new
BuildStatisticsSummary(buildId);
initialize(buildsStatistic, ignited);
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java
index e8c312f..f0df8f8 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java
@@ -163,44 +163,6 @@ public class GetBuildTestFailures {
return res;
}
- @GET
- @Produces(MediaType.TEXT_PLAIN)
- @Path("testRef")
- @Deprecated
- public String getTestRef(
- @NotNull @QueryParam("testName") String name,
- @NotNull @QueryParam("suiteName") String suiteName,
- @Nullable @QueryParam("server") String srv,
- @Nullable @QueryParam("projectId") String projectId)
- throws InterruptedException, ExecutionException,
ServiceUnauthorizedException {
- final ITcHelper helper = CtxListener.getTcHelper(ctx);
-
- final ICredentialsProv prov = ICredentialsProv.get(req);
-
- String project = projectId == null ? "IgniteTests24Java8" : projectId;
-
- String srvId = srv == null ? "apache" : srv;
-
- if (!prov.hasAccess(srvId))
- throw ServiceUnauthorizedException.noCreds(srvId);
-
- IAnalyticsEnabledTeamcity teamcity = helper.server(srvId, prov);
-
- FullQueryParams key = new FullQueryParams();
-
- key.setTestName(name);
- key.setProjectId(project);
- key.setServerId(srvId);
- key.setSuiteId(suiteName);
-
- CompletableFuture<TestRef> ref = teamcity.getTestRef(key);
-
- return ref.isDone() && !ref.isCompletedExceptionally() ?
teamcity.host() + "project.html?"
- + "projectId=" + project
- + "&testNameId=" + ref.get().id
- + "&tab=testDetails" : null;
- }
-
/**
* Mark builds as "valid" or "invalid".
*
