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/13 15:02:20 UTC
[ignite-teamcity-bot] branch master updated: Removal of entry which
caused duplication of messages
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 520228e Removal of entry which caused duplication of messages
520228e is described below
commit 520228ed2311fc9ddb9fa9135b2bafa999c3fb06
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Nov 13 18:02:15 2018 +0300
Removal of entry which caused duplication of messages
---
.../org/apache/ignite/ci/observer/BuildsInfo.java | 12 +--
.../ignite/ci/observer/CompactBuildsInfo.java | 105 +++++++++++++++++++--
.../ignite/ci/runners/RemoteClientTmpHelper.java | 38 ++++++--
.../org/apache/ignite/ci/web/model/Version.java | 2 +-
.../ci/web/model/hist/VisasHistoryStorage.java | 2 +-
5 files changed, 135 insertions(+), 24 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/BuildsInfo.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/BuildsInfo.java
index 4366fd4..7117169 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/BuildsInfo.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/BuildsInfo.java
@@ -65,12 +65,12 @@ public class BuildsInfo {
/** */
public BuildsInfo(CompactBuildsInfo buildsInfo, IStringCompactor strCompactor) {
- this.userName = strCompactor.getStringFromId(buildsInfo.userName);
- this.date = buildsInfo.date;
- this.srvId = strCompactor.getStringFromId(buildsInfo.srvId);
- this.ticket = strCompactor.getStringFromId(buildsInfo.ticket);
- this.branchForTc = strCompactor.getStringFromId(buildsInfo.branchForTc);
- this.buildTypeId = strCompactor.getStringFromId(buildsInfo.buildTypeId);
+ this.userName = strCompactor.getStringFromId(buildsInfo.userName());
+ this.date = buildsInfo.date();
+ this.srvId = strCompactor.getStringFromId(buildsInfo.srvId());
+ this.ticket = strCompactor.getStringFromId(buildsInfo.ticket());
+ this.branchForTc = strCompactor.getStringFromId(buildsInfo.branchForTc());
+ this.buildTypeId = strCompactor.getStringFromId(buildsInfo.buildTypeId());
this.finishedBuilds.putAll(buildsInfo.getFinishedBuilds());
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/CompactBuildsInfo.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/CompactBuildsInfo.java
index 863ce23..c07f05a 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/CompactBuildsInfo.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/CompactBuildsInfo.java
@@ -22,7 +22,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
-
import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
/**
@@ -30,26 +29,30 @@ import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
*/
public class CompactBuildsInfo {
/** */
- public final int userName;
+ private int userName;
/** Server id. */
- public final int srvId;
+ private int srvId;
/** Build type id. */
- public final int buildTypeId;
+ private int buildTypeId;
/** Branch name. */
- public final int branchForTc;
+ private int branchForTc;
/** JIRA ticket full name. */
- public final int ticket;
+ private int ticket;
/** */
- public final Date date;
+ private Date date;
/** Finished builds. */
private final Map<Integer, Boolean> finishedBuilds = new HashMap<>();
+ public CompactBuildsInfo() {
+
+ }
+
/** */
public CompactBuildsInfo(BuildsInfo buildsInfo, IStringCompactor strCompactor) {
this.userName = strCompactor.getStringId(buildsInfo.userName);
@@ -71,6 +74,62 @@ public class CompactBuildsInfo {
return new BuildsInfo(this, compactor);
}
+ /**
+ * @return Server id.
+ */
+ public int serverId() {
+ return srvId;
+ }
+
+ /**
+ * @param srvId New server id.
+ */
+ public void serverId(int srvId) {
+ this.srvId = srvId;
+ }
+
+ /**
+ * @return Build type id.
+ */
+ public int buildTypeId() {
+ return buildTypeId;
+ }
+
+ /**
+ * @param buildTypeId New build type id.
+ */
+ public void buildTypeId(int buildTypeId) {
+ this.buildTypeId = buildTypeId;
+ }
+
+ /**
+ * @return Branch name.
+ */
+ public int branchForTc() {
+ return branchForTc;
+ }
+
+ /**
+ * @param branchForTc New branch name.
+ */
+ public void branchForTc(int branchForTc) {
+ this.branchForTc = branchForTc;
+ }
+
+ /**
+ * @return JIRA ticket full name.
+ */
+ public int ticket() {
+ return ticket;
+ }
+
+ /**
+ * @param ticket New jIRA ticket full name.
+ */
+ public void ticket(int ticket) {
+ this.ticket = ticket;
+ }
+
/** {@inheritDoc} */
@Override public boolean equals(Object o) {
if (this == o)
@@ -93,4 +152,36 @@ public class CompactBuildsInfo {
@Override public int hashCode() {
return Objects.hash(srvId, buildTypeId, branchForTc, ticket, finishedBuilds.keySet(), date);
}
+
+ public void userName(int val) {
+ this.userName = val;
+ }
+
+ public void date(long ts) {
+ this.date = new Date(ts);
+ }
+
+ public int userName() {
+ return userName;
+ }
+
+ public Date date() {
+ return date;
+ }
+
+ public int srvId() {
+ return srvId;
+ }
+
+ public void srvId(int srvId) {
+ this.srvId = srvId;
+ }
+
+ public void addBuild(int... arr) {
+ for (int i = 0; i < arr.length; i++) {
+ int i1 = arr[i];
+
+ finishedBuilds.put(i1, false);
+ }
+ }
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/RemoteClientTmpHelper.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/RemoteClientTmpHelper.java
index 9c40870..9e37c79 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/RemoteClientTmpHelper.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/RemoteClientTmpHelper.java
@@ -25,6 +25,8 @@ import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
+import org.apache.ignite.ci.observer.CompactBuildsInfo;
+import org.apache.ignite.ci.observer.ObserverTask;
import org.apache.ignite.ci.teamcity.ignited.BuildRefCompacted;
import org.apache.ignite.ci.teamcity.ignited.BuildRefDao;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnited;
@@ -72,19 +74,37 @@ public class RemoteClientTmpHelper {
}
}
}
- IgniteCache<Long, FatBuildCompacted> cache1 = ignite.cache(FatBuildDao.TEAMCITY_FAT_BUILD_CACHE_NAME);
+ if(false) {
+ IgniteCache<Long, FatBuildCompacted> cache1 = ignite.cache(FatBuildDao.TEAMCITY_FAT_BUILD_CACHE_NAME);
- int apache = ITeamcityIgnited.serverIdToInt("apache");
+ int apache = ITeamcityIgnited.serverIdToInt("apache");
- int id = 2200135;
- int id1 = 2200209;
- dumpFatBuild(cache1, apache, id);
- dumpFatBuild(cache1, apache, id1);
+ int id = 2200135;
+ int id1 = 2200209;
+ dumpFatBuild(cache1, apache, id);
+ dumpFatBuild(cache1, apache, id1);
+ IgniteCache<Long, BuildRefCompacted> cache2 = ignite.cache(BuildRefDao.TEAMCITY_BUILD_CACHE_NAME);
+ dumpBuildRef(cache2, apache, id);
+ dumpBuildRef(cache2, apache, id1);
+ }
+
+ IgniteCache<CompactBuildsInfo, Object> cache = ignite.cache(ObserverTask.BUILDS_CACHE_NAME);
+
+ CompactBuildsInfo cbi = new CompactBuildsInfo();
+
+
+ cbi.userName(253483);
+ cbi.srvId(245001);
+ cbi.buildTypeId(113);
+ cbi.branchForTc(231783);
+ cbi.ticket(253484);
+ cbi.date(1542027258436l);
- IgniteCache<Long, BuildRefCompacted> cache2 = ignite.cache(BuildRefDao.TEAMCITY_BUILD_CACHE_NAME);
- dumpBuildRef(cache2, apache, id);
- dumpBuildRef(cache2, apache, id1);
+ cbi.addBuild(2300387, 2300395, 2300385, 2300393, 2300391, 2300389);
+ boolean remove = cache.remove(cbi);
+ Preconditions.checkState(remove, "can't remove " + cbi);
+ //"finishedBuilds":{"2300387":false,"2300395":false,"2300385":false,"2300393":false,"2300391":false,"2300389":false}
ignite.close();
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
index 690f572..44c1aa1 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
@@ -23,7 +23,7 @@ package org.apache.ignite.ci.web.model;
public static final String GITHUB_REF = "https://github.com/apache/ignite-teamcity-bot";
/** TC Bot Version. */
- public static final String VERSION = "20181112";
+ public static final String VERSION = "20181113";
/** TC Bot Version. */
public String version = VERSION;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/VisasHistoryStorage.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/VisasHistoryStorage.java
index d211c40..9a50296 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/VisasHistoryStorage.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/VisasHistoryStorage.java
@@ -76,7 +76,7 @@ public class VisasHistoryStorage {
if (contributionVisas == null)
contributionVisas = new HashMap<>();
- contributionVisas.put(compactVisaReq.compactInfo.date, compactVisaReq);
+ contributionVisas.put(compactVisaReq.compactInfo.date(), compactVisaReq);
visas().put(key, contributionVisas);
}