[ignite-teamcity-bot] branch master updated: IGNITE-10562 Faster entity save path: TC Bot DB contains invalid values for build references ID maps to value with other ID.

[dpavlov]

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 fd66964  IGNITE-10562 Faster entity save path: TC Bot DB contains 
invalid values for build references ID maps to value with other ID.
fd66964 is described below

commit fd66964c1ea7ce505862fc771625bd9ece829a5d
Author: Dmitriy Pavlov <dpav...@apache.org>
AuthorDate: Thu Dec 6 16:48:46 2018 +0300

    IGNITE-10562 Faster entity save path: TC Bot DB contains invalid values for 
build references ID maps to value with other ID.
---
 .../ci/teamcity/ignited/fatbuild/ProactiveFatBuildSync.java   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git 
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/ProactiveFatBuildSync.java
 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/ProactiveFatBuildSync.java
index 36019d6..8571eb3 100644
--- 
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/ProactiveFatBuildSync.java
+++ 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/ProactiveFatBuildSync.java
@@ -306,8 +306,13 @@ public class ProactiveFatBuildSync {
         if (existingBuild != null && existingBuild.isOutdatedEntityVersion()) {
             int ver = existingBuild.version();
             if (ver == 
FatBuildCompacted.VER_FULL_DATA_BUT_ID_CONFLICTS_POSSIBLE) {
-                if (Objects.equals(buildId, existingBuild.id()))
+                if (Objects.equals(buildId, existingBuild.id())) {
                     existingBuild.setVersion(FatBuildCompacted.LATEST_VERSION);
+
+                    fatBuildDao.putFatBuild(srvIdMask, buildId, existingBuild);
+
+                    return null;
+                }
                 else {
                     logger.warn("Build inconsistency found in the DB, removing 
build " + existingBuild.getId());
 
@@ -375,6 +380,10 @@ public class ProactiveFatBuildSync {
                     tests = 
Collections.singletonList(existingBuild.getTestOcurrences(compactor));
 
                     problems = existingBuild.problems(compactor);
+
+                    //todo extract new parameters or save fat build without XML
+                    // - existingBuild.statistics();
+                    // - int[] changes = existingBuild.changes();
                 }
                 else {
                     build = Build.createFakeStub();