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 2019/03/15 17:35:00 UTC
[ignite-teamcity-bot] branch master updated (6a81b8d -> 69f562f)
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git.
from 6a81b8d Visa days base reduced to be 21 days.
new 0d652d0 VCS changes state extracted to be standalone class.
new 69f562f Code cleanup for statistics and parameters
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/ignite/ci/analysis/RunStat.java | 11 +----
.../teamcity/ignited/buildtype/BuildTypeDao.java | 4 +-
.../ignited/buildtype/ParametersCompacted.java | 49 ++++++++++------------
.../ignited/fatbuild/FatBuildCompacted.java | 5 +--
.../ignited/fatbuild/StatisticsCompacted.java | 46 ++++++++++----------
.../ignited/runhist/ChangesState.java} | 22 ++++------
.../ci/teamcity/ignited/runhist/Invocation.java | 21 +++++++---
.../teamcity/ignited/runhist/RunHistCompacted.java | 4 +-
.../ignite/ci/issue/DetectingFailureTest.java | 5 ++-
9 files changed, 77 insertions(+), 90 deletions(-)
copy ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/{analysis/mode/ProcessLogsMode.java => teamcity/ignited/runhist/ChangesState.java} (76%)
[ignite-teamcity-bot] 02/02: Code cleanup for statistics and
parameters
Posted by dp...@apache.org.
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
commit 69f562f65bae687ac8288cbdedb3cfa88e657e6a
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Fri Mar 15 20:06:19 2019 +0300
Code cleanup for statistics and parameters
---
.../teamcity/ignited/buildtype/BuildTypeDao.java | 4 +-
.../ignited/buildtype/ParametersCompacted.java | 49 ++++++++++------------
.../ignited/fatbuild/FatBuildCompacted.java | 5 +--
.../ignited/fatbuild/StatisticsCompacted.java | 46 ++++++++++----------
.../ci/teamcity/ignited/runhist/Invocation.java | 2 +
5 files changed, 49 insertions(+), 57 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/buildtype/BuildTypeDao.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/buildtype/BuildTypeDao.java
index 1772370..124a874 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/buildtype/BuildTypeDao.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/buildtype/BuildTypeDao.java
@@ -142,10 +142,10 @@ public class BuildTypeDao {
*/
public List<BuildTypeCompacted> compositeBuildTypesCompacted(int srvIdMaskHigh, @Nullable String projectId) {
final int nameId = compactor.getStringId("buildConfigurationType");
- final int valueId = compactor.getStringId("COMPOSITE");
+ final int valId = compactor.getStringId("COMPOSITE");
return buildTypesCompactedStream(srvIdMaskHigh, projectId)
- .filter(bt -> bt.settings().findPropertyStringId(nameId) == valueId)
+ .filter(bt -> bt.settings().findPropertyStringId(nameId) == valId)
.collect(Collectors.toList());
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/buildtype/ParametersCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/buildtype/ParametersCompacted.java
index bf6f65e..ebac6b9 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/buildtype/ParametersCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/buildtype/ParametersCompacted.java
@@ -46,61 +46,56 @@ public class ParametersCompacted {
keys = new GridIntList(size);
values = new GridIntList(size);
for (Property next : ref) {
- final String name = next.name();
+ String name = next.name();
if (Strings.isNullOrEmpty(name))
continue;
- final String value = next.getValue();
- if (Strings.isNullOrEmpty(value))
+ String strVal = next.getValue();
+ if (Strings.isNullOrEmpty(strVal))
continue;
- final int val = compactor.getStringId(value);
- final int stringId = compactor.getStringId(name);
- keys.add(stringId);
+ int val = compactor.getStringId(strVal);
+ int strId = compactor.getStringId(name);
+
+ keys.add(strId);
values.add(val);
}
}
public Parameters toParameters(IStringCompactor compactor) {
- List<Property> properties = null;
+ List<Property> props = null;
- if (keys.size() > 0) {
- properties = new ArrayList<>();
+ if (!keys.isEmpty()) {
+ props = new ArrayList<>();
final int size = keys.size();
for (int i = 0; i < size && i < values.size(); i++) {
final int nameid = keys.get(i);
String name = compactor.getStringFromId(nameid);
- String value = compactor.getStringFromId(values.get(i));
+ String val = compactor.getStringFromId(values.get(i));
- properties.add(new Property(name, value));
+ props.add(new Property(name, val));
}
}
- return new Parameters(properties);
+ return new Parameters(props);
}
- public int findPropertyStringId(int propertyCode) {
- int value = -1;
-
- if (keys != null) {
- final int size = keys.size();
-
- for (int i = 0; i < size; i++) {
- final int nameid = keys.get(i);
+ public int findPropertyStringId(int propCode) {
+ if (keys == null)
+ return -1;
- if (nameid != propertyCode)
- continue;
+ final int size = keys.size();
- if (i >= values.size())
- break;
+ for (int i = 0; i < size; i++) {
+ int nameid = keys.get(i);
- value = values.get(i);
- }
+ if (nameid == propCode)
+ return i < values.size() ? values.get(i) : -1;
}
- return value;
+ return -1;
}
/** {@inheritDoc} */
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java
index 6053274..8f85c3d 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java
@@ -596,7 +596,7 @@ public class FatBuildCompacted extends BuildRefCompacted implements IVersionedEn
}
return new Invocation(getId())
- .withStatus((byte)failCode)
+ .withStatus(failCode)
.withStartDate(getStartDateTs())
.withChanges(changes());
}
@@ -615,8 +615,7 @@ public class FatBuildCompacted extends BuildRefCompacted implements IVersionedEn
/**
* @return revisions list or null if revisions was not reported by TC/for older build versions in DB.
*/
- @Nullable
- public List<RevisionCompacted> revisions() {
+ @Nullable public List<RevisionCompacted> revisions() {
if (revisions == null)
return null;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/StatisticsCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/StatisticsCompacted.java
index 52f1e91..05e259a 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/StatisticsCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/StatisticsCompacted.java
@@ -18,6 +18,7 @@
package org.apache.ignite.ci.teamcity.ignited.fatbuild;
import com.google.common.base.Strings;
+import java.util.List;
import org.apache.ignite.ci.tcmodel.conf.bt.Property;
import org.apache.ignite.ci.tcmodel.result.stat.Statistics;
import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
@@ -26,8 +27,6 @@ import org.apache.ignite.internal.util.GridLongList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.List;
-
public class StatisticsCompacted {
/** Logger. */
private static final Logger logger = LoggerFactory.getLogger(StatisticsCompacted.class);
@@ -39,32 +38,32 @@ public class StatisticsCompacted {
}
public StatisticsCompacted(IStringCompactor compactor, Statistics statistics) {
- final List<Property> properties = statistics.properties();
- final int size = properties.size();
+ final List<Property> props = statistics.properties();
+ final int size = props.size();
keys = new GridIntList(size);
values = new GridLongList(size);
- int idx = 0;
- for (Property next : properties) {
+
+ for (Property next : props) {
final String name = next.name();
if (Strings.isNullOrEmpty(name))
continue;
- final String value = next.getValue();
- if (Strings.isNullOrEmpty(value))
+ final String valStr = next.getValue();
+ if (Strings.isNullOrEmpty(valStr))
continue;
+
final long val;
try {
- val = Long.parseLong(value);
+ val = Long.parseLong(valStr);
} catch (Exception e) {
logger.error("Statistics value is not numeric " + name + " skipped " + e.getMessage(), e);
continue;
}
- final int stringId = compactor.getStringId(name);
+ final int strId = compactor.getStringId(name);
- keys.add(stringId);
+ keys.add(strId);
values.add(val);
- idx++;
}
}
@@ -73,29 +72,26 @@ public class StatisticsCompacted {
if (buildDurationId == null)
return null;
- long value = findPropertyValue(buildDurationId);
+ long val = findPropertyValue(buildDurationId);
- if (value < 0) return null;
+ if (val < 0) return null;
- return value;
+ return val;
}
- private long findPropertyValue(int propertyCode) {
+ private long findPropertyValue(int propCode) {
+ if (keys == null)
+ return -1L;
+
final int size = keys.size();
- long value = -1;
for (int i = 0; i < size; i++) {
final int nameid = keys.get(i);
- if (nameid != propertyCode)
- continue;
-
- if (i >= values.size())
- break;
-
- value = values.get(i);
+ if (nameid == propCode)
+ return i < values.size() ? values.get(i) : -1;
}
- return value;
+ return -1L;
}
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
index 0a5c67e..d64b540 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
@@ -36,11 +36,13 @@ public class Invocation {
/** Build id. */
private int buildId;
+
/** Status: An integer (actually byte) code from RunStat.RunStatus */
private byte status;
/** Change present: 0 - no changes, 1 - changes present, 2- unknown */
private byte changePresent;
+
/** Build Start date as timestamp. */
private long startDate;
[ignite-teamcity-bot] 01/02: VCS changes state extracted to be
standalone class.
Posted by dp...@apache.org.
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
commit 0d652d04957e052efb4c219699a284176248ef5f
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Fri Mar 15 19:48:39 2019 +0300
VCS changes state extracted to be standalone class.
---
.../org/apache/ignite/ci/analysis/RunStat.java | 11 +--------
.../ci/teamcity/ignited/runhist/ChangesState.java | 27 ++++++++++++++++++++++
.../ci/teamcity/ignited/runhist/Invocation.java | 19 ++++++++++-----
.../teamcity/ignited/runhist/RunHistCompacted.java | 4 ++--
.../ignite/ci/issue/DetectingFailureTest.java | 5 ++--
5 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java
index d8dd61c..5d388eb 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java
@@ -33,6 +33,7 @@ import org.apache.ignite.ci.issue.EventTemplate;
import org.apache.ignite.ci.tcmodel.result.Build;
import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrence;
import org.apache.ignite.ci.teamcity.ignited.IRunHistory;
+import org.apache.ignite.ci.teamcity.ignited.runhist.ChangesState;
import org.jetbrains.annotations.NotNull;
import static org.apache.ignite.ci.analysis.RunStat.RunStatus.RES_CRITICAL_FAILURE;
@@ -362,16 +363,6 @@ public class RunStat implements IRunHistory {
}
}
- /** Changes state for run. */
- public enum ChangesState {
- /** Unknown number of changes for run. */
- UNKNOWN,
- /** Run without changes. */
- NONE,
- /** Run with changes. */
- EXIST
- }
-
/**
* Run info for storage in cache.
*/
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/ChangesState.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/ChangesState.java
new file mode 100644
index 0000000..13a0257
--- /dev/null
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/ChangesState.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.ci.teamcity.ignited.runhist;
+
+/** Changes state for run. */
+public enum ChangesState {
+ /** Unknown number of changes for run. */
+ UNKNOWN,
+ /** Run without changes. */
+ NONE,
+ /** Run with changes. */
+ EXIST
+}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
index 5d294ba..0a5c67e 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
@@ -20,15 +20,18 @@ package org.apache.ignite.ci.teamcity.ignited.runhist;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
-import org.apache.ignite.ci.analysis.RunStat;
/**
* Run history element: invocation of build or test.
*/
public class Invocation {
- /** Change not filled. */
+ /** VCS Change not filled. */
public static final int CHANGE_NOT_FILLED = 2;
+
+ /** VCS Change present. */
public static final int CHANGE_PRESENT = 1;
+
+ /** No changes in VCS. */
public static final int NO_CHANGES = 0;
/** Build id. */
@@ -41,6 +44,10 @@ public class Invocation {
/** Build Start date as timestamp. */
private long startDate;
+ /**
+ * Creates invocation.
+ * @param buildId Build id.
+ */
public Invocation(Integer buildId) {
this.buildId = buildId;
this.changePresent = CHANGE_NOT_FILLED;
@@ -84,13 +91,13 @@ public class Invocation {
return this;
}
- public RunStat.ChangesState changesState() {
+ public ChangesState changesState() {
if (changePresent == NO_CHANGES)
- return RunStat.ChangesState.NONE;
+ return ChangesState.NONE;
else if (changePresent == CHANGE_PRESENT)
- return RunStat.ChangesState.EXIST;
+ return ChangesState.EXIST;
else
- return RunStat.ChangesState.UNKNOWN;
+ return ChangesState.UNKNOWN;
}
public boolean isFailure() {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
index 8f3ef33..73e7e21 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
@@ -97,8 +97,8 @@ public class RunHistCompacted implements IVersionedEntity, IRunHistory {
for (Invocation cur : latestRuns) {
if (prev != null && cur != null) {
if (prev.status() != cur.status()
- && cur.changesState() == RunStat.ChangesState.NONE
- && prev.changesState() != RunStat.ChangesState.UNKNOWN)
+ && cur.changesState() == ChangesState.NONE
+ && prev.changesState() != ChangesState.UNKNOWN)
statusChange++;
}
prev = cur;
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/issue/DetectingFailureTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/issue/DetectingFailureTest.java
index 14496df..8797812 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/issue/DetectingFailureTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/issue/DetectingFailureTest.java
@@ -17,13 +17,14 @@
package org.apache.ignite.ci.issue;
+import org.apache.ignite.ci.teamcity.ignited.runhist.ChangesState;
import org.apache.ignite.ci.analysis.RunStat;
import org.apache.ignite.ci.tcmodel.result.Build;
import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrence;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
-import static org.apache.ignite.ci.analysis.RunStat.ChangesState.UNKNOWN;
+import static org.apache.ignite.ci.teamcity.ignited.runhist.ChangesState.UNKNOWN;
import static org.apache.ignite.ci.tcmodel.result.tests.TestOccurrence.STATUS_SUCCESS;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -105,7 +106,7 @@ public class DetectingFailureTest {
for (int i = 0; i < 50; i++) {
occurrence.status = ints[i] == 0 ? Build.STATUS_SUCCESS : "FAILURE";
- stat.addTestRunToLatest(occurrence.setId(fakeTestId(100 + i)), RunStat.ChangesState.NONE);
+ stat.addTestRunToLatest(occurrence.setId(fakeTestId(100 + i)), ChangesState.NONE);
}
occurrence.status = "FAILED";