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/11/16 12:01:31 UTC
[ignite-teamcity-bot] branch ignite-10243 updated: IGNITE-10243
Cancelled runAll display as valid in PRs table,
removal of uncompressed method
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10243
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-10243 by this push:
new bc383e3 IGNITE-10243 Cancelled runAll display as valid in PRs table, removal of uncompressed method
bc383e3 is described below
commit bc383e3a4c391b6fd1914f146a0cd4ba87cd181c
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Fri Nov 16 15:01:29 2018 +0300
IGNITE-10243 Cancelled runAll display as valid in PRs table, removal of uncompressed method
---
.../ci/teamcity/ignited/BuildRefCompacted.java | 4 ++++
.../ignite/ci/teamcity/ignited/BuildRefDao.java | 10 ++++++++
.../ci/teamcity/ignited/ITeamcityIgnited.java | 11 ---------
.../ci/teamcity/ignited/TeamcityIgnitedImpl.java | 14 -----------
.../ignited/IgnitedTcInMemoryIntegrationTest.java | 28 ++++++++++------------
5 files changed, 27 insertions(+), 40 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/BuildRefCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/BuildRefCompacted.java
index 61f984a..87535a0 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/BuildRefCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/BuildRefCompacted.java
@@ -187,4 +187,8 @@ public class BuildRefCompacted {
.add("state", state)
.toString();
}
+
+ public String state(IStringCompactor compactor) {
+ return compactor.getStringFromId(state());
+ }
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/BuildRefDao.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/BuildRefDao.java
index 7986799..42dae11 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/BuildRefDao.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/BuildRefDao.java
@@ -39,6 +39,9 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.util.GridIntList;
import org.jetbrains.annotations.NotNull;
+/**
+ *
+ */
public class BuildRefDao {
/** Cache name */
public static final String TEAMCITY_BUILD_CACHE_NAME = "teamcityBuildRef";
@@ -120,6 +123,9 @@ public class BuildRefDao {
return (long)buildId | srvId << 32;
}
+ /**
+ * @param cacheKey Cache key.
+ */
public static int cacheKeyToBuildId(Long cacheKey) {
long l = cacheKey << 32;
return (int) (l>>32);
@@ -168,6 +174,10 @@ public class BuildRefDao {
.collect(Collectors.toList());
}
+ /**
+ * @param srvId Server id.
+ * @param branchName Branch name.
+ */
@AutoProfiling
@GuavaCached(softValues = true, maximumSize = 1000, expireAfterAccessSecs = 30)
public List<BuildRefCompacted> getBuildsForBranch(int srvId, String branchName) {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/ITeamcityIgnited.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/ITeamcityIgnited.java
index c6291d8..02682ee 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/ITeamcityIgnited.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/ITeamcityIgnited.java
@@ -53,17 +53,6 @@ public interface ITeamcityIgnited {
@Nullable String branchName);
/**
- * Retun all builds for branch and suite, without relation to its status.
- *
- * @param buildTypeId Build type identifier.
- * @param branchName Branch name.
- * @return list of builds in history, includes all statuses: queued, running, etc
- */
- public List<BuildRef> getAllBuildsHistory(
- @Nullable String buildTypeId,
- @Nullable String branchName);
-
- /**
* Return all builds for branch and suite with finish status.
*
* @param buildTypeId Build type identifier.
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
index d2ed26d..9f40f87 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
@@ -268,20 +268,6 @@ public class TeamcityIgnitedImpl implements ITeamcityIgnited {
/** {@inheritDoc} */
@AutoProfiling
- @Override public List<BuildRef> getAllBuildsHistory(
- @Nullable String buildTypeId,
- @Nullable String branchName) {
- ensureActualizeRequested();
-
- String bracnhNameQry = branchForQuery(branchName);
-
- return buildRefDao.findBuildsInHistoryCompacted(srvIdMaskHigh, buildTypeId, bracnhNameQry)
- .stream().map(compacted -> compacted.toBuildRef(compactor))
- .collect(Collectors.toList());
- }
-
- /** {@inheritDoc} */
- @AutoProfiling
@Override public List<BuildRefCompacted> getAllBuildsCompacted(
@Nullable String buildTypeId,
@Nullable String branchName) {
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
index 5c2c41a..d3c2046 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.ignite.ci.teamcity.ignited;
+
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -89,7 +90,6 @@ public class IgnitedTcInMemoryIntegrationTest {
final TcpDiscoverySpi spi = new TcpDiscoverySpi();
int locPort = TEST_IGNITE_PORT;
-
spi.setLocalPort(locPort);
spi.setLocalPortRange(1);
spi.setIpFinder(new TcHelperDb.LocalOnlyTcpDiscoveryIpFinder(locPort));
@@ -162,7 +162,6 @@ public class IgnitedTcInMemoryIntegrationTest {
);
}
-
@Test
public void incrementalActualizationOfBuildsContainsQueued() throws IOException {
ITeamcityHttpConnection http = Mockito.mock(ITeamcityHttpConnection.class);
@@ -208,12 +207,14 @@ public class IgnitedTcInMemoryIntegrationTest {
});
ITeamcityIgnited srv = injector.getInstance(ITeamcityIgnitedProvider.class).server(APACHE, creds());
+ IStringCompactor compactor = injector.getInstance(IStringCompactor.class);
TeamcityIgnitedImpl teamcityIgnited = (TeamcityIgnitedImpl)srv;
teamcityIgnited.fullReindex();
String buildTypeId = "IgniteTests24Java8_RunAll";
String branchName = "<default>";
- List<String> statues = srv.getAllBuildsHistory(buildTypeId, branchName).stream().map(BuildRef::state).distinct().collect(Collectors.toList());
+ List<String> statues = srv.getAllBuildsCompacted(buildTypeId, branchName)
+ .stream().map((t) -> t.state(compactor)).distinct().collect(Collectors.toList());
System.out.println("Before " + statues);
for (int i = queuedBuildIdx; i < tcBuilds.size(); i++)
@@ -221,25 +222,23 @@ public class IgnitedTcInMemoryIntegrationTest {
teamcityIgnited.actualizeRecentBuildRefs();
-
- List<BuildRef> hist = srv.getAllBuildsHistory(buildTypeId, branchName);
+ List<BuildRefCompacted> hist = srv.getAllBuildsCompacted(buildTypeId, branchName);
assertTrue(!hist.isEmpty());
- for (BuildRef h : hist) {
- assertEquals(buildTypeId, h.suiteId());
+ for (BuildRefCompacted h : hist) {
+ assertEquals(buildTypeId, h.buildTypeId(compactor));
- assertEquals("refs/heads/master", h.branchName());
+ assertEquals("refs/heads/master", h.branchName(compactor));
- assertTrue("Build " + h + " is expected to be finished" , h.isFinished());
+ assertTrue("Build " + h + " is expected to be finished", h.isFinished(compactor));
}
- statues = hist.stream().map(BuildRef::state).distinct().collect(Collectors.toList());
+ statues = hist.stream().map((t) -> t.state(compactor)).distinct().collect(Collectors.toList());
System.out.println("After " + statues);
}
-
/**
*
*/
@@ -274,7 +273,7 @@ public class IgnitedTcInMemoryIntegrationTest {
int srvIdMaskHigh = ITeamcityIgnited.serverIdToInt(APACHE);
List<TestOccurrencesFull> occurrences = Collections.singletonList(testsRef);
FatBuildCompacted buildCompacted = stor.saveBuild(srvIdMaskHigh, refBuild.getId(), refBuild, occurrences,
- problemsList.getProblemsNonNull(), statistics, changesList, null);
+ problemsList.getProblemsNonNull(), statistics, changesList, null);
assertNotNull(buildCompacted);
FatBuildCompacted fatBuild = stor.getFatBuild(srvIdMaskHigh, 2153237);
@@ -305,7 +304,6 @@ public class IgnitedTcInMemoryIntegrationTest {
Set<String> testNamesAct = new TreeSet<>();
testsAct.getTests().forEach(testOccurrence -> testNamesAct.add(testOccurrence.name));
-
Set<String> testNamesRef = new TreeSet<>();
testsRef.getTests().forEach(testOccurrence -> testNamesRef.add(testOccurrence.name));
assertEquals(testNamesRef, testNamesAct);
@@ -319,7 +317,7 @@ public class IgnitedTcInMemoryIntegrationTest {
Long duration = buildCompacted.buildDuration(compactor);
assertNotNull(duration);
- assertTrue(duration>10000L);
+ assertTrue(duration > 10000L);
int[] ch = buildCompacted.changes();
@@ -336,7 +334,7 @@ public class IgnitedTcInMemoryIntegrationTest {
public <E> E jaxbTestXml(String ref, Class<E> cls) throws IOException, JAXBException {
E refBuild;
- try(InputStream stream = getClass().getResourceAsStream(ref)) {
+ try (InputStream stream = getClass().getResourceAsStream(ref)) {
refBuild = XmlUtil.load(cls, new InputStreamReader(stream));
}
return refBuild;