[ignite-teamcity-bot] branch master updated: IGNITE-10071 Background upload of a build and simultaneous bot restart may result in a queued build persisted but actually build is finished - Fixes #55.
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 89a1fa1 IGNITE-10071 Background upload of a build and simultaneous
bot restart may result in a queued build persisted but actually build is
finished - Fixes #55.
89a1fa1 is described below
commit 89a1fa1085b6c288452ac0f04001171a2d1b3213
Author: Dmitriy Pavlov
AuthorDate: Tue Oct 30 21:31:43 2018 +0300
IGNITE-10071 Background upload of a build and simultaneous bot restart may
result in a queued build persisted but actually build is finished - Fixes #55.
Signed-off-by: Dmitriy Pavlov
---
.../ignite/ci/runners/RemoteClientTmpHelper.java | 72 ++
.../ignite/ci/tcbot/chain/BuildChainProcessor.java | 7 +--
.../ci/teamcity/ignited/BuildRefCompacted.java | 11
.../ignite/ci/teamcity/ignited/BuildRefDao.java| 2 +-
.../ci/teamcity/ignited/ITeamcityIgnited.java | 11 +++-
.../ci/teamcity/ignited/TeamcityIgnitedImpl.java | 16 +++--
.../ignited/fatbuild/FatBuildCompacted.java| 19 ++
.../ignited/fatbuild/ProblemCompacted.java | 24 +++-
.../teamcity/ignited/fatbuild/TestCompacted.java | 33 ++
9 files changed, 133 insertions(+), 62 deletions(-)
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 043883a..9c40870 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
@@ -17,20 +17,28 @@
package org.apache.ignite.ci.runners;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
+import java.io.FileWriter;
+import java.io.IOException;
import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
-import org.apache.ignite.ci.IgnitePersistentTeamcity;
-import org.apache.ignite.ci.user.TcHelperUser;
-import org.apache.ignite.ci.user.UserAndSessionsStorage;
+import org.apache.ignite.ci.teamcity.ignited.BuildRefCompacted;
+import org.apache.ignite.ci.teamcity.ignited.BuildRefDao;
+import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnited;
+import org.apache.ignite.ci.teamcity.ignited.IgniteStringCompactor;
+import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildCompacted;
+import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildDao;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.logger.slf4j.Slf4jLogger;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
public class RemoteClientTmpHelper {
+private static boolean dumpDict = false;
+
private static void setupDisco(IgniteConfiguration cfg) {
final TcpDiscoverySpi spi = new TcpDiscoverySpi();
final int locPort = 54433;
@@ -44,7 +52,7 @@ public class RemoteClientTmpHelper {
cfg.setDiscoverySpi(spi);
}
-public static void main(String[] args) {
+public static void main(String[] args) throws IOException {
final IgniteConfiguration cfg = new IgniteConfiguration();
setupDisco(cfg);
@@ -54,36 +62,48 @@ public class RemoteClientTmpHelper {
cfg.setClientMode(true);
final Ignite ignite = Ignition.start(cfg);
-ignite.cluster().active(true);
-
-IgniteCache cache1 =
ignite.cache(UserAndSessionsStorage.USERS);
-for (Cache.Entry next : cache1) {
-System.out.println(next.getKey() + ": " + next.getValue());
-
-if (next.getKey().equals("someusername")) {
-TcHelperUser u = (TcHelperUser)next.getValue();
-u.resetCredentials();
-
-cache1.put(next.getKey(), u);
+if(dumpDict) {
+IgniteCache strings =
ignite.cache(IgniteStringCompactor.STRINGS_CACHE);
+try (FileWriter writer = new FileWriter("Dictionary.txt")) {
+for (Cache.Entry next1 : strings) {
+writer.write(next1.getValue().toString()
++ "\n");
+}
}
}
+IgniteCache cache1 =
ignite.cache(FatBuildDao.TEAMCITY_FAT_BUILD_CACHE_NAME);
-IgniteCache cache =
ignite.cache(IgnitePersistentTeamcity.BOT_DETECTED_ISSUES);
-for (Cache.Entry next : cache) {
-Object key = next.getKey();
-Object value = next.getValue();
+int apache = ITeamcityIgnited.serverIdToInt("apache");
-if
(key.toString().contains("GridCacheLifecycleAwareSelfTest.testLifecycleAware"))
{
-
[ignite-teamcity-bot] branch ignite-10071 updated: IGNITE-10071 Background upload of a build and simultaneous bot restart may result in a queued build persisted but actually build is finished
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10071
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-10071 by this push:
new a49be4d IGNITE-10071 Background upload of a build and simultaneous
bot restart may result in a queued build persisted but actually build is
finished
a49be4d is described below
commit a49be4dd72d25f9a3a07de8c9c271c8ecc86fcbf
Author: Dmitriy Pavlov
AuthorDate: Tue Oct 30 21:26:34 2018 +0300
IGNITE-10071 Background upload of a build and simultaneous bot restart may
result in a queued build persisted but actually build is finished
---
.../ignite/ci/tcbot/chain/BuildChainProcessor.java | 7 +++
.../ignite/ci/teamcity/ignited/ITeamcityIgnited.java | 11 ++-
.../ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java | 16
3 files changed, 25 insertions(+), 9 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
index 1295510..1e8adb6 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
@@ -155,7 +155,6 @@ public class BuildChainProcessor {
return fullChainRunCtx;
}
-
@SuppressWarnings("WeakerAccess")
@AutoProfiling
protected void createCxt(ITeamcityIgnited teamcityIgnited, Map buildsCtxMap,
@@ -200,13 +199,13 @@ public class BuildChainProcessor {
final String branch =
getBranchOrDefault(buildCompacted.branchName(compactor));
final String buildTypeId = buildCompacted.buildTypeId(compactor);
-Stream history =
teamcityIgnited.getBuildHistoryCompacted(buildTypeId, branch)
+Stream hist =
teamcityIgnited.getBuildHistoryCompacted(buildTypeId, branch)
.stream()
.filter(t -> t.isNotCancelled(compactor))
.filter(t -> t.isFinished(compactor));
if (includeLatestRebuild == LatestRebuildMode.LATEST) {
-BuildRefCompacted recentRef =
history.max(Comparator.comparing(BuildRefCompacted::id))
+BuildRefCompacted recentRef =
hist.max(Comparator.comparing(BuildRefCompacted::id))
.orElse(buildCompacted);
return Stream.of(recentRef)
@@ -214,7 +213,7 @@ public class BuildChainProcessor {
}
if (includeLatestRebuild == LatestRebuildMode.ALL) {
-return history
+return hist
.sorted(Comparator.comparing(BuildRefCompacted::id).reversed())
.limit(cntLimit)
.map(b -> builds.computeIfAbsent(b.id(),
teamcityIgnited::getFatBuild));
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 5fea687..cfdaa2e 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
@@ -97,7 +97,16 @@ public interface ITeamcityIgnited {
/**
* @param id Id.
*/
-public FatBuildCompacted getFatBuild(int id);
+public default FatBuildCompacted getFatBuild(int id) {
+return getFatBuild(id, false);
+}
+
+
+
+/**
+ * @param id Id.
+ */
+public FatBuildCompacted getFatBuild(int id, boolean acceptQueued);
public Collection getAllChanges(int[] changeIds);
}
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 67ea0c2..ce05e93 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
@@ -83,6 +83,9 @@ public class TeamcityIgnitedImpl implements ITeamcityIgnited {
/** Changes DAO. */
@Inject private ChangeSync changeSync;
+/** Changes DAO. */
+@Inject private IStringCompactor compactor;
+
/** Server ID mask for cache Entries. */
private int srvIdMaskHigh;
@@ -172,13 +175,17 @@ public class TeamcityIgnitedImpl implements
ITeamcityIgnited {
return buildConditionDao.setBuildCondition(srvIdMaskHigh, cond);
}
-@Override public FatBuildCompacted getFatBuild(int buildId) {
+/** {@inheritDoc} */
+@Override public FatBuildCompacted getFatBuild(int buildId, boolean
acceptQueued) {
ensureActualizeRequested();
FatB
[ignite-teamcity-bot] 01/01: IGNITE-10071 Background upload of a build and simultaneous bot restart may result in a queued build persisted but actually build is finished
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10071
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit ff7ff10930c6d1dc8592ba462d1c5651a7f33d9d
Author: Dmitriy Pavlov
AuthorDate: Tue Oct 30 21:12:03 2018 +0300
IGNITE-10071 Background upload of a build and simultaneous bot restart may
result in a queued build persisted but actually build is finished
---
.../ignite/ci/runners/RemoteClientTmpHelper.java | 72 ++
.../ci/teamcity/ignited/BuildRefCompacted.java | 11
.../ignite/ci/teamcity/ignited/BuildRefDao.java| 2 +-
.../ignited/fatbuild/FatBuildCompacted.java| 19 ++
.../ignited/fatbuild/ProblemCompacted.java | 24 +++-
.../teamcity/ignited/fatbuild/TestCompacted.java | 33 ++
6 files changed, 108 insertions(+), 53 deletions(-)
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 043883a..9c40870 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
@@ -17,20 +17,28 @@
package org.apache.ignite.ci.runners;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
+import java.io.FileWriter;
+import java.io.IOException;
import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
-import org.apache.ignite.ci.IgnitePersistentTeamcity;
-import org.apache.ignite.ci.user.TcHelperUser;
-import org.apache.ignite.ci.user.UserAndSessionsStorage;
+import org.apache.ignite.ci.teamcity.ignited.BuildRefCompacted;
+import org.apache.ignite.ci.teamcity.ignited.BuildRefDao;
+import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnited;
+import org.apache.ignite.ci.teamcity.ignited.IgniteStringCompactor;
+import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildCompacted;
+import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildDao;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.logger.slf4j.Slf4jLogger;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
public class RemoteClientTmpHelper {
+private static boolean dumpDict = false;
+
private static void setupDisco(IgniteConfiguration cfg) {
final TcpDiscoverySpi spi = new TcpDiscoverySpi();
final int locPort = 54433;
@@ -44,7 +52,7 @@ public class RemoteClientTmpHelper {
cfg.setDiscoverySpi(spi);
}
-public static void main(String[] args) {
+public static void main(String[] args) throws IOException {
final IgniteConfiguration cfg = new IgniteConfiguration();
setupDisco(cfg);
@@ -54,36 +62,48 @@ public class RemoteClientTmpHelper {
cfg.setClientMode(true);
final Ignite ignite = Ignition.start(cfg);
-ignite.cluster().active(true);
-
-IgniteCache cache1 =
ignite.cache(UserAndSessionsStorage.USERS);
-for (Cache.Entry next : cache1) {
-System.out.println(next.getKey() + ": " + next.getValue());
-
-if (next.getKey().equals("someusername")) {
-TcHelperUser u = (TcHelperUser)next.getValue();
-u.resetCredentials();
-
-cache1.put(next.getKey(), u);
+if(dumpDict) {
+IgniteCache strings =
ignite.cache(IgniteStringCompactor.STRINGS_CACHE);
+try (FileWriter writer = new FileWriter("Dictionary.txt")) {
+for (Cache.Entry next1 : strings) {
+writer.write(next1.getValue().toString()
++ "\n");
+}
}
}
+IgniteCache cache1 =
ignite.cache(FatBuildDao.TEAMCITY_FAT_BUILD_CACHE_NAME);
-IgniteCache cache =
ignite.cache(IgnitePersistentTeamcity.BOT_DETECTED_ISSUES);
-for (Cache.Entry next : cache) {
-Object key = next.getKey();
-Object value = next.getValue();
+int apache = ITeamcityIgnited.serverIdToInt("apache");
-if
(key.toString().contains("GridCacheLifecycleAwareSelfTest.testLifecycleAware"))
{
-/*boolean remove = cache.remove(key);
+int id = 2200135;
+int id1 = 2200209;
+dumpFatBuild(cache1, apache, id);
+dumpFatBuild(cache1, apache, id1);
-if (remove)
-System.err.println("Removed issue " + value);*/
-System.err.println("Issue: " + value);
-}
+IgniteCache cache2 =
ignite.cache(BuildRefDao.TEAMCITY_BUILD_CACHE_NAME);
+dumpBuildRef(cache2, apache, id);
+d
[ignite-teamcity-bot] branch ignite-10071 created (now ff7ff10)
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a change to branch ignite-10071 in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git. at ff7ff10 IGNITE-10071 Background upload of a build and simultaneous bot restart may result in a queued build persisted but actually build is finished This branch includes the following new commits: new ff7ff10 IGNITE-10071 Background upload of a build and simultaneous bot restart may result in a queued build persisted but actually build is finished The 1 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.
[ignite-teamcity-bot] branch ignite-9939 created (now 6f718d2)
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a change to branch ignite-9939 in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git. at 6f718d2 IGNITE-9939 Add visa's caching and monitoring This branch includes the following new commits: new 6f718d2 IGNITE-9939 Add visa's caching and monitoring The 1 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.
[ignite-teamcity-bot] 01/01: IGNITE-9939 Add visa's caching and monitoring
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-9939
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit 6f718d2460859cd808817c8fbad736acaddf6369
Author: Dmitriy Pavlov
AuthorDate: Tue Oct 30 20:03:26 2018 +0300
IGNITE-9939 Add visa's caching and monitoring
---
.../main/java/org/apache/ignite/ci/ITcHelper.java | 9 +-
.../main/java/org/apache/ignite/ci/TcHelper.java | 145 +---
.../org/apache/ignite/ci/di/IgniteTcBotModule.java | 3 +-
.../apache/ignite/ci/jira/IJiraIntegration.java| 3 +-
.../apache/ignite/ci/observer/BuildObserver.java | 17 ++-
.../org/apache/ignite/ci/observer/BuildsInfo.java | 75 +--
.../apache/ignite/ci/observer/ObserverTask.java| 23 +++-
.../tcbot/visa/TcBotTriggerAndSignOffService.java | 65 -
.../visa/VisaStatus.java} | 39 +++---
.../apache/ignite/ci/tcmodel/hist/BuildRef.java| 4 +
.../model/JiraCommentResponse.java}| 25 ++--
.../java/org/apache/ignite/ci/web/model/Visa.java | 78 +++
.../apache/ignite/ci/web/model/VisaRequest.java| 70 ++
.../ci/web/model/hist/VisasHistoryStorage.java | 87
.../ignite/ci/web/rest/visa/TcBotVisaService.java | 16 ++-
ignite-tc-helper-web/src/main/webapp/visas.html| 150 +
16 files changed, 695 insertions(+), 114 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java
index 25a5bd0..4519bc2 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java
@@ -21,9 +21,11 @@ import java.util.Collection;
import java.util.List;
import org.apache.ignite.ci.issue.IssueDetector;
import org.apache.ignite.ci.issue.IssuesStorage;
+import org.apache.ignite.ci.web.model.Visa;
import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.apache.ignite.ci.user.UserAndSessionsStorage;
+import org.apache.ignite.ci.web.model.hist.VisasHistoryStorage;
/**
* Teamcity Bot main interface. This inteface became too huge.
@@ -61,13 +63,16 @@ public interface ITcHelper extends ITcServerProvider {
/** */
boolean isServerAuthorized();
+ /** */
+VisasHistoryStorage getVisasHistoryStorage();
+
/**
* @param srvId Server id.
* @param prov Credentials.
* @param buildTypeId Suite name.
* @param branchForTc Branch for TeamCity.
* @param ticket JIRA ticket full name.
- * @return {@code True} if JIRA was notified.
+ * @return {@code Visa} which contains info about JIRA notification.
*/
-String notifyJira(String srvId, ICredentialsProv prov, String buildTypeId,
String branchForTc, String ticket);
+Visa notifyJira(String srvId, ICredentialsProv prov, String buildTypeId,
String branchForTc, String ticket);
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
index b40ba69..11f3357 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
@@ -17,12 +17,15 @@
package org.apache.ignite.ci;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.ignite.ci.tcbot.chain.PrChainsProcessor;
import org.apache.ignite.ci.conf.BranchesTracked;
import org.apache.ignite.ci.issue.IssueDetector;
import org.apache.ignite.ci.issue.IssuesStorage;
import org.apache.ignite.ci.jira.IJiraIntegration;
import org.apache.ignite.ci.tcmodel.hist.BuildRef;
+import org.apache.ignite.ci.web.model.JiraCommentResponse;
+import org.apache.ignite.ci.web.model.Visa;
import org.apache.ignite.ci.tcmodel.result.problems.ProblemOccurrence;
import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider;
import org.apache.ignite.ci.user.ICredentialsProv;
@@ -32,6 +35,7 @@ import
org.apache.ignite.ci.web.model.current.SuiteCurrentStatus;
import org.apache.ignite.ci.web.model.current.TestFailure;
import org.apache.ignite.ci.web.model.current.TestFailuresSummary;
import org.apache.ignite.ci.web.model.hist.FailureSummary;
+import org.apache.ignite.ci.web.model.hist.VisasHistoryStorage;
import org.apache.ignite.ci.web.rest.parms.FullQueryParams;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
@@ -68,7 +72,14 @@ public class TcHelper implements ITcHelper, IJiraIntegration
{
@Inject private PrChainsProcessor prChainsProcessor;
+/** */
+@Inject private VisasHistoryStorage visasHistoryStorage;
+
+/** */
+private final ObjectMapper objectMapper;
+
public TcHelper() {
+objectMapper = new ObjectMapper();
ignite git commit: IGNITE-9009 Do not notify local CQ listeners on partition reassignment - Fixes #4403.
Repository: ignite
Updated Branches:
refs/heads/master a8713f6d5 -> 0193012b2
IGNITE-9009 Do not notify local CQ listeners on partition reassignment - Fixes
#4403.
Signed-off-by: Alexey Goncharuk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0193012b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0193012b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0193012b
Branch: refs/heads/master
Commit: 0193012b27e73f269b33e10258eac7df89d54b68
Parents: a8713f6
Author: Denis Mekhanikov
Authored: Tue Oct 30 19:08:58 2018 +0300
Committer: Alexey Goncharuk
Committed: Tue Oct 30 19:08:58 2018 +0300
--
.../ignite/cache/query/ContinuousQuery.java | 11 +-
.../continuous/CacheContinuousQueryHandler.java | 16 +-
.../CacheContinuousQueryListener.java | 8 +-
.../continuous/CacheContinuousQueryManager.java | 10 +-
.../ContinuousQueryReassignmentTest.java| 170 +++
.../IgniteCacheQuerySelfTestSuite3.java | 2 +
6 files changed, 205 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/0193012b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
index e4d6d0a..0d1444b 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
@@ -213,7 +213,16 @@ public final class ContinuousQuery extends
AbstractContinuousQuery {
return (ContinuousQuery)super.setPageSize(pageSize);
}
-/** {@inheritDoc} */
+/**
+ * Sets whether this query should be executed on local node only.
+ *
+ * Note: backup event queues are not kept for local continuous queries. It
may lead to loss of notifications in case
+ * of node failures. Use {@link
ContinuousQuery#setRemoteFilterFactory(Factory)} to register cache event
listeners
+ * on all cache nodes, if delivery guarantee is required.
+ *
+ * @param loc Local flag.
+ * @return {@code this} for chaining.
+ */
@Override public ContinuousQuery setLocal(boolean loc) {
return (ContinuousQuery)super.setLocal(loc);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0193012b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
index d1640c6..ade360a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
@@ -144,7 +144,7 @@ public class CacheContinuousQueryHandler implements
GridContinuousHandler
private transient boolean skipPrimaryCheck;
/** */
-private boolean locCache;
+private transient boolean locOnly;
/** */
private boolean keepBinary;
@@ -247,10 +247,10 @@ public class CacheContinuousQueryHandler implements
GridContinuousHandler
}
/**
- * @param locCache Local cache.
+ * @param locOnly Local only.
*/
-public void localCache(boolean locCache) {
-this.locCache = locCache;
+public void localOnly(boolean locOnly) {
+this.locOnly = locOnly;
}
/**
@@ -514,7 +514,7 @@ public class CacheContinuousQueryHandler implements
GridContinuousHandler
skipCtx = new CounterSkipContext(part, cntr, topVer);
if (loc) {
-assert !locCache;
+assert !locOnly;
final Collection> evts = handleEvent(ctx, skipCtx.entry());
@@ -583,6 +583,10 @@ public class CacheContinuousQueryHandler implements
GridContinuousHandler
private String taskName() {
return ctx.security().enabled() ?
ctx.task().resolveTaskName(taskHash) : null;
}
+
+@Override public boolean isPrimaryOnly() {
+return locOnly && !skipPrimaryCheck;
+}
};
CacheContinuousQueryManager mgr = manager(ctx);
@@ -860,7 +864,7 @@ public class CacheContinuousQueryHandler implements
GridContinuousHandler
ignite git commit: IGNITE-9990 Control.sh utility should request a password if necessary - Fixes #5079.
Repository: ignite
Updated Branches:
refs/heads/master 5397d67af -> a8713f6d5
IGNITE-9990 Control.sh utility should request a password if necessary - Fixes
#5079.
Signed-off-by: Alexey Goncharuk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a8713f6d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a8713f6d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a8713f6d
Branch: refs/heads/master
Commit: a8713f6d57ad3bf5eb9e568ffdcc6f6b88f8ebc9
Parents: 5397d67
Author: a-polyakov
Authored: Tue Oct 30 18:07:53 2018 +0300
Committer: Alexey Goncharuk
Committed: Tue Oct 30 18:42:14 2018 +0300
--
.../ignite/internal/commandline/Arguments.java | 26 -
.../internal/commandline/CommandHandler.java| 114 +--
.../commandline/CommandHandlerParsingTest.java | 22 +---
3 files changed, 102 insertions(+), 60 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/a8713f6d/modules/core/src/main/java/org/apache/ignite/internal/commandline/Arguments.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/Arguments.java
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/Arguments.java
index 5b8a0dc..6367eef 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/Arguments.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/Arguments.java
@@ -71,10 +71,10 @@ public class Arguments {
*/
private String walArgs;
-/** Ping timeout for grid client. See {@link
GridClientConfiguration#pingTimeout}.*/
+/** Ping timeout for grid client. See {@link
GridClientConfiguration#pingTimeout}. */
private long pingTimeout;
-/** Ping interval for grid client. See {@link
GridClientConfiguration#pingInterval}.*/
+/** Ping interval for grid client. See {@link
GridClientConfiguration#pingInterval}. */
private long pingInterval;
/**
@@ -94,8 +94,8 @@ public class Arguments {
* @param autoConfirmation Auto confirmation flag.
*/
public Arguments(Command cmd, String host, String port, String user,
String pwd, String baselineAct,
- String baselineArgs, VisorTxTaskArg txArg, CacheArguments
cacheArgs, String walAct, String walArgs,
- Long pingTimeout, Long pingInterval, boolean
autoConfirmation) {
+String baselineArgs, VisorTxTaskArg txArg, CacheArguments cacheArgs,
String walAct, String walArgs,
+Long pingTimeout, Long pingInterval, boolean autoConfirmation) {
this.cmd = cmd;
this.host = host;
this.port = port;
@@ -136,18 +136,32 @@ public class Arguments {
/**
* @return user name
*/
-public String user() {
+public String getUserName() {
return user;
}
/**
+ * @param user New user name.
+ */
+public void setUserName(String user) {
+this.user = user;
+}
+
+/**
* @return password
*/
-public String password() {
+public String getPassword() {
return pwd;
}
/**
+ * @param pwd New password.
+ */
+public void setPassword(String pwd) {
+this.pwd = pwd;
+}
+
+/**
* @return baseline action
*/
public String baselineAction() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/a8713f6d/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
index c1853f8..167a806 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.commandline;
+import java.io.Console;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -117,6 +118,7 @@ import
org.apache.ignite.internal.visor.verify.VisorViewCacheTaskResult;
import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.plugin.security.SecurityCredentials;
import org.apache.ignite.plugin.security.SecurityCredentialsBasicProvider;
+import org.apache.ignite.plugin.security.SecurityCredentialsProvider;
import static
org.apache.ignite.IgniteSystemProperties.IGNITE_ENABLE_EXPERIMENTAL_COMMAND;
import static org.apache.ignite.internal.IgniteVersionUtils.ACK_VER_STR;
@@ -1855,12 +1857,6 @@ public class CommandHandler {
Command cmd = commands.get(
ignite git commit: IGNITE-10023 Improve ListeningTestLogger for wait conditions. - Fixes #5191.
Repository: ignite
Updated Branches:
refs/heads/master 99bb28f21 -> 5397d67af
IGNITE-10023 Improve ListeningTestLogger for wait conditions. - Fixes #5191.
Signed-off-by: Dmitriy Pavlov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5397d67a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5397d67a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5397d67a
Branch: refs/heads/master
Commit: 5397d67af2c52d1acb37234c5f5247c5e5811001
Parents: 99bb28f
Author: NSAmelchev
Authored: Tue Oct 30 18:37:51 2018 +0300
Committer: Dmitriy Pavlov
Committed: Tue Oct 30 18:37:51 2018 +0300
--
.../ignite/testframework/LogListener.java | 76 +---
.../test/ListeningTestLoggerTest.java | 71 +-
2 files changed, 52 insertions(+), 95 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5397d67a/modules/core/src/test/java/org/apache/ignite/testframework/LogListener.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/LogListener.java
b/modules/core/src/test/java/org/apache/ignite/testframework/LogListener.java
index d349f06..485e3fa 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/LogListener.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/LogListener.java
@@ -28,7 +28,6 @@ import java.util.function.Predicate;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
/**
* The basic listener for custom log contents checking in {@link
ListeningTestLogger}.
@@ -66,9 +65,9 @@ public abstract class LogListener implements Consumer
{
/**
* Checks that all conditions are met.
*
- * @throws AssertionError If some condition failed.
+ * @return {@code True} if all conditions are met.
*/
-public abstract void check() throws AssertionError;
+public abstract boolean check();
/**
* Reset listener state.
@@ -122,7 +121,7 @@ public abstract class LogListener implements
Consumer {
* @return current builder instance.
*/
public Builder andMatches(String substr) {
-addLast(new Node(substr, msg -> {
+addLast(new Node(msg -> {
if (substr.isEmpty())
return msg.isEmpty() ? 1 : 0;
@@ -144,7 +143,7 @@ public abstract class LogListener implements
Consumer {
* @return current builder instance.
*/
public Builder andMatches(Pattern regexp) {
-addLast(new Node(regexp.toString(), msg -> {
+addLast(new Node(msg -> {
int cnt = 0;
Matcher matcher = regexp.matcher(msg);
@@ -165,7 +164,7 @@ public abstract class LogListener implements
Consumer {
* @return current builder instance.
*/
public Builder andMatches(Predicate pred) {
-addLast(new Node(null, msg -> pred.test(msg) ? 1 : 0));
+addLast(new Node(msg -> pred.test(msg) ? 1 : 0));
return this;
}
@@ -222,19 +221,6 @@ public abstract class LogListener implements
Consumer {
}
/**
- * Set custom message for assertion error.
- *
- * @param msg Custom message.
- * @return current builder instance.
- */
-public Builder orError(String msg) {
-if (prev != null)
-prev.msg = msg;
-
-return this;
-}
-
-/**
* Constructs message listener.
*
* @return Log message listener.
@@ -263,15 +249,9 @@ public abstract class LogListener implements
Consumer {
*/
static final class Node {
/** */
-final String subj;
-
-/** */
final Function func;
/** */
-String msg;
-
-/** */
Integer min;
/** */
@@ -281,8 +261,7 @@ public abstract class LogListener implements
Consumer {
Integer cnt;
/** */
-Node(String subj, Function func) {
-this.subj = subj;
+Node(Function func) {
this.func = func;
}
@@ -297,7 +276,7 @@ public abstract class LogListener implements
Consumer {
else
range = ValueRange.of(min == null ? 0 : min, max == null ?
Integer.MAX_VALUE : max);
-return new LogMessageListener(func, range, subj, msg);
+return new LogMessageListener(func, range);
}
}
}
@@ -316,28 +295,13 @@ public abstract class LogListener imple
ignite git commit: IGNITE-9941 Fixed E2E tests.
Repository: ignite
Updated Branches:
refs/heads/master cb76ced0d -> 99bb28f21
IGNITE-9941 Fixed E2E tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/99bb28f2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/99bb28f2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/99bb28f2
Branch: refs/heads/master
Commit: 99bb28f2158ff74b264db7e7ae44ecedf05f8a76
Parents: cb76ced
Author: Ilya Borisov
Authored: Tue Oct 30 22:22:38 2018 +0700
Committer: Alexey Kuznetsov
Committed: Tue Oct 30 22:22:38 2018 +0700
--
.../e2e/testcafe/page-models/pageSignup.js| 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/99bb28f2/modules/web-console/e2e/testcafe/page-models/pageSignup.js
--
diff --git a/modules/web-console/e2e/testcafe/page-models/pageSignup.js
b/modules/web-console/e2e/testcafe/page-models/pageSignup.js
index c380abe..83f2932 100644
--- a/modules/web-console/e2e/testcafe/page-models/pageSignup.js
+++ b/modules/web-console/e2e/testcafe/page-models/pageSignup.js
@@ -19,13 +19,13 @@ import {Selector, t} from 'testcafe';
import {CustomFormField} from '../components/FormField';
export const pageSignup = {
-email: new CustomFormField({model: '$ctrl.data.email'}),
-password: new CustomFormField({model: '$ctrl.data.password'}),
-passwordConfirm: new CustomFormField({model: 'confirm'}),
-firstName: new CustomFormField({model: '$ctrl.data.firstName'}),
-lastName: new CustomFormField({model: '$ctrl.data.lastName'}),
-company: new CustomFormField({model: '$ctrl.data.company'}),
-country: new CustomFormField({model: '$ctrl.data.country'}),
+email: new CustomFormField({id: 'emailInput'}),
+password: new CustomFormField({id: 'passwordInput'}),
+passwordConfirm: new CustomFormField({id: 'confirmInput'}),
+firstName: new CustomFormField({id: 'firstNameInput'}),
+lastName: new CustomFormField({id: 'lastNameInput'}),
+company: new CustomFormField({id: 'companyInput'}),
+country: new CustomFormField({id: 'countryInput'}),
signupButton: Selector('button').withText('Sign Up'),
async fillSignupForm({
email,
ignite git commit: IGNITE-9935 Removed redundant multithreaded grid startup. - Fixes #5032.
Repository: ignite
Updated Branches:
refs/heads/master 4e628a912 -> cb76ced0d
IGNITE-9935 Removed redundant multithreaded grid startup. - Fixes #5032.
Signed-off-by: Dmitriy Pavlov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cb76ced0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cb76ced0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cb76ced0
Branch: refs/heads/master
Commit: cb76ced0dcfc78bee746210f96b3677d903a7b14
Parents: 4e628a9
Author: pereslegin-pa
Authored: Tue Oct 30 18:16:20 2018 +0300
Committer: Dmitriy Pavlov
Committed: Tue Oct 30 18:16:20 2018 +0300
--
...naryObjectMetadataExchangeMultinodeTest.java | 121 +++
1 file changed, 41 insertions(+), 80 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb76ced0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectMetadataExchangeMultinodeTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectMetadataExchangeMultinodeTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectMetadataExchangeMultinodeTest.java
index 01ef73d..03f0628 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectMetadataExchangeMultinodeTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectMetadataExchangeMultinodeTest.java
@@ -18,10 +18,9 @@ package org.apache.ignite.internal.processors.cache.binary;
import java.util.Map;
import java.util.UUID;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Future;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import junit.framework.AssertionFailedError;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.binary.BinaryObject;
@@ -39,8 +38,11 @@ import
org.apache.ignite.internal.managers.communication.GridIoManager;
import org.apache.ignite.internal.managers.communication.GridMessageListener;
import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.PA;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
import org.apache.ignite.spi.discovery.DiscoverySpiListener;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -75,6 +77,9 @@ public class
GridCacheBinaryObjectMetadataExchangeMultinodeTest extends GridComm
private static final int BINARY_TYPE_ID = 708045005;
/** */
+private static final long MAX_AWAIT = 9_000;
+
+/** */
private static final AtomicInteger metadataReqsCounter = new
AtomicInteger(0);
/** {@inheritDoc} */
@@ -107,35 +112,6 @@ public class
GridCacheBinaryObjectMetadataExchangeMultinodeTest extends GridComm
return cfg;
}
-/**
- *
- */
-private static final class ErrorHolder {
-/** */
-private volatile Error e;
-
-/**
- * @param e Exception.
- */
-void error(Error e) {
-this.e = e;
-}
-
-/**
- *
- */
-void fail() {
-throw e;
-}
-
-/**
- *
- */
-boolean isEmpty() {
-return e == null;
-}
-}
-
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
super.afterTest();
@@ -143,45 +119,28 @@ public class
GridCacheBinaryObjectMetadataExchangeMultinodeTest extends GridComm
stopAllGrids();
}
-/** */
-private static final CountDownLatch LATCH1 = new CountDownLatch(1);
-
/**
* Verifies that if thread tries to read metadata with ongoing update it
gets blocked
* until acknowledge message arrives.
*/
public void testReadRequestBlockedOnUpdatingMetadata() throws Exception {
-applyDiscoveryHook = true;
-discoveryHook = new DiscoveryHook() {
-@Override public void
handleDiscoveryMessage(DiscoverySpiCustomMessage msg) {
-DiscoveryCustomMessage customMsg = msg == null ? null
-: (DiscoveryCustomMessage) IgniteUtils.field(msg,
"delegate");
-
-if (customMsg instanceof MetadataUpdateAcc
ignite git commit: IGNITE-9673 Fix for Timeout in Java Client suite. - Fixes #4894.
Repository: ignite
Updated Branches:
refs/heads/master b424ef815 -> 4e628a912
IGNITE-9673 Fix for Timeout in Java Client suite. - Fixes #4894.
Signed-off-by: Dmitriy Pavlov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4e628a91
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4e628a91
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4e628a91
Branch: refs/heads/master
Commit: 4e628a912442e05297b40f555b29f5ae7efad6df
Parents: b424ef8
Author: NSAmelchev
Authored: Tue Oct 30 17:55:34 2018 +0300
Committer: Dmitriy Pavlov
Committed: Tue Oct 30 17:55:34 2018 +0300
--
.../client/suite/IgniteClientTestSuite.java | 2 +
...tocolStringAtomicDatastructuresSelfTest.java | 44
.../redis/GridRedisRestCommandHandler.java | 10 -
.../redis/key/GridRedisDelCommandHandler.java | 6 ++-
.../key/GridRedisExistsCommandHandler.java | 6 ++-
.../key/GridRedisExpireCommandHandler.java | 6 ++-
.../server/GridRedisDbSizeCommandHandler.java | 6 ++-
.../server/GridRedisFlushCommandHandler.java| 12 ++
.../string/GridRedisAppendCommandHandler.java | 6 ++-
.../string/GridRedisGetCommandHandler.java | 12 ++
.../string/GridRedisGetRangeCommandHandler.java | 6 ++-
.../string/GridRedisGetSetCommandHandler.java | 6 ++-
.../string/GridRedisIncrDecrCommandHandler.java | 6 ++-
.../string/GridRedisMGetCommandHandler.java | 6 ++-
.../string/GridRedisMSetCommandHandler.java | 6 ++-
.../string/GridRedisSetCommandHandler.java | 12 ++
.../string/GridRedisSetRangeCommandHandler.java | 6 ++-
.../string/GridRedisStrlenCommandHandler.java | 6 ++-
.../tcp/redis/GridRedisNioListener.java | 24 +--
19 files changed, 123 insertions(+), 65 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
index 657fda4..d08c9a1 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
@@ -66,6 +66,7 @@ import
org.apache.ignite.internal.processors.rest.protocols.tcp.TcpRestParserSel
import
org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolConnectSelfTest;
import
org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolGetAllAsArrayTest;
import
org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolServerSelfTest;
+import
org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolStringAtomicDatastructuresSelfTest;
import
org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolStringSelfTest;
import org.apache.ignite.testframework.IgniteTestSuite;
@@ -106,6 +107,7 @@ public class IgniteClientTestSuite extends TestSuite {
suite.addTestSuite(RedisProtocolGetAllAsArrayTest.class);
suite.addTestSuite(RedisProtocolConnectSelfTest.class);
suite.addTestSuite(RedisProtocolServerSelfTest.class);
+
suite.addTestSuite(RedisProtocolStringAtomicDatastructuresSelfTest.class);
suite.addTestSuite(RestProcessorStartSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringAtomicDatastructuresSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringAtomicDatastructuresSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringAtomicDatastructuresSelfTest.java
new file mode 100644
index 000..2e983f4
--- /dev/null
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringAtomicDatastructuresSelfTest.java
@@ -0,0 +1,44 @@
+/*
+ * 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 m
[ignite-teamcity-bot] branch master updated: Update doc with reference to AES256 pack
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 9e4a9f5 Update doc with reference to AES256 pack 9e4a9f5 is described below commit 9e4a9f562560a4d21b027477cf5f4611fdc554e0 Author: Dmitriy Pavlov AuthorDate: Tue Oct 30 17:45:32 2018 +0300 Update doc with reference to AES256 pack --- README.md | 7 +++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index ffa931b..a67798f 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,13 @@ Build can be done using following commands - gradle clean - gradle build +It is recommended to use Java 8 for development. + +It may be required to install +[Java Cryptography Extension JCE Unlimited Strength Jurisdiction Policy Files 8 Download](https://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html) +because the Bot uses strong AES cryptography, but default java distribution may limit AES256 usage. + + Resulting distribution can be found in projectRoot\jetty-launcher\build\distributions. Distribution will contain start script in \bin folder.
ignite git commit: IGNITE-9769 Fixed flaky IgniteCacheAtomicProtocolTest.testPutReaderUpdate1 - Fixes #4897.
Repository: ignite
Updated Branches:
refs/heads/master 223291be5 -> b424ef815
IGNITE-9769 Fixed flaky IgniteCacheAtomicProtocolTest.testPutReaderUpdate1 -
Fixes #4897.
Signed-off-by: Alexey Goncharuk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b424ef81
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b424ef81
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b424ef81
Branch: refs/heads/master
Commit: b424ef815bd12d1478d706ad10f62f2ce8ab24b7
Parents: 223291b
Author: Dmitrii Ryabov
Authored: Tue Oct 30 16:55:21 2018 +0300
Committer: Alexey Goncharuk
Committed: Tue Oct 30 16:55:21 2018 +0300
--
.../dht/atomic/IgniteCacheAtomicProtocolTest.java | 10 ++
.../junits/common/GridCommonAbstractTest.java | 9 +++--
2 files changed, 13 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/b424ef81/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
index 14c8571..66c04ea 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
@@ -806,13 +806,15 @@ public class IgniteCacheAtomicProtocolTest extends
GridCommonAbstractTest {
startServers(2);
-// Waiting for minor topology changing because of late affinity
assignment.
-awaitPartitionMapExchange();
-
Ignite srv0 = ignite(0);
Ignite srv1 = ignite(1);
-List keys = primaryKeys(srv0.cache(TEST_CACHE), putAll ? 3 :
1);
+IgniteCache cache = srv0.cache(TEST_CACHE);
+
+// Waiting for minor topology changing because of late affinity
assignment.
+awaitPartitionMapExchange();
+
+List keys = primaryKeys(cache, putAll ? 3 : 1);
ccfg = null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/b424ef81/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 7091a09..a06f15a 100755
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -670,7 +670,7 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
if (readyVer.topologyVersion() > 0 &&
c.context().started()) {
// Must map on updated version of topology.
-Collection affNodes =
+List affNodes =
dht.context().affinity().assignment(readyVer).idealAssignment().get(p);
int affNodesCnt = affNodes.size();
@@ -684,8 +684,13 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
GridDhtLocalPartition loc =
top.localPartition(p, readyVer, false);
+boolean notPrimary = !affNodes.isEmpty() &&
+
!exchMgr.rebalanceTopologyVersion().equals(AffinityTopologyVersion.NONE) &&
+
!affNodes.get(0).equals(dht.context().affinity().primaryByPartition(p,
readyVer));
+
if (affNodesCnt != ownerNodesCnt ||
!affNodes.containsAll(owners) ||
-(waitEvicts && loc != null && loc.state()
!= GridDhtPartitionState.OWNING)) {
+(waitEvicts && loc != null && loc.state()
!= GridDhtPartitionState.OWNING) ||
+notPrimary) {
if (i % 50 == 0)
LT.warn(log(), "Waiting for topology
map update [" +
"igniteInstanceName=" + g.name() +
[ignite-teamcity-bot] branch master updated: IGNITE-9848: Status check bug fixed
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 9d3d34f IGNITE-9848: Status check bug fixed
9d3d34f is described below
commit 9d3d34f1eb17a2b0173c3ba902cf69bb788b1329
Author: Dmitriy Pavlov
AuthorDate: Tue Oct 30 16:57:42 2018 +0300
IGNITE-9848: Status check bug fixed
---
.../java/org/apache/ignite/ci/teamcity/ignited/BuildRefCompacted.java | 2 +-
.../src/main/java/org/apache/ignite/ci/web/model/Version.java | 2 +-
2 files changed, 2 insertions(+), 2 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 73a704a..6b84357 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
@@ -158,7 +158,7 @@ public class BuildRefCompacted {
}
private boolean hasUnknownStatus(IStringCompactor compactor) {
-return compactor.getStringId(STATUS_UNKNOWN) == state();
+return compactor.getStringId(STATUS_UNKNOWN) == status();
}
public boolean isRunning(IStringCompactor compactor) {
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 4ca13dd..8e2f96f 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 = "20181029";
+public static final String VERSION = "20181030";
/** TC Bot Version. */
public String version = VERSION;
[ignite-teamcity-bot] branch master updated: IGNITE-9848: Loading builds chain in accordance with fat build approach, calculate statistics moved to later execute. - Fixes #54.
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 9592a86 IGNITE-9848: Loading builds chain in accordance with fat
build approach, calculate statistics moved to later execute. - Fixes #54.
9592a86 is described below
commit 9592a867a0fd84ecff1e33e440ff35911749d6eb
Author: Dmitriy Pavlov
AuthorDate: Tue Oct 30 15:29:22 2018 +0300
IGNITE-9848: Loading builds chain in accordance with fat build approach,
calculate statistics moved to later execute. - Fixes #54.
Signed-off-by: Dmitriy Pavlov
---
.../apache/ignite/ci/IgnitePersistentTeamcity.java | 9 +-
.../apache/ignite/ci/analysis/MultBuildRunCtx.java | 40 ++--
.../ignite/ci/analysis/SingleBuildRunCtx.java | 12 +-
...lureOccurrences.java => TestCompactedMult.java} | 48 ++---
.../java/org/apache/ignite/ci/db/DbMigrations.java | 8 +-
.../ci/tcbot/builds/CompareBuildsService.java | 8 +-
.../ignite/ci/tcbot/chain/BuildChainProcessor.java | 201 ++---
.../ci/teamcity/ignited/BuildRefCompacted.java | 39 +++-
.../ignite/ci/teamcity/ignited/BuildRefDao.java| 27 ++-
.../ci/teamcity/ignited/ITeamcityIgnited.java | 17 ++
.../ci/teamcity/ignited/TeamcityIgnitedImpl.java | 43 -
.../ci/teamcity/ignited/change/ChangeDao.java | 18 +-
.../ci/teamcity/ignited/change/ChangeSync.java | 5 +-
.../ignited/fatbuild/FatBuildCompacted.java| 29 ++-
.../ignited/fatbuild/ProactiveFatBuildSync.java| 3 -
.../teamcity/ignited/fatbuild/TestCompacted.java | 25 ++-
.../org/apache/ignite/ci/util/CollectionUtil.java | 2 +-
.../ci/web/model/current/SuiteCurrentStatus.java | 23 +--
18 files changed, 348 insertions(+), 209 deletions(-)
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 4f13083..42a1508 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
@@ -61,6 +61,7 @@ import org.apache.ignite.ci.analysis.TestInBranch;
import org.apache.ignite.ci.db.DbMigrations;
import org.apache.ignite.ci.db.TcHelperDb;
import org.apache.ignite.ci.di.AutoProfiling;
+import org.apache.ignite.ci.di.cache.GuavaCached;
import org.apache.ignite.ci.tcmodel.agent.Agent;
import org.apache.ignite.ci.tcmodel.changes.Change;
import org.apache.ignite.ci.tcmodel.changes.ChangesList;
@@ -951,7 +952,9 @@ public class IgnitePersistentTeamcity implements
IAnalyticsEnabledTeamcity, ITea
return key -> key == null ? null : getRunStatForTest(key);
}
+@SuppressWarnings("WeakerAccess")
@AutoProfiling
+@GuavaCached(maximumSize = 200, expireAfterAccessSecs = 30, softValues =
true)
protected RunStat getRunStatForTest(TestInBranch key) {
return testRunStatCache().get(key);
}
@@ -971,12 +974,14 @@ public class IgnitePersistentTeamcity implements
IAnalyticsEnabledTeamcity, ITea
/** {@inheritDoc} */
@Override public Function
getBuildFailureRunStatProvider() {
-return key -> key == null ? null : getRunStatForTest(key);
+return key -> key == null ? null : getRunStatForSuite(key);
}
+@SuppressWarnings("WeakerAccess")
@AutoProfiling
-protected RunStat getRunStatForTest(SuiteInBranch key) {
+@GuavaCached(maximumSize = 500, expireAfterAccessSecs = 90, softValues =
true)
+protected RunStat getRunStatForSuite(SuiteInBranch key) {
return buildsFailureRunStatCache().get(key);
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java
index 11e0db5..56613c2 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java
@@ -24,6 +24,7 @@ import
org.apache.ignite.ci.tcmodel.result.tests.TestOccurrenceFull;
import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
import org.apache.ignite.ci.teamcity.ignited.change.ChangeCompacted;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.ProblemCompacted;
+import org.apache.ignite.ci.teamcity.ignited.fatbuild.TestCompacted;
import org.apache.ignite.ci.util.CollectionUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -49,10 +50,6 @@ public class MultBuildRunCtx implements ISuiteResults {
/** Builds: Single execution. */
private List builds = new CopyOnWriteArrayList<>();
-/** Tests: Map from full test name to multiple test occurre
[1/2] ignite git commit: IGNITE-9221 Rename classes to avoid changing suites on TC. - Fixes #5209.
Repository: ignite Updated Branches: refs/heads/master dac30ac22 -> 223291be5 http://git-wip-us.apache.org/repos/asf/ignite/blob/223291be/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java deleted file mode 100644 index 6770ff1..000 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * 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.testsuites; - -import junit.framework.TestSuite; -import org.apache.ignite.internal.processors.cache.CacheScanPartitionQueryFallbackSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheCrossCacheJoinRandomTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheObjectKeyIndexingSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCachePartitionedQueryMultiThreadedSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheQueriesLoadTest1; -import org.apache.ignite.internal.processors.cache.IgniteCacheQueryEvictsMultiThreadedSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheQueryMultiThreadedSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheSqlQueryMultiThreadedSelfTest; -import org.apache.ignite.internal.processors.cache.QueryJoinWithDifferentNodeFiltersTest; -import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheClientQueryReplicatedNodeRestartSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNodeFailTest; -import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNodeRestartDistributedJoinSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNodeRestartSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNodeRestartSelfTest2; -import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNodeRestartTxSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryStopOnCancelOrTimeoutDistributedJoinSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.IgniteSqlQueryWithBaselineTest; -import org.apache.ignite.internal.processors.cache.index.DynamicColumnsConcurrentAtomicPartitionedSelfTest; -import org.apache.ignite.internal.processors.cache.index.DynamicColumnsConcurrentAtomicReplicatedSelfTest; -import org.apache.ignite.internal.processors.cache.index.DynamicColumnsConcurrentTransactionalPartitionedSelfTest; -import org.apache.ignite.internal.processors.cache.index.DynamicColumnsConcurrentTransactionalReplicatedSelfTest; -import org.apache.ignite.internal.processors.cache.index.DynamicIndexPartitionedAtomicConcurrentSelfTest; -import org.apache.ignite.internal.processors.cache.index.DynamicIndexPartitionedTransactionalConcurrentSelfTest; -import org.apache.ignite.internal.processors.cache.index.DynamicIndexReplicatedAtomicConcurrentSelfTest; -import org.apache.ignite.internal.processors.cache.index.DynamicIndexReplicatedTransactionalConcurrentSelfTest; -import org.apache.ignite.internal.processors.cache.query.ScanQueryOffheapExpiryPolicySelfTest; -import org.apache.ignite.internal.processors.database.baseline.IgniteChangingBaselineCacheQueryNodeRestartSelfTest; -import org.apache.ignite.internal.processors.database.baseline.IgniteStableBaselineCacheQueryNodeRestartsSelfTest; -import org.apache.ignite.internal.processors.query.IgniteCacheGroupsCompareQueryTest; -import org.apache.ignite.internal.processors.query.IgniteCacheGroupsSqlDistributedJoinSelfTest; -import org.apache.ignite.internal.processors.query.IgniteCacheGroupsSqlSegmentedIndexMultiNodeSelfTest; -import org.
[2/2] ignite git commit: IGNITE-9221 Rename classes to avoid changing suites on TC. - Fixes #5209.
IGNITE-9221 Rename classes to avoid changing suites on TC. - Fixes #5209. Signed-off-by: Dmitriy Pavlov Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/223291be Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/223291be Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/223291be Branch: refs/heads/master Commit: 223291be5e2fdc3294054914b51f10af2da085ff Parents: dac30ac Author: Ilya Kasnacheev Authored: Tue Oct 30 14:38:40 2018 +0300 Committer: Dmitriy Pavlov Committed: Tue Oct 30 14:38:40 2018 +0300 -- .../IgniteBinaryCacheQueryTestSuite.java| 517 +++ .../IgniteBinaryCacheQueryTestSuite2.java | 133 + .../IgniteCacheQuerySelfTestSuite.java | 517 --- .../IgniteCacheQuerySelfTestSuite2.java | 133 - 4 files changed, 650 insertions(+), 650 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/223291be/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java new file mode 100644 index 000..ee82b7a --- /dev/null +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java @@ -0,0 +1,517 @@ +/* + * 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.testsuites; + +import junit.framework.TestSuite; +import org.apache.ignite.internal.processors.cache.BigEntryQueryTest; +import org.apache.ignite.internal.processors.cache.BinaryMetadataConcurrentUpdateWithIndexesTest; +import org.apache.ignite.internal.processors.cache.BinarySerializationQuerySelfTest; +import org.apache.ignite.internal.processors.cache.BinarySerializationQueryWithReflectiveSerializerSelfTest; +import org.apache.ignite.internal.processors.cache.CacheIteratorScanQueryTest; +import org.apache.ignite.internal.processors.cache.CacheLocalQueryDetailMetricsSelfTest; +import org.apache.ignite.internal.processors.cache.CacheLocalQueryMetricsSelfTest; +import org.apache.ignite.internal.processors.cache.CacheOffheapBatchIndexingBaseTest; +import org.apache.ignite.internal.processors.cache.CacheOffheapBatchIndexingMultiTypeTest; +import org.apache.ignite.internal.processors.cache.CacheOffheapBatchIndexingSingleTypeTest; +import org.apache.ignite.internal.processors.cache.CachePartitionedQueryDetailMetricsDistributedSelfTest; +import org.apache.ignite.internal.processors.cache.CachePartitionedQueryDetailMetricsLocalSelfTest; +import org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsDistributedSelfTest; +import org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsLocalSelfTest; +import org.apache.ignite.internal.processors.cache.CacheQueryBuildValueTest; +import org.apache.ignite.internal.processors.cache.CacheQueryEvictDataLostTest; +import org.apache.ignite.internal.processors.cache.CacheQueryNewClientSelfTest; +import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryDetailMetricsDistributedSelfTest; +import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryDetailMetricsLocalSelfTest; +import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsDistributedSelfTest; +import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsLocalSelfTest; +import org.apache.ignite.internal.processors.cache.CacheSqlQueryValueCopySelfTest; +import org.apache.ignite.internal.processors.cache.DdlTransactionSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheCrossCacheQuerySelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheFullTextQuerySelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheLazyQueryPartitionsReleaseTest; +import org.apache.ignite.interna
ignite git commit: IGNITE-9221 Uncomment Cache Query tests, delete and rename suites to simplify layout. - Fixes #5206.
Repository: ignite
Updated Branches:
refs/heads/master d5035bb23 -> dac30ac22
IGNITE-9221 Uncomment Cache Query tests, delete and rename suites to simplify
layout. - Fixes #5206.
Signed-off-by: Dmitriy Pavlov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dac30ac2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dac30ac2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dac30ac2
Branch: refs/heads/master
Commit: dac30ac22f705192714ba4c61d93df87ddcf60d0
Parents: d5035bb
Author: Ilya Kasnacheev
Authored: Tue Oct 30 14:34:08 2018 +0300
Committer: Dmitriy Pavlov
Committed: Tue Oct 30 14:34:08 2018 +0300
--
.../cache/query/GridCacheQueryManager.java | 2 +-
.../cache/query/IndexingSpiQuerySelfTest.java | 33 ++-
...CacheContinuousQueryCounterAbstractTest.java | 12 ++--
...IgniteCacheContinuousQueryReconnectTest.java | 2 +-
.../cache/IgniteCacheUnionDuplicatesTest.java | 6 +-
...ClientReconnectCacheQueriesFailoverTest.java | 2 +-
.../cache/IgniteErrorOnRebalanceTest.java | 4 ++
.../IgniteBinaryCacheQueryTestSuite.java| 56 --
.../IgniteBinaryCacheQueryTestSuite2.java | 38
.../IgniteCacheQuerySelfTestSuite.java | 62 +---
.../IgniteCacheQuerySelfTestSuite2.java | 3 +
.../IgniteCacheQuerySelfTestSuite3.java | 18 --
12 files changed, 93 insertions(+), 145 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/dac30ac2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 6134bd4..914ff0f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -172,7 +172,7 @@ public abstract class GridCacheQueryManager extends
GridCacheManagerAdapte
GridCacheQueryDetailMetricsAdapter>
QRY_DETAIL_METRICS_MERGE_FX =
GridCacheQueryDetailMetricsAdapter::aggregate;
-/** Default is @{code true} */
+/** */
private final boolean isIndexingSpiAllowsBinary =
!IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_UNWRAP_BINARY_FOR_INDEXING_SPI);
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/dac30ac2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
index 3e59c2a..5bc50e7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
@@ -162,27 +162,32 @@ public class IndexingSpiQuerySelfTest extends
GridCommonAbstractTest {
public void testNonBinaryIndexingSpi() throws Exception {
System.setProperty(IgniteSystemProperties.IGNITE_UNWRAP_BINARY_FOR_INDEXING_SPI,
"true");
-indexingSpi = new MyIndexingSpi();
+try {
+indexingSpi = new MyIndexingSpi();
-Ignite ignite = startGrid(0);
+Ignite ignite = startGrid(0);
-CacheConfiguration ccfg =
cacheConfiguration(DEFAULT_CACHE_NAME);
+CacheConfiguration ccfg =
cacheConfiguration(DEFAULT_CACHE_NAME);
-IgniteCache cache = ignite.createCache(ccfg);
+IgniteCache cache = ignite.createCache(ccfg);
-for (int i = 0; i < 10; i++) {
-PersonKey key = new PersonKey(i);
+for (int i = 0; i < 10; i++) {
+PersonKey key = new PersonKey(i);
-cache.put(key, new Person("John Doe " + i));
-}
+cache.put(key, new Person("John Doe " + i));
+}
-QueryCursor> cursor = cache.query(
-new SpiQuery().setArgs(new PersonKey(2), new
PersonKey(5)));
+QueryCursor> cursor = cache.query(
+new SpiQuery().setArgs(new PersonKey(2),
new PersonKey(5)));
-for (Cache.Entry entry : cursor)
-System.out.println(entry);
+for (Cache.Entry entry : cursor)
+System.out
[ignite-teamcity-bot] branch ignite-9848-3 updated: IGNITE-9848: Loading builds chain in accordance with fat build approach, calculate statistics moved to later execute.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-9848-3
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-9848-3 by this push:
new 58107fe IGNITE-9848: Loading builds chain in accordance with fat
build approach, calculate statistics moved to later execute.
58107fe is described below
commit 58107fecc1a6d1ef94a94e6b4a73ed21c16aa392
Author: Dmitriy Pavlov
AuthorDate: Tue Oct 30 14:05:17 2018 +0300
IGNITE-9848: Loading builds chain in accordance with fat build approach,
calculate statistics moved to later execute.
---
.../java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
index 5675db2..a1bc02e 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
@@ -252,10 +252,12 @@ public class BuildChainProcessor {
@SuppressWarnings("WeakerAccess")
@AutoProfiling
-protected static void analyzeTests(MultBuildRunCtx outCtx,
IAnalyticsEnabledTeamcity teamcity,
+protected void analyzeTests(MultBuildRunCtx outCtx,
IAnalyticsEnabledTeamcity teamcity,
ProcessLogsMode procLog) {
for (SingleBuildRunCtx ctx : outCtx.getBuilds()) {
-teamcity.calculateBuildStatistic(ctx);
+tcUpdatePool.getService().submit(() -> {
+teamcity.calculateBuildStatistic(ctx);
+});
if ((procLog == ProcessLogsMode.SUITE_NOT_COMPLETE &&
ctx.hasSuiteIncompleteFailure())
|| procLog == ProcessLogsMode.ALL)
[ignite-teamcity-bot] branch ignite-9848-3 updated: IGNITE-9848: Loading builds chain in accordance with fat build approach
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-9848-3
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-9848-3 by this push:
new 6bb3ca7 IGNITE-9848: Loading builds chain in accordance with fat
build approach
6bb3ca7 is described below
commit 6bb3ca7d52d51585aea1b15057f290bf71372e05
Author: Dmitriy Pavlov
AuthorDate: Tue Oct 30 13:57:02 2018 +0300
IGNITE-9848: Loading builds chain in accordance with fat build approach
---
.../ignite/ci/tcbot/chain/BuildChainProcessor.java | 60 +++---
.../ci/teamcity/ignited/TeamcityIgnitedImpl.java | 5 +-
.../ci/teamcity/ignited/change/ChangeDao.java | 17 +++---
.../ci/teamcity/ignited/change/ChangeSync.java | 2 +
4 files changed, 41 insertions(+), 43 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
index 7a0027c..5675db2 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
@@ -52,7 +52,6 @@ import org.apache.ignite.ci.util.FutureUtil;
import org.apache.ignite.ci.web.TcUpdatePool;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.jvnet.hk2.internal.Collector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -107,25 +106,21 @@ public class BuildChainProcessor {
.stream()
.flatMap(fut -> FutureUtil.getResult(fut));
-Stream uniqueBuildsInvolved = depsFirstLevel
+Stream secondLevelDeps = depsFirstLevel
.map(ref -> svc.submit(() -> dependencies(teamcityIgnited,
builds, ref)))
.collect(Collectors.toList())
.stream()
.flatMap(fut -> FutureUtil.getResult(fut));
-final List>> phase1Submitted =
uniqueBuildsInvolved
-.map((buildRef) -> svc.submit(
-() -> replaceWithRecent(teamcityIgnited,
includeLatestRebuild, builds, buildRef, entryPoints.size(
+// builds may became non unique because of rece in filtering and
acquiring deps
+final List>> phase3Submitted =
secondLevelDeps
+.map((fatBuild) -> svc.submit(
+() -> replaceWithRecent(teamcityIgnited,
includeLatestRebuild, builds, fatBuild, entryPoints.size(
.collect(Collectors.toList());
-
-final List>>
phase2Submitted = phase1Submitted.stream()
-.map(FutureUtil::getResult)
-.map((s) -> svc.submit(
-() -> processBuildList(teamcityIgnited, buildsCtxMap,
s)))
-.collect(Collectors.toList());
-
-phase2Submitted.forEach(FutureUtil::getResult);
+phase3Submitted.stream()
+.flatMap(fut -> FutureUtil.getResult(fut))
+.forEach((fatBuild) -> createCxt(teamcityIgnited,
buildsCtxMap, fatBuild));
ArrayList contexts = new
ArrayList<>(buildsCtxMap.values());
@@ -160,22 +155,17 @@ public class BuildChainProcessor {
return fullChainRunCtx;
}
+
@SuppressWarnings("WeakerAccess")
-@NotNull
@AutoProfiling
-protected Stream processBuildList(ITeamcityIgnited
teamcityIgnited,
- Map buildsCtxMap,
-
Stream list) {
-list.forEach((FatBuildCompacted buildCompacted) -> {
-final BuildRef ref = buildCompacted.toBuildRef(compactor);
+protected void createCxt(ITeamcityIgnited teamcityIgnited, Map buildsCtxMap,
+FatBuildCompacted buildCompacted) {
+final BuildRef ref = buildCompacted.toBuildRef(compactor);
-MultBuildRunCtx ctx = buildsCtxMap.computeIfAbsent(ref.buildTypeId,
-k -> new MultBuildRunCtx(ref, compactor));
+final MultBuildRunCtx ctx =
buildsCtxMap.computeIfAbsent(ref.buildTypeId,
+k -> new MultBuildRunCtx(ref, compactor));
-ctx.addBuild(loadTestsAndProblems(buildCompacted,
teamcityIgnited));
-});
-
-return list;
+ctx.addBuild(loadTestsAndProblems(buildCompacted, teamcityIgnited));
}
/**
@@ -290,12 +280,20 @@ public class BuildChainProcessor {
private Stream dependencies(
ITeamcityIgnited teamcityIgnited,
Map builds,
-FatBuildCompacted build) {
-return Stream.concat(Stream.of(build),
-IntStream.of(build.snapshotDependencies())
-.filter(id -> !builds.containsKey(id)) //load and
propagate only new dependencies
-
ignite git commit: IGNITE-10042: MVCC: Fixed TxLog page types. This closes #5193.
Repository: ignite
Updated Branches:
refs/heads/ignite-2.7 1a742e0fe -> 6a7e0d168
IGNITE-10042: MVCC: Fixed TxLog page types. This closes #5193.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6a7e0d16
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6a7e0d16
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6a7e0d16
Branch: refs/heads/ignite-2.7
Commit: 6a7e0d1681981ddb233e3b0f1501c4610e8eca0b
Parents: 1a742e0
Author: AMRepo
Authored: Tue Oct 30 12:07:49 2018 +0300
Committer: devozerov
Committed: Tue Oct 30 12:08:45 2018 +0300
--
.../processors/cache/mvcc/txlog/TxLog.java | 40 ++--
1 file changed, 20 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/6a7e0d16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
index 61d9cc6..03eb659 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
@@ -37,7 +37,7 @@ import
org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemor
import org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
-import
org.apache.ignite.internal.processors.cache.persistence.tree.io.PagePartitionMetaIO;
+import
org.apache.ignite.internal.processors.cache.persistence.tree.io.PageMetaIO;
import
org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
import
org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseListImpl;
import
org.apache.ignite.internal.processors.cache.persistence.tree.util.PageHandler;
@@ -100,36 +100,36 @@ public class TxLog implements DbCheckpointListener {
IgniteWriteAheadLogManager wal = ctx.cache().context().wal();
PageMemoryEx pageMemory =
(PageMemoryEx)mgr.dataRegion(TX_LOG_CACHE_NAME).pageMemory();
-long partMetaId =
pageMemory.partitionMetaPageId(TX_LOG_CACHE_ID, 0);
-long partMetaPage = pageMemory.acquirePage(TX_LOG_CACHE_ID,
partMetaId);
+long metaId = pageMemory.metaPageId(TX_LOG_CACHE_ID);
+long metaPage = pageMemory.acquirePage(TX_LOG_CACHE_ID,
metaId);
long treeRoot, reuseListRoot;
boolean isNew = false;
try {
-long pageAddr = pageMemory.writeLock(TX_LOG_CACHE_ID,
partMetaId, partMetaPage);
+long pageAddr = pageMemory.writeLock(TX_LOG_CACHE_ID,
metaId, metaPage);
try {
-if (PageIO.getType(pageAddr) != PageIO.T_PART_META) {
+if (PageIO.getType(pageAddr) != PageIO.T_META) {
// Initialize new page.
-PagePartitionMetaIO io =
PagePartitionMetaIO.VERSIONS.latest();
+PageMetaIO io = PageMetaIO.VERSIONS.latest();
-io.initNewPage(pageAddr, partMetaId,
pageMemory.pageSize());
+io.initNewPage(pageAddr, metaId,
pageMemory.pageSize());
-treeRoot =
pageMemory.allocatePage(TX_LOG_CACHE_ID, 0, PageMemory.FLAG_DATA);
-reuseListRoot =
pageMemory.allocatePage(TX_LOG_CACHE_ID, 0, PageMemory.FLAG_DATA);
+treeRoot =
pageMemory.allocatePage(TX_LOG_CACHE_ID, INDEX_PARTITION, PageMemory.FLAG_IDX);
+reuseListRoot =
pageMemory.allocatePage(TX_LOG_CACHE_ID, INDEX_PARTITION, PageMemory.FLAG_IDX);
-assert PageIdUtils.flag(treeRoot) ==
PageMemory.FLAG_DATA;
-assert PageIdUtils.flag(reuseListRoot) ==
PageMemory.FLAG_DATA;
+assert PageIdUtils.flag(treeRoot) ==
PageMemory.FLAG_IDX;
+assert PageIdUtils.flag(reuseListRoot) ==
PageMemory.FLAG_IDX;
io.setTreeRoot(pageAddr, treeRoot);
io.setReuseListRoot(pageAddr, reuseListRoot);
-if (PageHandler.isWalDeltaRecordNeeded(pageMemory,
TX_LOG_CACHE_ID, partMetaId, partMetaPage, wal, null))
+if (PageHandler
ignite git commit: IGNITE-10042: MVCC: Fixed TxLog page types. This closes #5193.
Repository: ignite
Updated Branches:
refs/heads/master f8c9e90c7 -> d5035bb23
IGNITE-10042: MVCC: Fixed TxLog page types. This closes #5193.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5035bb2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5035bb2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5035bb2
Branch: refs/heads/master
Commit: d5035bb23c25b02f814a03303dfa7ce682f2cada
Parents: f8c9e90
Author: AMRepo
Authored: Tue Oct 30 12:07:49 2018 +0300
Committer: devozerov
Committed: Tue Oct 30 12:07:49 2018 +0300
--
.../processors/cache/mvcc/txlog/TxLog.java | 40 ++--
1 file changed, 20 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5035bb2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
index 61d9cc6..03eb659 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/txlog/TxLog.java
@@ -37,7 +37,7 @@ import
org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemor
import org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
-import
org.apache.ignite.internal.processors.cache.persistence.tree.io.PagePartitionMetaIO;
+import
org.apache.ignite.internal.processors.cache.persistence.tree.io.PageMetaIO;
import
org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
import
org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseListImpl;
import
org.apache.ignite.internal.processors.cache.persistence.tree.util.PageHandler;
@@ -100,36 +100,36 @@ public class TxLog implements DbCheckpointListener {
IgniteWriteAheadLogManager wal = ctx.cache().context().wal();
PageMemoryEx pageMemory =
(PageMemoryEx)mgr.dataRegion(TX_LOG_CACHE_NAME).pageMemory();
-long partMetaId =
pageMemory.partitionMetaPageId(TX_LOG_CACHE_ID, 0);
-long partMetaPage = pageMemory.acquirePage(TX_LOG_CACHE_ID,
partMetaId);
+long metaId = pageMemory.metaPageId(TX_LOG_CACHE_ID);
+long metaPage = pageMemory.acquirePage(TX_LOG_CACHE_ID,
metaId);
long treeRoot, reuseListRoot;
boolean isNew = false;
try {
-long pageAddr = pageMemory.writeLock(TX_LOG_CACHE_ID,
partMetaId, partMetaPage);
+long pageAddr = pageMemory.writeLock(TX_LOG_CACHE_ID,
metaId, metaPage);
try {
-if (PageIO.getType(pageAddr) != PageIO.T_PART_META) {
+if (PageIO.getType(pageAddr) != PageIO.T_META) {
// Initialize new page.
-PagePartitionMetaIO io =
PagePartitionMetaIO.VERSIONS.latest();
+PageMetaIO io = PageMetaIO.VERSIONS.latest();
-io.initNewPage(pageAddr, partMetaId,
pageMemory.pageSize());
+io.initNewPage(pageAddr, metaId,
pageMemory.pageSize());
-treeRoot =
pageMemory.allocatePage(TX_LOG_CACHE_ID, 0, PageMemory.FLAG_DATA);
-reuseListRoot =
pageMemory.allocatePage(TX_LOG_CACHE_ID, 0, PageMemory.FLAG_DATA);
+treeRoot =
pageMemory.allocatePage(TX_LOG_CACHE_ID, INDEX_PARTITION, PageMemory.FLAG_IDX);
+reuseListRoot =
pageMemory.allocatePage(TX_LOG_CACHE_ID, INDEX_PARTITION, PageMemory.FLAG_IDX);
-assert PageIdUtils.flag(treeRoot) ==
PageMemory.FLAG_DATA;
-assert PageIdUtils.flag(reuseListRoot) ==
PageMemory.FLAG_DATA;
+assert PageIdUtils.flag(treeRoot) ==
PageMemory.FLAG_IDX;
+assert PageIdUtils.flag(reuseListRoot) ==
PageMemory.FLAG_IDX;
io.setTreeRoot(pageAddr, treeRoot);
io.setReuseListRoot(pageAddr, reuseListRoot);
-if (PageHandler.isWalDeltaRecordNeeded(pageMemory,
TX_LOG_CACHE_ID, partMetaId, partMetaPage, wal, null))
+if (PageHandler.isWalDe
ignite git commit: IGNITE-10055: MVCC: Fixed fields count for PartitionUpdateCountersMessage. This closes #5202.
Repository: ignite
Updated Branches:
refs/heads/ignite-2.7 48130a9ab -> 1a742e0fe
IGNITE-10055: MVCC: Fixed fields count for PartitionUpdateCountersMessage. This
closes #5202.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1a742e0f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1a742e0f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1a742e0f
Branch: refs/heads/ignite-2.7
Commit: 1a742e0fe66371851569d01e8f1edb7614491d9d
Parents: 48130a9
Author: devozerov
Authored: Tue Oct 30 11:57:09 2018 +0300
Committer: devozerov
Committed: Tue Oct 30 11:59:09 2018 +0300
--
.../cache/distributed/dht/PartitionUpdateCountersMessage.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/1a742e0f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
index 6ee0294..3e5953f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
@@ -228,7 +228,7 @@ public class PartitionUpdateCountersMessage implements
Message {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
-return 1;
+return 2;
}
/** {@inheritDoc} */
ignite git commit: IGNITE-10055: MVCC: Fixed fields count for PartitionUpdateCountersMessage. This closes #5202.
Repository: ignite
Updated Branches:
refs/heads/master d8e46de28 -> f8c9e90c7
IGNITE-10055: MVCC: Fixed fields count for PartitionUpdateCountersMessage. This
closes #5202.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f8c9e90c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f8c9e90c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f8c9e90c
Branch: refs/heads/master
Commit: f8c9e90c7e373b25b519050693384b3a32977ea6
Parents: d8e46de
Author: devozerov
Authored: Tue Oct 30 11:57:09 2018 +0300
Committer: devozerov
Committed: Tue Oct 30 11:57:09 2018 +0300
--
.../cache/distributed/dht/PartitionUpdateCountersMessage.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/f8c9e90c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
index 6ee0294..3e5953f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
@@ -228,7 +228,7 @@ public class PartitionUpdateCountersMessage implements
Message {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
-return 1;
+return 2;
}
/** {@inheritDoc} */
[ignite-teamcity-bot] branch ignite-9848-3 updated: IGNITE-9848 Chain run report using Fat Build paradigm: dependencies migration to background threads
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-9848-3
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-9848-3 by this push:
new b912422 IGNITE-9848 Chain run report using Fat Build paradigm:
dependencies migration to background threads
b912422 is described below
commit b9124229bd0919c66b602a229db79f5baeeb01c8
Author: Dmitriy Pavlov
AuthorDate: Tue Oct 30 10:54:12 2018 +0300
IGNITE-9848 Chain run report using Fat Build paradigm: dependencies
migration to background threads
---
.../ci/tcbot/builds/CompareBuildsService.java | 2 +-
.../ignite/ci/tcbot/chain/BuildChainProcessor.java | 28 +++---
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/builds/CompareBuildsService.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/builds/CompareBuildsService.java
index 45b26ab..71715c8 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/builds/CompareBuildsService.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/builds/CompareBuildsService.java
@@ -80,7 +80,7 @@ public class CompareBuildsService {
MultBuildRunCtx buildCtx = new MultBuildRunCtx(build, compactor);
final FatBuildCompacted fatBuild =
tcIgnited.getFatBuild(build.getId());
-buildCtx.addBuild(bcp.loadTestsAndProblems(fatBuild, buildCtx,
tcIgnited));
+buildCtx.addBuild(bcp.loadTestsAndProblems(fatBuild, tcIgnited));
for (String testName : buildCtx.tests())
tests.add(extractTestName(testName));
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
index 5b90a4b..7a0027c 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
@@ -45,15 +45,14 @@ import org.apache.ignite.ci.di.AutoProfiling;
import org.apache.ignite.ci.tcmodel.hist.BuildRef;
import org.apache.ignite.ci.tcmodel.result.Build;
import org.apache.ignite.ci.teamcity.ignited.BuildRefCompacted;
-import org.apache.ignite.ci.teamcity.ignited.BuildRefDao;
import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnited;
-import org.apache.ignite.ci.teamcity.ignited.change.ChangeCompacted;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildCompacted;
import org.apache.ignite.ci.util.FutureUtil;
import org.apache.ignite.ci.web.TcUpdatePool;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.jvnet.hk2.internal.Collector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -100,12 +99,20 @@ public class BuildChainProcessor {
.filter(id -> !builds.containsKey(id)) //load and propagate
only new entry points
.map(id -> builds.computeIfAbsent(id,
teamcityIgnited::getFatBuild));
-Stream uniqueBuildsInvolved = entryPointsFatBuilds
-.flatMap(ref -> dependencies(teamcityIgnited, builds, ref))
-.flatMap(ref -> dependencies(teamcityIgnited, builds, ref));
-
final ExecutorService svc = tcUpdatePool.getService();
+final Stream depsFirstLevel = entryPointsFatBuilds
+.map(ref -> svc.submit(() -> dependencies(teamcityIgnited,
builds, ref)))
+.collect(Collectors.toList())
+.stream()
+.flatMap(fut -> FutureUtil.getResult(fut));
+
+Stream uniqueBuildsInvolved = depsFirstLevel
+.map(ref -> svc.submit(() -> dependencies(teamcityIgnited,
builds, ref)))
+.collect(Collectors.toList())
+.stream()
+.flatMap(fut -> FutureUtil.getResult(fut));
+
final List>> phase1Submitted =
uniqueBuildsInvolved
.map((buildRef) -> svc.submit(
() -> replaceWithRecent(teamcityIgnited,
includeLatestRebuild, builds, buildRef, entryPoints.size(
@@ -156,7 +163,8 @@ public class BuildChainProcessor {
@SuppressWarnings("WeakerAccess")
@NotNull
@AutoProfiling
-protected Stream processBuildList(ITeamcityIgnited
teamcityIgnited, Map buildsCtxMap,
+protected Stream processBuildList(ITeamcityIgnited
teamcityIgnited,
+ Map buildsCtxMap,
Stream list) {
list.forEach((FatBuildCompacted buildCompacted) -> {
final BuildRef ref = buildCompacted.toBuildRef(compactor);
@@ -164,7 +172,7 @@
