svn commit: r31198 - in /dev/ignite/packages_2.7.0-rc1: ./ apache-ignite-2.7.0-1.noarch.rpm apache-ignite_2.7.0-1_all.deb
Author: nizhikov Date: Thu Nov 29 07:06:22 2018 New Revision: 31198 Log: New RC 2.7.0-rc1: Packages Added: dev/ignite/packages_2.7.0-rc1/ dev/ignite/packages_2.7.0-rc1/apache-ignite-2.7.0-1.noarch.rpm (with props) dev/ignite/packages_2.7.0-rc1/apache-ignite_2.7.0-1_all.deb (with props) Added: dev/ignite/packages_2.7.0-rc1/apache-ignite-2.7.0-1.noarch.rpm == Binary file - no diff available. Propchange: dev/ignite/packages_2.7.0-rc1/apache-ignite-2.7.0-1.noarch.rpm -- svn:mime-type = application/octet-stream Added: dev/ignite/packages_2.7.0-rc1/apache-ignite_2.7.0-1_all.deb == Binary file - no diff available. Propchange: dev/ignite/packages_2.7.0-rc1/apache-ignite_2.7.0-1_all.deb -- svn:mime-type = application/octet-stream
svn commit: r31197 - in /dev/ignite/2.7.0-rc1: ./ apache-ignite-2.7.0-bin.zip apache-ignite-2.7.0-bin.zip.asc apache-ignite-2.7.0-bin.zip.sha512 apache-ignite-2.7.0-src.zip apache-ignite-2.7.0-src.zip
Author: nizhikov Date: Thu Nov 29 07:01:20 2018 New Revision: 31197 Log: New RC 2.7.0-rc1: Binaries Added: dev/ignite/2.7.0-rc1/ dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-bin.zip (with props) dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-bin.zip.asc dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-bin.zip.sha512 dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-src.zip (with props) dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-src.zip.asc dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-src.zip.sha512 Added: dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-bin.zip == Binary file - no diff available. Propchange: dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-bin.zip.asc == --- dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-bin.zip.asc (added) +++ dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-bin.zip.asc Thu Nov 29 07:01:20 2018 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEOiTcLcdgyP2exB5ZbiaPbjg91GUFAlv/jhsACgkQbiaPbjg9 +1GWFRwgA241IGbT56NZzk+CUF46ga4HEZRI33KGfKf8mddfrzTDxsDp5uZuObEIe +B0v30Kj2H+F+HZXaJHk89q1nQX4kUcL5kuzi/exwiWxhkn05nglMZw++TrLfUlzw +SDLKwGRODSthzvjUGPdGQFvrymfvTpp4FnBWi1461yZsY+9fFOCI9g6GBqluw4we +veQZ+wnJoRqPF+2cnOv409M/XgNp4rvWFClUGmMPg+UZ7MmHRbzDcVvP2BW6w7PG +dbXWkPuMobjhuBmWdi2wXhWEMp5+/jP6q9VHO5cNrTEGb0DuQYfD1vAlj/58Zkms +cMbcmthVdYwQT+GmgIoz3RjPz40i1Q== +=f/8j +-END PGP SIGNATURE- Added: dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-bin.zip.sha512 == --- dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-bin.zip.sha512 (added) +++ dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-bin.zip.sha512 Thu Nov 29 07:01:20 2018 @@ -0,0 +1 @@ +996f519ee74b68f219b063ca077a6594b632e6eb56880c3099648c7fec03d1fb4e2a0cd124f15549d56b50b6e8ef92e7708b154a4d1a7595ea45c18d8e161876 apache-ignite-2.7.0-bin.zip Added: dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-src.zip == Binary file - no diff available. Propchange: dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-src.zip -- svn:mime-type = application/octet-stream Added: dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-src.zip.asc == --- dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-src.zip.asc (added) +++ dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-src.zip.asc Thu Nov 29 07:01:20 2018 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEOiTcLcdgyP2exB5ZbiaPbjg91GUFAlv/jhsACgkQbiaPbjg9 +1GUmwgf7BnzZwgHVLsDfw8YkmhKu36DhPjldUi3ZVeprnH3dVu7vmV6Uja67SiEe +315qfBmLy2fFgo3zmntrghI9vjkar5BQTr+08vr7lzbouFJNMZp7BtimfFX2kC2v +ZqGxfprJKnKgLTG0rqSo9hN6HYLmrBncBPG3qTVc1ehfOaSBdj3BCURSpbgtV/Ty +PbZkyjk9AWhhg0E+KEnIpiWZtJezAevx/+ChkF/LqD8/yi5ztI7ueJuBqDJuaj1u +RjB3tyaqc/vZo6VLAcM5jjsBVz9EN+D4X14AcZhSehjca1inYu3mZcAoAoclU8Uj +qCul7TMI1LPCoD5j7+CkMBLvb/m/8Q== +=ohz3 +-END PGP SIGNATURE- Added: dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-src.zip.sha512 == --- dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-src.zip.sha512 (added) +++ dev/ignite/2.7.0-rc1/apache-ignite-2.7.0-src.zip.sha512 Thu Nov 29 07:01:20 2018 @@ -0,0 +1 @@ +726801dd64d052d840065256ace6b18e26ac74adf149c8d4eb285cbc99e86c780d03919e96fe56b3ee399babf8917d90f853b37a78ca681b3c467cae7a3c73e3 apache-ignite-2.7.0-src.zip
[ignite] Git Push Summary
Repository: ignite Updated Tags: refs/tags/2.7.0-rc1 [created] 622357da6
svn commit: r1847694 - in /ignite/site/trunk: events.html features/multilanguage-2.html features/tensorflow.html features/transactions-2.html images/tensorflow-1.png includes/sh.html index.html
Author: dmagda Date: Thu Nov 29 02:22:23 2018 New Revision: 1847694 URL: http://svn.apache.org/viewvc?rev=1847694=rev Log: updating webpages with features description Added: ignite/site/trunk/images/tensorflow-1.png (with props) Modified: ignite/site/trunk/events.html ignite/site/trunk/features/multilanguage-2.html ignite/site/trunk/features/tensorflow.html ignite/site/trunk/features/transactions-2.html ignite/site/trunk/includes/sh.html ignite/site/trunk/index.html Modified: ignite/site/trunk/events.html URL: http://svn.apache.org/viewvc/ignite/site/trunk/events.html?rev=1847694=1847693=1847694=diff == --- ignite/site/trunk/events.html (original) +++ ignite/site/trunk/events.html Thu Nov 29 02:22:23 2018 @@ -51,6 +51,157 @@ under the License. Meetups & Events + +Distributed Database DevOps Dilemmas? Kubernetes to the rescue! + + +Amsterdam Kubernetes/Cloud-Native Meetup, Speaker - Akmal Chaudhri +December 6, 2018 + +Distributed databases can make so many things easier for a developer, but not always for DevOps. +Kubernetes has come to the rescue with an easy application orchestration! It is straightforward to do the orchestration leaning on relational databases as a data layer. +However, it is more difficult to do the same when a distributed SQL database or other kind of distributed storage is used instead. +In this presentation, attendees will learn how Kubernetes can orchestrate a distributed database like Apache Ignite, in particular: + + +Cluster Assembling - database nodes auto-discovery in Kubernetes +Database Resilience - automated horizontal scalability +Database Availability - whatâs the role of Kubernetes and the database +Utilizing both RAM and disk - set up Apache Ignite in a way to get in-memory performance with the durability of disk + + + +https://www.meetup.com/Amsterdam-Kubernetes-Meetup/events/256234544; target="_blank">Read more + + + + + +https://www.meetup.com/Amsterdam-Kubernetes-Meetup/events/256234544; + data-a2a-title="Distributed Database DevOps Dilemmas? Kubernetes to the rescue!"> + + + +https://www.addtoany.com/share;> + + + + + + +Distributed Database DevOps Dilemmas? Kubernetes to the rescue! + + +Hamburg Kubernetes/Cloud-Native Meetup, Speaker - Akmal Chaudhri +December 5, 2018 + +Distributed databases can make so many things easier for a developer, but not always for DevOps. +Kubernetes has come to the rescue with an easy application orchestration! It is straightforward to do the orchestration leaning on relational databases as a data layer. +However, it is more difficult to do the same when a distributed SQL database or other kind of distributed storage is used instead. +In this presentation, attendees will learn how Kubernetes can orchestrate a distributed database like Apache Ignite, in particular: + + +Cluster Assembling - database nodes auto-discovery in Kubernetes +Database Resilience - automated horizontal scalability +Database Availability - whatâs the role of Kubernetes and the database +Utilizing both RAM and disk - set up Apache Ignite in a way to get in-memory performance with the durability of disk + + + +https://www.meetup.com/Hamburg-Kubernetes-Meetup/events/256200849/; target="_blank">Read more + + + + + +https://www.meetup.com/Hamburg-Kubernetes-Meetup/events/256200849/; + data-a2a-title="Distributed Database DevOps Dilemmas? Kubernetes to the rescue!"> +
[ignite-teamcity-bot] branch ignite-9542-new-run-stripe updated: IGNITE-9542 Critical failures covered by test
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-9542-new-run-stripe in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git The following commit(s) were added to refs/heads/ignite-9542-new-run-stripe by this push: new ce95b0e IGNITE-9542 Critical failures covered by test ce95b0e is described below commit ce95b0ebddd600ea34200d7b6738a7ab4a0e4cdd Author: Dmitriy Pavlov AuthorDate: Wed Nov 28 21:07:25 2018 +0300 IGNITE-9542 Critical failures covered by test --- .../ci/teamcity/ignited/fatbuild/FatBuildCompacted.java | 15 +++ .../ci/teamcity/ignited/fatbuild/ProblemCompacted.java| 9 + .../ci/teamcity/ignited/runhist/InvocationData.java | 2 +- .../ignite/ci/tcbot/chain/PrChainsProcessorTest.java | 12 ++-- .../ignited/IgnitedTcInMemoryIntegrationTest.java | 1 + 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java index 79e1226..e1b1041 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java @@ -473,15 +473,22 @@ public class FatBuildCompacted extends BuildRefCompacted implements IVersionedEn final int failCode ; -if(success) +if (success) failCode = InvocationData.OK; else { -failCode = InvocationData.FAILURE; - +if (problems() +.stream().anyMatch(occurrence -> +occurrence.isExecutionTimeout(compactor) +|| occurrence.isJvmCrash(compactor) +|| occurrence.isBuildFailureOnMetric(compactor) +|| occurrence.isCompilationError(compactor))) +failCode = InvocationData.CRITICAL_FAILURE; +else +failCode = InvocationData.FAILURE; } -invocation.status((byte) failCode); +invocation.status((byte)failCode); invocation.startDate(getStartDateTs()); invocation.changesPresent(changes().length > 0 ? 1 : 0); return invocation; diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/ProblemCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/ProblemCompacted.java index 7a800e3..c1942e0 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/ProblemCompacted.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/ProblemCompacted.java @@ -124,6 +124,15 @@ public class ProblemCompacted { return compactor.getStringId(ProblemOccurrence.TC_COMPILATION_ERROR) == type; } + +/** */ +public boolean isBuildFailureOnMetric(IStringCompactor compactor) { +return compactor.getStringId(ProblemOccurrence.BUILD_FAILURE_ON_METRIC) == type; +} + +/** + * @param compactor Compactor. + */ public boolean isExecutionTimeout(IStringCompactor compactor) { return compactor.getStringId(ProblemOccurrence.TC_EXECUTION_TIMEOUT) == type; } diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java index ad0336c..bb0e6af 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java @@ -139,7 +139,7 @@ public class InvocationData { * */ public int failuresCount() { -return (int)invocations().filter(inv -> inv.status == FAILURE).count(); +return (int)invocations().filter(inv -> inv.status == FAILURE || inv.status == CRITICAL_FAILURE).count(); } /** {@inheritDoc} */ diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java index 741c7f6..963533e 100644 --- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java +++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java @@ -201,13 +201,21 @@ public class PrChainsProcessorTest { addBuilds(cancelledBuild); for (int i = 0; i < NUM_OF_TESTS_IN_MASTER; i++) { -addBuilds(createFailedBuild(c, CACHE_1, +FatBuildCompacted
[ignite-teamcity-bot] branch ignite-9542-new-run-stripe updated: IGNITE-9542 SuiteResults saving implemented
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-9542-new-run-stripe in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git The following commit(s) were added to refs/heads/ignite-9542-new-run-stripe by this push: new d3f20ba IGNITE-9542 SuiteResults saving implemented d3f20ba is described below commit d3f20baccfae103b812fcebe57fae24718a5407c Author: Dmitriy Pavlov AuthorDate: Wed Nov 28 20:57:53 2018 +0300 IGNITE-9542 SuiteResults saving implemented --- .../apache/ignite/ci/IgnitePersistentTeamcity.java | 5 +- .../java/org/apache/ignite/ci/db/DbMigrations.java | 13 + .../java/org/apache/ignite/ci/db/TcHelperDb.java | 24 +++- .../ci/github/ignited/GitHubConnIgnitedImpl.java | 15 + .../ci/teamcity/ignited/BuildRefCompacted.java | 4 ++ .../ci/teamcity/ignited/TeamcityIgnitedImpl.java | 2 +- .../ignited/fatbuild/FatBuildCompacted.java| 23 .../ignited/runhist/RunHistCompactedDao.java | 68 +- .../ci/teamcity/ignited/runhist/RunHistSync.java | 62 +++- .../ci/tcbot/chain/PrChainsProcessorTest.java | 7 ++- .../ignited/IgnitedTcInMemoryIntegrationTest.java | 8 ++- 11 files changed, 169 insertions(+), 62 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 f7b3950..292e85e 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 @@ -349,9 +349,12 @@ public class IgnitePersistentTeamcity implements IAnalyticsEnabledTeamcity, ITea return teamcity.host(); } +@Deprecated private void registerCriticalBuildProblemInStat(BuildRef build, ProblemOccurrences problems) { boolean criticalFail = problems.getProblemsNonNull().stream().anyMatch(occurrence -> -occurrence.isExecutionTimeout() || occurrence.isJvmCrash() || occurrence.isFailureOnMetric() +occurrence.isExecutionTimeout() +|| occurrence.isJvmCrash() +|| occurrence.isFailureOnMetric() || occurrence.isCompilationError()); String suiteId = build.suiteId(); diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/DbMigrations.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/DbMigrations.java index 443195e..64bea12 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/DbMigrations.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/DbMigrations.java @@ -115,6 +115,15 @@ public class DbMigrations { String TESTS = "tests"; String TEST_REFS = "testRefs"; String ISSUES_USAGES_LIST = "issuesUsagesList"; + +/** Cache name.*/ +public static final String TEST_HIST_CACHE_NAME = "testRunHistV0"; + +/** Build Start time Cache name. */ +public static final String BUILD_START_TIME_CACHE_NAME = "buildStartTimeV0"; + +/** Cache name.*/ +public static final String SUITE_HIST_CACHE_NAME = "teamcitySuiteRunHistV0"; } private final Ignite ignite; @@ -396,6 +405,10 @@ public class DbMigrations { applyDestroyIgnCacheMigration(Old.TEST_REFS); applyDestroyIgnCacheMigration(Old.ISSUES_USAGES_LIST); + +applyDestroyCacheMigration(Old.SUITE_HIST_CACHE_NAME, Old.SUITE_HIST_CACHE_NAME); +applyDestroyCacheMigration(Old.BUILD_START_TIME_CACHE_NAME, Old.BUILD_START_TIME_CACHE_NAME); +applyDestroyCacheMigration(Old.TEST_HIST_CACHE_NAME, Old.TEST_HIST_CACHE_NAME); } private void applyDestroyIgnCacheMigration(String cacheName) { diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java index 23f7e62..140859e 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java @@ -136,42 +136,62 @@ public class TcHelperDb { } +@NotNull +public static CacheConfiguration getCache8PartsConfig(String name) { +CacheConfiguration ccfg = new CacheConfiguration<>(name); + +ccfg.setAffinity(new RendezvousAffinityFunction(false, 8)); + +return ccfg; +} + public static class LocalOnlyTcpDiscoveryIpFinder implements TcpDiscoveryIpFinder { +/** Port. */ private int port; +/** + * @param port Port. + */ public LocalOnlyTcpDiscoveryIpFinder(int port) { this.port = port; } +/** {@inheritDoc} */ @Override public void onSpiContextInitialized(IgniteSpiContext
[ignite-teamcity-bot] branch ignite-9542-new-run-stripe updated: IGNITE-9542 Preparing new method for suite history
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-9542-new-run-stripe in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git The following commit(s) were added to refs/heads/ignite-9542-new-run-stripe by this push: new 80dfe16 IGNITE-9542 Preparing new method for suite history 80dfe16 is described below commit 80dfe1654943afd9c3814810f79ffca2d6e84a6a Author: Dmitriy Pavlov AuthorDate: Wed Nov 28 20:19:37 2018 +0300 IGNITE-9542 Preparing new method for suite history --- .../org/apache/ignite/ci/analysis/RunStat.java | 20 + .../ignite/ci/di/scheduler/TcBotScheduler.java | 7 +++- .../ignite/ci/teamcity/ignited/IRunHistory.java| 19 + .../ci/teamcity/ignited/ITeamcityIgnited.java | 5 +++ .../ci/teamcity/ignited/TeamcityIgnitedImpl.java | 10 - .../teamcity/ignited/runhist/InvocationData.java | 32 +-- .../teamcity/ignited/runhist/RunHistCompacted.java | 16 +--- .../ignited/runhist/RunHistCompactedDao.java | 47 +++--- .../ci/teamcity/ignited/runhist/RunHistKey.java| 21 +++--- .../ci/teamcity/ignited/runhist/RunHistSync.java | 25 +++- .../ci/web/model/current/SuiteCurrentStatus.java | 28 - .../ignite/ci/web/model/current/TestFailure.java | 2 +- 12 files changed, 171 insertions(+), 61 deletions(-) diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java index 0f116ba..72d17b6 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java @@ -187,17 +187,6 @@ public class RunStat implements IRunHistory { -/** - * @return float representing fail rate - */ -public float getCriticalFailRate() { -int runs = getRunsCount(); - -if (runs == 0) -return 1.0f; - -return 1.0f * getCriticalFailuresCount() / runs; -} @Override public int getFailuresCount() { if (latestRuns == null) @@ -206,7 +195,7 @@ public class RunStat implements IRunHistory { return (int)latestRuns.values().stream().filter(res -> res.status != RES_OK).count(); } -public int getCriticalFailuresCount() { +@Override public int getCriticalFailuresCount() { if (latestRuns == null) return 0; @@ -217,13 +206,6 @@ public class RunStat implements IRunHistory { return latestRuns == null ? 0 : latestRuns.size(); } - -public String getCriticalFailPercentPrintable() { -return IRunHistory.getPercentPrintable(getCriticalFailRate() * 100.0f); -} - - - public long getAverageDurationMs() { if (runsWithDuration == 0) return 0; diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/scheduler/TcBotScheduler.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/scheduler/TcBotScheduler.java index e1a56da..959c840 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/scheduler/TcBotScheduler.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/scheduler/TcBotScheduler.java @@ -49,12 +49,15 @@ class TcBotScheduler implements IScheduler { /** Submit named task checker guard. */ private AtomicBoolean tickGuard = new AtomicBoolean(); +/** Named tasks. */ private final ConcurrentMap namedTasks = new ConcurrentHashMap<>(); +/** {@inheritDoc} */ @Override public void invokeLater(Runnable cmd, long delay, TimeUnit unit) { service().schedule(cmd, delay, unit); } +/** {@inheritDoc} */ @Override public void sheduleNamed(String fullName, Runnable cmd, long queitPeriod, TimeUnit unit) { NamedTask task = namedTasks.computeIfAbsent(fullName, NamedTask::new); @@ -62,7 +65,7 @@ class TcBotScheduler implements IScheduler { if (tickGuard.compareAndSet(false, true)) { for (int threadId = 0; threadId < POOL_SIZE; threadId++) { -String threadNme = ", runner" + Strings.padStart(Integer.toString(threadId), 2, '0'); +String threadNme = "Runner " + Strings.padStart(Integer.toString(threadId), 2, '0'); int period = 15000 + ThreadLocalRandom.current().nextInt(1); service().scheduleAtFixedRate(() -> checkNamedTasks(threadNme), 0, period, TimeUnit.MILLISECONDS); } @@ -70,7 +73,7 @@ class TcBotScheduler implements IScheduler { } /** - * @param threadNme + * @param threadNme Runner name to be used in display. */ @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"}) @MonitoredTask(name = "Scheduled", nameExtArgIndex = 0) diff --git
[ignite-teamcity-bot] branch ignite-9542-new-run-stripe updated: IGNITE-9542 Different branches in builds problem fixed for test run statistics
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-9542-new-run-stripe in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git The following commit(s) were added to refs/heads/ignite-9542-new-run-stripe by this push: new 831a89d IGNITE-9542 Different branches in builds problem fixed for test run statistics 831a89d is described below commit 831a89dbf359e3b12664f877d492547945f34304 Author: Dmitriy Pavlov AuthorDate: Wed Nov 28 19:18:13 2018 +0300 IGNITE-9542 Different branches in builds problem fixed for test run statistics --- .../main/java/org/apache/ignite/ci/ITeamcity.java | 1 + .../apache/ignite/ci/IgnitePersistentTeamcity.java | 17 +++--- .../org/apache/ignite/ci/issue/IssueDetector.java | 7 +--- .../ignite/ci/tcbot/chain/BuildChainProcessor.java | 20 +++ .../ci/teamcity/ignited/ITeamcityIgnited.java | 3 +- .../ci/teamcity/ignited/TeamcityIgnitedImpl.java | 6 ++-- .../ignited/runhist/RunHistCompactedDao.java | 8 +++-- .../ci/teamcity/ignited/runhist/RunHistSync.java | 18 +- .../model/current/ChainAtServerCurrentStatus.java | 11 +- .../ci/web/model/current/SuiteCurrentStatus.java | 39 +++--- .../ignite/ci/web/model/current/TestFailure.java | 14 11 files changed, 82 insertions(+), 62 deletions(-) diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java index 75868d1..e442eb7 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java @@ -43,6 +43,7 @@ import java.util.concurrent.ExecutorService; public interface ITeamcity extends ITeamcityConn { String DEFAULT = ""; +String REFS_HEADS_MASTER = "refs/heads/master"; @Deprecated long DEFAULT_BUILDS_COUNT = 1000; 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 6a85ddf..f7b3950 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 @@ -57,7 +57,7 @@ import java.util.function.Predicate; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import static org.apache.ignite.ci.tcbot.chain.BuildChainProcessor.normalizeBranch; +import static org.apache.ignite.ci.teamcity.ignited.runhist.RunHistSync.normalizeBranch; /** * Apache Ignite based cache over teamcity responses (REST caches). @@ -69,6 +69,7 @@ public class IgnitePersistentTeamcity implements IAnalyticsEnabledTeamcity, ITea //V2 caches, 32 parts (V1 caches were 1024 parts) @Deprecated private static final String TESTS_RUN_STAT = "testsRunStat"; +@Deprecated private static final String CALCULATED_STATISTIC = "calculatedStatistic"; private static final String LOG_CHECK_RESULT = "logCheckResult"; @@ -318,7 +319,7 @@ public class IgnitePersistentTeamcity implements IAnalyticsEnabledTeamcity, ITea } @NotNull private SuiteInBranch keyForBuild(Build loaded) { -return new SuiteInBranch(loaded.suiteId(), normalizeBranch(loaded)); +return new SuiteInBranch(loaded.suiteId(), normalizeBranch(loaded.branchName)); } private Build realLoadBuild(String href1) { @@ -360,7 +361,7 @@ public class IgnitePersistentTeamcity implements IAnalyticsEnabledTeamcity, ITea return; if (buildId != null && !Strings.isNullOrEmpty(suiteId)) { -SuiteInBranch key = new SuiteInBranch(suiteId, normalizeBranch(build)); +SuiteInBranch key = new SuiteInBranch(suiteId, normalizeBranch(build.branchName)); buildsFailureRunStatCache().invoke(key, (entry, arguments) -> { SuiteInBranch suiteInBranch = entry.getKey(); @@ -408,10 +409,12 @@ public class IgnitePersistentTeamcity implements IAnalyticsEnabledTeamcity, ITea .map(Cache.Entry::getValue); } +@Deprecated private IgniteCache testRunStatCache() { return getOrCreateCacheV2(ignCacheNme(TESTS_RUN_STAT)); } +@Deprecated private IgniteCache calculatedStatistic() { return getOrCreateCacheV2(ignCacheNme(CALCULATED_STATISTIC)); } @@ -445,6 +448,7 @@ public class IgnitePersistentTeamcity implements IAnalyticsEnabledTeamcity, ITea return getOrCreateCacheV2(ignCacheNme(LOG_CHECK_RESULT)); } +@Deprecated private void addTestOccurrenceToStat(TestOccurrence next, String normalizedBranch, Boolean changesExist) { String name = next.getName(); if (Strings.isNullOrEmpty(name)) @@ -516,8 +520,11 @@ public class IgnitePersistentTeamcity
[1/3] ignite git commit: IGNITE-10080 Optimized Cache 6 long-running tests - Fixes #5243.
Repository: ignite Updated Branches: refs/heads/ignite-9720 72705a94d -> fb639a0ba IGNITE-10080 Optimized Cache 6 long-running tests - Fixes #5243. 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/0e340428 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e340428 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e340428 Branch: refs/heads/ignite-9720 Commit: 0e340428168741fb8600d6e9021cccabe6d3 Parents: fe8c8cc Author: pereslegin-pa Authored: Wed Nov 28 15:51:15 2018 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 28 15:51:15 2018 +0300 -- .../distributed/CacheExchangeMergeTest.java | 4 +- ...ptimisticTxSuspendResumeMultiServerTest.java | 30 --- .../IgniteOptimisticTxSuspendResumeTest.java| 228 +-- ...OptimisticPrepareOnUnstableTopologyTest.java | 164 ++--- .../transactions/TxRollbackOnTimeoutTest.java | 3 +- .../ignite/testframework/GridTestUtils.java | 6 +- .../testsuites/IgniteCacheTestSuite6.java | 2 - 7 files changed, 238 insertions(+), 199 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/0e340428/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java index 03ea539..2dad0b5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java @@ -419,7 +419,9 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void concurrentStart(final boolean withClients) throws Exception { -for (int i = 0; i < 5; i++) { +int iterations = GridTestUtils.SF.applyLB(5, 1); + +for (int i = 0; i < iterations; i++) { log.info("Iteration: " + i); startGrid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/0e340428/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeMultiServerTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeMultiServerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeMultiServerTest.java deleted file mode 100644 index b7003d4..000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeMultiServerTest.java +++ /dev/null @@ -1,30 +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.internal.processors.cache.distributed; - -/** - * - */ -public class IgniteOptimisticTxSuspendResumeMultiServerTest extends IgniteOptimisticTxSuspendResumeTest { -/** - * @return Number of server nodes. - */ -@Override protected int serversNumber() { -return 4; -} -} http://git-wip-us.apache.org/repos/asf/ignite/blob/0e340428/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java index 66c204d..73a7dc1 100644 ---
[2/3] ignite git commit: IGNITE-9501 Exclude newly joined nodes from exchange latch
IGNITE-9501 Exclude newly joined nodes from exchange latch Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/371586ae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/371586ae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/371586ae Branch: refs/heads/ignite-9720 Commit: 371586ae7ceb941ba602a6ac2e8c3a313ab882d5 Parents: 0e34042 Author: Alexey Goncharuk Authored: Wed Nov 28 18:57:48 2018 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 28 18:57:48 2018 +0300 -- .../distributed/dht/preloader/latch/ExchangeLatchManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/371586ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java index 35c04fb..0308ff4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java @@ -64,7 +64,7 @@ public class ExchangeLatchManager { * Exchange latch V2 protocol introduces following optimization: * Joining nodes are explicitly excluded from possible latch participants. */ -public static final IgniteProductVersion PROTOCOL_V2_VERSION_SINCE = IgniteProductVersion.fromString("2.7.0"); +public static final IgniteProductVersion PROTOCOL_V2_VERSION_SINCE = IgniteProductVersion.fromString("2.5.3"); /** Logger. */ private final IgniteLogger log;
[3/3] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-9720
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-9720 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb639a0b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb639a0b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb639a0b Branch: refs/heads/ignite-9720 Commit: fb639a0bafa8b0ee52b6e7cc9a788efc862a79d8 Parents: 72705a9 371586a Author: Alexey Goncharuk Authored: Wed Nov 28 19:00:31 2018 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 28 19:00:31 2018 +0300 -- .../preloader/latch/ExchangeLatchManager.java | 2 +- .../distributed/CacheExchangeMergeTest.java | 4 +- ...ptimisticTxSuspendResumeMultiServerTest.java | 30 --- .../IgniteOptimisticTxSuspendResumeTest.java| 228 +-- ...OptimisticPrepareOnUnstableTopologyTest.java | 164 ++--- .../transactions/TxRollbackOnTimeoutTest.java | 3 +- .../ignite/testframework/GridTestUtils.java | 6 +- .../testsuites/IgniteCacheTestSuite6.java | 2 - 8 files changed, 239 insertions(+), 200 deletions(-) --
ignite git commit: IGNITE-9501 Exclude newly joined nodes from exchange latch
Repository: ignite Updated Branches: refs/heads/master 0e3404281 -> 371586ae7 IGNITE-9501 Exclude newly joined nodes from exchange latch Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/371586ae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/371586ae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/371586ae Branch: refs/heads/master Commit: 371586ae7ceb941ba602a6ac2e8c3a313ab882d5 Parents: 0e34042 Author: Alexey Goncharuk Authored: Wed Nov 28 18:57:48 2018 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 28 18:57:48 2018 +0300 -- .../distributed/dht/preloader/latch/ExchangeLatchManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/371586ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java index 35c04fb..0308ff4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java @@ -64,7 +64,7 @@ public class ExchangeLatchManager { * Exchange latch V2 protocol introduces following optimization: * Joining nodes are explicitly excluded from possible latch participants. */ -public static final IgniteProductVersion PROTOCOL_V2_VERSION_SINCE = IgniteProductVersion.fromString("2.7.0"); +public static final IgniteProductVersion PROTOCOL_V2_VERSION_SINCE = IgniteProductVersion.fromString("2.5.3"); /** Logger. */ private final IgniteLogger log;
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-10291 [deleted] d0c2ee7a0
[2/3] ignite git commit: Minors.
Minors. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/24092fc6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/24092fc6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/24092fc6 Branch: refs/heads/ignite-10291 Commit: 24092fc6828e9246873814431dddfeb142fa1c8c Parents: 7749dc7 Author: devozerov Authored: Wed Nov 28 17:04:01 2018 +0300 Committer: devozerov Committed: Wed Nov 28 17:04:01 2018 +0300 -- .../ignite/internal/processors/query/GridQueryProcessor.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/24092fc6/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 16b011f..4ee2577 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -1762,6 +1762,8 @@ public class GridQueryProcessor extends GridProcessorAdapter { if (!cctx.isQueryEnabled()) return null; +// TODO: Exit if cache is empty. How? + if (!busyLock.enterBusy()) return new GridFinishedFuture<>(new NodeStoppingException("Failed to rebuild indexes from hash " + "(grid is stopping)."));
[3/3] ignite git commit: Minors.
Minors. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d0c2ee7a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d0c2ee7a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d0c2ee7a Branch: refs/heads/ignite-10291 Commit: d0c2ee7a01bb202315d7c6ffc917b9ffb0d0bfc8 Parents: 24092fc Author: devozerov Authored: Wed Nov 28 17:07:24 2018 +0300 Committer: devozerov Committed: Wed Nov 28 17:07:24 2018 +0300 -- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../processors/query/h2/IndexBuildClosure.java | 4 +-- .../query/h2/IndexRebuildClosure.java | 36 .../query/h2/IndexRebuildFullClosure.java | 10 ++ .../query/h2/IndexRebuildPartialClosure.java| 10 ++ 5 files changed, 7 insertions(+), 55 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d0c2ee7a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 6e87655..5ee2719 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -2697,7 +2697,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { assert pageStore != null; -IndexRebuildClosure clo; +SchemaIndexCacheVisitorClosure clo; if (!pageStore.hasIndexStore(cctx.groupId())) { // If there are no index store, rebuild all indexes. http://git-wip-us.apache.org/repos/asf/ignite/blob/d0c2ee7a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexBuildClosure.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexBuildClosure.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexBuildClosure.java index 95a5adf..8d1923f 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexBuildClosure.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexBuildClosure.java @@ -47,8 +47,8 @@ public class IndexBuildClosure implements SchemaIndexCacheVisitorClosure { /** {@inheritDoc} */ @Override public void apply(CacheDataRow row) throws IgniteCheckedException { -GridH2Row h2Row = rowDesc.createRow(row); +GridH2Row row0 = rowDesc.createRow(row); -idx.putx(h2Row); +idx.putx(row0); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/d0c2ee7a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildClosure.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildClosure.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildClosure.java deleted file mode 100644 index 75943dd..000 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IndexRebuildClosure.java +++ /dev/null @@ -1,36 +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.internal.processors.query.h2; - -import org.apache.ignite.internal.processors.query.h2.opt.GridH2IndexBase; -import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table; -import org.apache.ignite.internal.processors.query.schema.SchemaIndexCacheVisitorClosure; - -/** - * Index rebuild closure. Exposes information about indexes being rebuilt. - */ -public interface IndexRebuildClosure extends
[1/3] ignite git commit: Removed "exists".
Repository: ignite Updated Branches: refs/heads/ignite-10291 8a2a8610a -> d0c2ee7a0 Removed "exists". Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7749dc7e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7749dc7e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7749dc7e Branch: refs/heads/ignite-10291 Commit: 7749dc7e34ffadfeee43d79e4098fdbe8085ddeb Parents: 8a2a861 Author: devozerov Authored: Wed Nov 28 17:00:15 2018 +0300 Committer: devozerov Committed: Wed Nov 28 17:00:15 2018 +0300 -- .../processors/cache/IgniteCacheOffheapManager.java | 11 --- .../processors/cache/IgniteCacheOffheapManagerImpl.java | 8 .../cache/persistence/GridCacheOffheapManager.java | 6 -- .../processors/cache/persistence/IndexStorage.java | 11 --- .../processors/cache/persistence/IndexStorageImpl.java | 12 .../processors/query/h2/database/H2TreeIndex.java | 12 6 files changed, 60 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7749dc7e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java index 409d387..ed3697a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java @@ -602,17 +602,6 @@ public interface IgniteCacheOffheapManager { public void dropRootPageForIndex(int cacheId, String idxName, int segment) throws IgniteCheckedException; /** - * Check if index root page exists. - * - * @param cacheId Cache ID. - * @param idxName Index name. - * @param segment Segment. - * @return {@code True} if exists. - * @throws IgniteCheckedException If failed. - */ -public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) throws IgniteCheckedException; - -/** * @param idxName Index name. * @return Reuse list for index tree. * @throws IgniteCheckedException If failed. http://git-wip-us.apache.org/repos/asf/ignite/blob/7749dc7e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java index 7a91563..ca14f68 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java @@ -1154,14 +1154,6 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager } /** {@inheritDoc} */ -@Override public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) -throws IgniteCheckedException { -assert false : "Should not be called in in-memory mode."; - -return false; -} - -/** {@inheritDoc} */ @Override public ReuseList reuseListForIndex(String idxName) { return grp.reuseList(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/7749dc7e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java index b807342..e1bd8dd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java @@ -846,12 +846,6 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple } /** {@inheritDoc} */ -@Override public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) -throws IgniteCheckedException { -return indexStorage.cacheIndexExists(cacheId, idxName, segment); -} - -/** {@inheritDoc} */ @Override
[2/4] ignite git commit: Implemented.
Implemented. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/898e82a2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/898e82a2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/898e82a2 Branch: refs/heads/ignite-10291 Commit: 898e82a27dd8a0ec7773eaa5b1e641c12c6c64cd Parents: b35634b Author: devozerov Authored: Wed Nov 28 15:27:55 2018 +0300 Committer: devozerov Committed: Wed Nov 28 15:27:55 2018 +0300 -- .../cache/IgniteCacheOffheapManager.java| 11 ++ .../cache/IgniteCacheOffheapManagerImpl.java| 7 ++ .../GridCacheDatabaseSharedManager.java | 14 ++- .../persistence/GridCacheOffheapManager.java| 5 + .../cache/persistence/IndexStorage.java | 11 ++ .../cache/persistence/IndexStorageImpl.java | 62 --- .../processors/query/GridQueryIndexing.java | 16 +-- .../processors/query/GridQueryProcessor.java| 82 +++--- ...IgniteClientCacheInitializationFailTest.java | 10 +- .../processors/query/h2/IgniteH2Indexing.java | 107 ++- .../processors/query/h2/IndexBuildClosure.java | 54 ++ .../query/h2/IndexRebuildClosure.java | 36 +++ .../query/h2/IndexRebuildFullClosure.java | 55 ++ .../query/h2/IndexRebuildPartialClosure.java| 82 ++ .../query/h2/RebuildIndexFromHashClosure.java | 47 .../query/h2/database/H2TreeIndex.java | 58 +++--- .../processors/query/h2/opt/GridH2Table.java| 27 - .../query/h2/GridIndexRebuildSelfTest.java | 7 +- 18 files changed, 465 insertions(+), 226 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/898e82a2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java index ed3697a..409d387 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java @@ -602,6 +602,17 @@ public interface IgniteCacheOffheapManager { public void dropRootPageForIndex(int cacheId, String idxName, int segment) throws IgniteCheckedException; /** + * Check if index root page exists. + * + * @param cacheId Cache ID. + * @param idxName Index name. + * @param segment Segment. + * @return {@code True} if exists. + * @throws IgniteCheckedException If failed. + */ +public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) throws IgniteCheckedException; + +/** * @param idxName Index name. * @return Reuse list for index tree. * @throws IgniteCheckedException If failed. http://git-wip-us.apache.org/repos/asf/ignite/blob/898e82a2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java index ca14f68..eeae562 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java @@ -1154,6 +1154,13 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager } /** {@inheritDoc} */ +@Override public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) { +assert false : "Should not be called in in-memory mode."; + +return false; +} + +/** {@inheritDoc} */ @Override public ReuseList reuseListForIndex(String idxName) { return grp.reuseList(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/898e82a2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java index c9bf673..eb9e4df 100755 ---
[4/4] ignite git commit: It works.
It works. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8a2a8610 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8a2a8610 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8a2a8610 Branch: refs/heads/ignite-10291 Commit: 8a2a8610a8439b8fedc3271153379d0d57058128 Parents: 4860158 Author: devozerov Authored: Wed Nov 28 16:55:52 2018 +0300 Committer: devozerov Committed: Wed Nov 28 16:55:52 2018 +0300 -- .../java/org/apache/ignite/jdbc/Reproducer.java | 164 +++ .../processors/query/h2/IgniteH2Indexing.java | 9 +- .../processors/query/h2/database/H2Tree.java| 14 ++ .../query/h2/database/H2TreeIndex.java | 4 +- 4 files changed, 188 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8a2a8610/modules/clients/src/test/java/org/apache/ignite/jdbc/Reproducer.java -- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/Reproducer.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/Reproducer.java new file mode 100644 index 000..1899a45 --- /dev/null +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/Reproducer.java @@ -0,0 +1,164 @@ +package org.apache.ignite.jdbc; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.util.Arrays; +import java.util.Properties; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Consumer; +import javax.cache.Cache; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.IgniteJdbcThinDriver; +import org.apache.ignite.Ignition; +import org.apache.ignite.binary.BinaryObject; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +public class Reproducer extends GridCommonAbstractTest { + +static final String NODE_1 = "node1"; +static final String NODE_2 = "node2"; + +public static final String CREATE_TABLE = "CREATE TABLE PERSON (\n" + +" FIRST_NAME VARCHAR,\n" + +" LAST_NAME VARCHAR,\n" + +" ADDRESS VARCHAR,\n" + +" LANG VARCHAR,\n" + +" BIRTH_DATE TIMESTAMP,\n" + +" CONSTRAINT PK_PESON PRIMARY KEY (FIRST_NAME,LAST_NAME,ADDRESS,LANG)\n" + +") WITH \"key_type=PersonKeyType, CACHE_NAME=PersonCache, value_type=PersonValueType, AFFINITY_KEY=FIRST_NAME,template=PARTITIONED,backups=1\""; + +public static final String CREATE_INDEX = "create index PERSON_FIRST_NAME_IDX on PERSON(FIRST_NAME)"; + +public static final String QUERY = "select * from PERSON use index(PERSON_FIRST_NAME_IDX) \n" + +"where \n" + +"FIRST_NAME=?\n" + +"and LAST_NAME=?\n" + +"and ADDRESS=?\n" + +"and LANG = ? "; + +public static void main(String[] args) throws Exception { +cleanPersistenceDir(); // TODO: Enable + +System.out.println(CREATE_TABLE); +System.out.println(CREATE_INDEX); +System.out.println(QUERY); + +Ignite server1 = Ignition.start(getCfg(NODE_1)); +Ignite server2 = Ignition.start(getCfg(NODE_2)); +Ignite client = Ignition.start(getCfg("client").setClientMode(true)); +client.cluster().active(true); + +createTable(); +fill(); + +server2.close(); + +createIndex(); + +server2 = Ignition.start(getCfg(NODE_2)); + +findRows(client); +} + +static IgniteConfiguration getCfg(String id) { +IgniteConfiguration cfg = new IgniteConfiguration(); +TcpDiscoverySpi discovery = new TcpDiscoverySpi(); +TcpDiscoveryVmIpFinder finder = new TcpDiscoveryVmIpFinder(); + +cfg.setConsistentId(id); +cfg.setIgniteInstanceName(id); + +cfg.setDataStorageConfiguration(new DataStorageConfiguration().setDefaultDataRegionConfiguration(new DataRegionConfiguration().setPersistenceEnabled(true))); + +finder.setAddresses(Arrays.asList("127.0.0.1:47500..47509")); +discovery.setIpFinder(finder); +cfg.setDiscoverySpi(discovery); + +return cfg; +} + +private static void createTable() throws SQLException { +try (Connection conn = new IgniteJdbcThinDriver().connect("jdbc:ignite:thin://localhost", new
[1/4] ignite git commit: Minors.
Repository: ignite Updated Branches: refs/heads/ignite-10291 10f5f9e32 -> 8a2a8610a Minors. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b35634bf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b35634bf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b35634bf Branch: refs/heads/ignite-10291 Commit: b35634bf58a3deb903f4ba9590c36eaa16d8fa4a Parents: 10f5f9e Author: devozerov Authored: Wed Nov 28 12:51:32 2018 +0300 Committer: devozerov Committed: Wed Nov 28 12:51:32 2018 +0300 -- .../ignite/internal/processors/query/GridQueryProcessor.java | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b35634bf/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index d3f2930..95ff3d5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -1764,9 +1764,10 @@ public class GridQueryProcessor extends GridProcessorAdapter { GridCompoundFuture fut = new GridCompoundFuture(); for (Map.Entry e : types.entrySet()) { -if (cacheIds.contains(CU.cacheId(e.getKey().cacheName())) && -processedCacheNames.add(e.getKey().cacheName())) -fut.add(rebuildIndexesFromHash(e.getKey().cacheName(), e.getValue())); +String cacheName = e.getKey().cacheName(); + +if (cacheIds.contains(CU.cacheId(cacheName)) && processedCacheNames.add(cacheName)) +fut.add(rebuildIndexesFromHash(cacheName, e.getValue())); } fut.markInitialized();
[3/4] ignite git commit: Minors.
Minors. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48601580 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48601580 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48601580 Branch: refs/heads/ignite-10291 Commit: 48601580e0a87bf2c5c759f736fce3543a5e105c Parents: 898e82a Author: devozerov Authored: Wed Nov 28 15:29:37 2018 +0300 Committer: devozerov Committed: Wed Nov 28 15:29:37 2018 +0300 -- .../processors/cache/IgniteCacheOffheapManagerImpl.java | 3 ++- .../processors/cache/persistence/GridCacheOffheapManager.java | 3 ++- .../testframework/junits/common/GridCommonAbstractTest.java | 2 +- .../ignite/internal/processors/query/h2/IgniteH2Indexing.java | 7 +++ 4 files changed, 8 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/48601580/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java index eeae562..7a91563 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java @@ -1154,7 +1154,8 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager } /** {@inheritDoc} */ -@Override public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) { +@Override public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) +throws IgniteCheckedException { assert false : "Should not be called in in-memory mode."; return false; http://git-wip-us.apache.org/repos/asf/ignite/blob/48601580/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java index 73bf50a..b807342 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java @@ -846,7 +846,8 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple } /** {@inheritDoc} */ -@Override public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) { +@Override public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) +throws IgniteCheckedException { return indexStorage.cacheIndexExists(cacheId, idxName, segment); } http://git-wip-us.apache.org/repos/asf/ignite/blob/48601580/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 c931a0d..883dca7 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 @@ -1725,7 +1725,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { /** * */ -protected void cleanPersistenceDir() throws Exception { +protected static void cleanPersistenceDir() throws Exception { assertTrue("Grids are not stopped", F.isEmpty(G.allGrids())); U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "cp", false)); http://git-wip-us.apache.org/repos/asf/ignite/blob/48601580/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 6582516..9dc15e6 100644 ---
ignite git commit: IGNITE-10080 Optimized Cache 6 long-running tests - Fixes #5243.
Repository: ignite Updated Branches: refs/heads/master fe8c8cc58 -> 0e3404281 IGNITE-10080 Optimized Cache 6 long-running tests - Fixes #5243. 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/0e340428 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e340428 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e340428 Branch: refs/heads/master Commit: 0e340428168741fb8600d6e9021cccabe6d3 Parents: fe8c8cc Author: pereslegin-pa Authored: Wed Nov 28 15:51:15 2018 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 28 15:51:15 2018 +0300 -- .../distributed/CacheExchangeMergeTest.java | 4 +- ...ptimisticTxSuspendResumeMultiServerTest.java | 30 --- .../IgniteOptimisticTxSuspendResumeTest.java| 228 +-- ...OptimisticPrepareOnUnstableTopologyTest.java | 164 ++--- .../transactions/TxRollbackOnTimeoutTest.java | 3 +- .../ignite/testframework/GridTestUtils.java | 6 +- .../testsuites/IgniteCacheTestSuite6.java | 2 - 7 files changed, 238 insertions(+), 199 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/0e340428/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java index 03ea539..2dad0b5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java @@ -419,7 +419,9 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void concurrentStart(final boolean withClients) throws Exception { -for (int i = 0; i < 5; i++) { +int iterations = GridTestUtils.SF.applyLB(5, 1); + +for (int i = 0; i < iterations; i++) { log.info("Iteration: " + i); startGrid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/0e340428/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeMultiServerTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeMultiServerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeMultiServerTest.java deleted file mode 100644 index b7003d4..000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeMultiServerTest.java +++ /dev/null @@ -1,30 +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.internal.processors.cache.distributed; - -/** - * - */ -public class IgniteOptimisticTxSuspendResumeMultiServerTest extends IgniteOptimisticTxSuspendResumeTest { -/** - * @return Number of server nodes. - */ -@Override protected int serversNumber() { -return 4; -} -} http://git-wip-us.apache.org/repos/asf/ignite/blob/0e340428/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java index 66c204d..73a7dc1 100644 ---
[49/50] [abbrv] ignite git commit: IGNITE-10298 Cover possible deadlock in case of caches start and frequent checkpoints. - Fixes #5517.
IGNITE-10298 Cover possible deadlock in case of caches start and frequent checkpoints. - Fixes #5517. Signed-off-by: Pavel Kovalenko Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fe8c8cc5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fe8c8cc5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fe8c8cc5 Branch: refs/heads/ignite-9720 Commit: fe8c8cc5816872ba58bbd2401698b9e847788ea0 Parents: 2418d87 Author: Pavel Kovalenko Authored: Wed Nov 28 13:32:50 2018 +0300 Committer: Pavel Kovalenko Committed: Wed Nov 28 13:32:50 2018 +0300 -- .../GridCacheDatabaseSharedManager.java | 20 ++- ...PdsCacheStartStopWithFreqCheckpointTest.java | 177 +++ .../ignite/testsuites/IgnitePdsTestSuite2.java | 3 + 3 files changed, 198 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/fe8c8cc5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java index 9a083f8..eb52ee6 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java @@ -250,6 +250,9 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan /** Checkpoint thread. Needs to be volatile because it is created in exchange worker. */ private volatile Checkpointer checkpointer; +/** Checkpointer thread instance. */ +private volatile IgniteThread checkpointerThread; + /** For testing only. */ private volatile boolean checkpointsEnabled = true; @@ -427,6 +430,15 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan /** * For test use only. + * + * @return Checkpointer thread instance. + */ +public IgniteThread checkpointerThread() { +return checkpointerThread; +} + +/** + * For test use only. */ public IgniteInternalFuture enableCheckpoints(boolean enable) { GridFutureAdapter fut = new GridFutureAdapter<>(); @@ -2014,7 +2026,11 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan @Override public void onStateRestored(AffinityTopologyVersion topVer) throws IgniteCheckedException { long time = System.currentTimeMillis(); -new IgniteThread(cctx.igniteInstanceName(), "db-checkpoint-thread", checkpointer).start(); +IgniteThread cpThread = new IgniteThread(cctx.igniteInstanceName(), "db-checkpoint-thread", checkpointer); + +cpThread.start(); + +checkpointerThread = cpThread; CheckpointProgressSnapshot chp = checkpointer.wakeupForCheckpoint(0, "node started"); @@ -4648,7 +4664,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan pageStore.ensure(grp.groupId(), p); if (pageStore.pages(grp.groupId(), p) <= 1) { -log.info("Partition [id=" + p + ", state=N/A (only file header) ]"); +log.info("Partition [grp=" + grp.cacheOrGroupName() + ", id=" + p + ", state=N/A (only file header) ]"); continue; } http://git-wip-us.apache.org/repos/asf/ignite/blob/fe8c8cc5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java new file mode 100644 index 000..8e00d88 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java @@ -0,0 +1,177 @@ +/* + * 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
[20/50] [abbrv] ignite git commit: IGNITE-9937 Primary response error can be lost due to unwrapping a key - Fixes #5078.
IGNITE-9937 Primary response error can be lost due to unwrapping a key - Fixes #5078. Signed-off-by: Pavel Kovalenko Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7e1d1783 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7e1d1783 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7e1d1783 Branch: refs/heads/ignite-9720 Commit: 7e1d17830429a78ca62e2f007fece7de6466eb0f Parents: e8eeea3 Author: Roman Guseinov Authored: Mon Nov 26 16:57:47 2018 +0300 Committer: Pavel Kovalenko Committed: Mon Nov 26 16:57:47 2018 +0300 -- .../dht/atomic/GridDhtAtomicCache.java | 30 - .../GridNearAtomicAbstractUpdateFuture.java | 43 ++- .../cache/store/CacheStoreWriteErrorTest.java | 127 +++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + 4 files changed, 196 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7e1d1783/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 86d7b3c..74be8e1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -34,6 +34,7 @@ import javax.cache.processor.EntryProcessorResult; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; +import org.apache.ignite.binary.BinaryInvalidTypeException; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.NodeStoppingException; @@ -2725,6 +2726,8 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { final GridDhtAtomicAbstractUpdateFuture dhtFut = dhtUpdRes.dhtFuture(); +Collection failedToUnwrapKeys = null; + // Avoid iterator creation. for (int i = 0; i < entries.size(); i++) { GridDhtCacheEntry entry = entries.get(i); @@ -2737,9 +2740,26 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { continue; } -if (storeErr != null && - storeErr.failedKeys().contains(entry.key().value(ctx.cacheObjectContext(), false))) -continue; +if (storeErr != null) { +Object key = entry.key(); + +try { +key = entry.key().value(ctx.cacheObjectContext(), false); +} +catch (BinaryInvalidTypeException e) { +if (log.isDebugEnabled()) { +if (failedToUnwrapKeys == null) +failedToUnwrapKeys = new ArrayList<>(); + +// To limit keys count in log message. +if (failedToUnwrapKeys.size() < 5) +failedToUnwrapKeys.add(key); +} +} + +if (storeErr.failedKeys().contains(key)) +continue; +} try { // We are holding java-level locks on entries at this point. @@ -2868,6 +2888,10 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { dhtUpdRes.processedEntriesCount(firstEntryIdx + i + 1); } +if (failedToUnwrapKeys != null) { +log.warning("Failed to get values of keys: " + failedToUnwrapKeys + +" (the binary objects will be used instead)."); +} } catch (IgniteCheckedException e) { res.addFailedKeys(putMap != null ? putMap.keySet() : rmvKeys, e); http://git-wip-us.apache.org/repos/asf/ignite/blob/7e1d1783/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
[ignite-teamcity-bot] branch ignite-9542-new-run-stripe updated: IGNITE-9542 A number of optimization for initial loading
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-9542-new-run-stripe in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git The following commit(s) were added to refs/heads/ignite-9542-new-run-stripe by this push: new 81ba33d IGNITE-9542 A number of optimization for initial loading 81ba33d is described below commit 81ba33d0cd623263ed917cb9d288d1c7c9caf490 Author: Dmitriy Pavlov AuthorDate: Wed Nov 28 15:44:26 2018 +0300 IGNITE-9542 A number of optimization for initial loading --- .../ci/teamcity/ignited/runhist/Invocation.java| 19 + .../teamcity/ignited/runhist/InvocationData.java | 47 ++ .../teamcity/ignited/runhist/RunHistCompacted.java | 20 - .../ignited/runhist/RunHistCompactedDao.java | 10 +++-- .../ci/teamcity/ignited/runhist/RunHistSync.java | 39 +- .../ci/web/model/current/SuiteCurrentStatus.java | 2 +- 6 files changed, 107 insertions(+), 30 deletions(-) diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java index 88e8510..f540c2f 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java @@ -18,6 +18,7 @@ package org.apache.ignite.ci.teamcity.ignited.runhist; import com.google.common.base.MoreObjects; +import com.google.common.base.Objects; import com.google.common.base.Preconditions; public class Invocation { @@ -64,4 +65,22 @@ public class Invocation { public long startDate() { return startDate; } + +/** {@inheritDoc} */ +@Override public boolean equals(Object o) { +if (this == o) +return true; +if (o == null || getClass() != o.getClass()) +return false; +Invocation that = (Invocation)o; +return buildId == that.buildId && +status == that.status && +changePresent == that.changePresent && +startDate == that.startDate; +} + +/** {@inheritDoc} */ +@Override public int hashCode() { +return Objects.hashCode(buildId, status, changePresent, startDate); +} } diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java index c740d15..a194c7c 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java @@ -18,6 +18,7 @@ package org.apache.ignite.ci.teamcity.ignited.runhist; import com.google.common.base.MoreObjects; +import com.google.common.base.Objects; import java.time.Duration; import java.util.List; import java.util.stream.Collectors; @@ -55,30 +56,44 @@ public class InvocationData { return allHistRuns; } -public boolean add(int build, Invocation inv) { +public boolean add(Invocation inv) { +try { +return innerAdd(inv); +} +finally { +removeEldiest(); +} +} + +public boolean innerAdd(Invocation inv) { +int build = inv.buildId(); +if (build < 0) +return false; + if (invocationMap.containsKey(build)) return false; +if (isExpired(inv.startDate)) +return false; + Invocation prevVal = invocationMap.putIfAbsent(build, inv); -final boolean newValue = prevVal == null; +final boolean newVal = prevVal == null; -if (newValue) { +if (newVal) { allHistRuns++; if (inv.isFailure()) allHistFailures++; } -removeEldiest(); - -return newValue; +return newVal; } void removeEldiest() { invocationMap.entrySet().removeIf(entries -> isExpired(entries.getValue().startDate)); } -public boolean isExpired(long startDate) { +public static boolean isExpired(long startDate) { return (U.currentTimeMillis() - startDate) > Duration.ofDays(MAX_DAYS).toMillis(); } @@ -110,6 +125,7 @@ public class InvocationData { .count(); } +/** {@inheritDoc} */ @Override public String toString() { return MoreObjects.toStringHelper(this) .add("allHistRuns", allHistRuns) @@ -118,6 +134,23 @@ public class InvocationData { .toString(); } +/** {@inheritDoc} */ +@Override public boolean equals(Object o) { +if (this == o) +return true; +if (o == null ||
ignite git commit: IGNITE-9720 Fixed inspections
Repository: ignite Updated Branches: refs/heads/ignite-9720 04fdbc1af -> 72705a94d IGNITE-9720 Fixed inspections Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/72705a94 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/72705a94 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/72705a94 Branch: refs/heads/ignite-9720 Commit: 72705a94dd79b17145f746eb5fb8aad3f286a095 Parents: 04fdbc1 Author: Alexey Goncharuk Authored: Wed Nov 28 15:30:07 2018 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 28 15:30:07 2018 +0300 -- .../processors/cache/persistence/freelist/AbstractFreeList.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/72705a94/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java index b446ccb..8487c41 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java @@ -373,7 +373,7 @@ public abstract class AbstractFreeList extends PagesList imp } /** {@inheritDoc} */ -public long freeSpace() { +@Override public long freeSpace() { long freeSpace = 0; for (int b = BUCKETS - 2; b > 0; b--) { @@ -601,7 +601,7 @@ public abstract class AbstractFreeList extends PagesList imp /** * @return Number of empty data pages in free list. */ -public int emptyDataPages() { +@Override public int emptyDataPages() { return bucketsSize[REUSE_BUCKET].intValue(); }
[19/50] [abbrv] ignite git commit: IGNITE-10330: Disk page compression. - Fixes #5200.
IGNITE-10330: Disk page compression. - Fixes #5200. Signed-off-by: Sergi Vladykin Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e8eeea37 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e8eeea37 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e8eeea37 Branch: refs/heads/ignite-9720 Commit: e8eeea375584bb31a8a9f60e43c8206cd4753d64 Parents: 9137af7 Author: Sergi Vladykin Authored: Mon Nov 26 15:37:58 2018 +0300 Committer: Sergi Vladykin Committed: Mon Nov 26 15:37:58 2018 +0300 -- modules/compress/licenses/Snappy-LICENSE.txt| 29 + .../compress/licenses/Snappy-java-LICENSE.txt | 202 ++ modules/compress/licenses/Zstd-LICENSE.txt | 30 + modules/compress/licenses/Zstd-jni-LICENSE.txt | 26 + modules/compress/licenses/jnr-ffi-LICENSE.txt | 25 + modules/compress/licenses/jnr-posix-LICENSE.txt | 2486 ++ modules/compress/licenses/lz4-LICENSE.txt | 11 + modules/compress/licenses/lz4-java-LICENSE.txt | 202 ++ modules/compress/pom.xml| 113 + .../compress/CompressionProcessorImpl.java | 403 +++ .../compress/NativeFileSystemLinux.java | 142 + .../compress/NativeFileSystemPosix.java | 54 + .../compress/CompressionProcessorTest.java | 1021 +++ ...DiskPageCompressionIntegrationAsyncTest.java | 30 + .../DiskPageCompressionIntegrationTest.java | 468 .../compress/FileSystemUtilsTest.java | 193 ++ .../IgnitePdsCompressionTestSuite.java | 56 + .../IgnitePdsCompressionTestSuite2.java | 38 + .../org/apache/ignite/DataStorageMetrics.java | 18 + .../apache/ignite/IgniteSystemProperties.java | 44 + .../configuration/CacheConfiguration.java | 60 + .../configuration/DataStorageConfiguration.java | 16 +- .../configuration/DiskPageCompression.java | 38 + .../ignite/internal/GridKernalContext.java |6 + .../ignite/internal/GridKernalContextImpl.java | 12 + .../ignite/internal/IgniteComponentType.java|7 + .../apache/ignite/internal/IgniteKernal.java|2 + .../internal/pagemem/store/PageStore.java | 34 +- .../cache/CacheCompressionManager.java | 95 + .../cache/CacheGroupMetricsMXBeanImpl.java | 23 +- .../processors/cache/GridCacheContext.java | 13 + .../processors/cache/GridCacheProcessor.java|3 + .../persistence/DataStorageMetricsImpl.java | 22 +- .../persistence/DataStorageMetricsSnapshot.java | 18 + .../GridCacheDatabaseSharedManager.java | 89 +- .../cache/persistence/file/AbstractFileIO.java |2 +- .../cache/persistence/file/AsyncFileIO.java | 38 +- .../cache/persistence/file/EncryptedFileIO.java | 16 +- .../cache/persistence/file/FileIO.java | 19 + .../cache/persistence/file/FileIODecorator.java | 17 +- .../cache/persistence/file/FilePageStore.java | 72 +- .../persistence/file/FilePageStoreManager.java | 65 +- .../cache/persistence/file/FilePageStoreV2.java | 21 + .../persistence/file/RandomAccessFileIO.java| 35 + .../cache/persistence/file/UnzipFileIO.java | 15 + .../persistence/pagemem/PageMemoryImpl.java | 20 +- .../persistence/tree/io/AbstractDataPageIO.java | 79 +- .../cache/persistence/tree/io/BPlusIO.java | 32 +- .../persistence/tree/io/CompactablePageIO.java | 43 + .../persistence/tree/io/DataPagePayload.java| 16 + .../cache/persistence/tree/io/PageIO.java | 103 +- .../wal/reader/StandaloneGridKernalContext.java |6 + .../compress/CompressionProcessor.java | 173 ++ .../processors/compress/FileSystemUtils.java| 129 + .../processors/compress/NativeFileSystem.java | 50 + .../apache/ignite/internal/util/GridUnsafe.java |1 + .../ignite/internal/util/IgniteUtils.java | 24 +- .../ignite/mxbean/CacheGroupMetricsMXBean.java | 12 + .../ignite/mxbean/DataStorageMetricsMXBean.java |8 + .../IgniteClusterActivateDeactivateTest.java|2 +- .../cache/persistence/DummyPageIO.java | 21 +- .../IgniteDataStorageMetricsSelfTest.java | 17 +- .../persistence/IgnitePdsDynamicCacheTest.java |3 +- .../IgnitePdsExchangeDuringCheckpointTest.java |1 + .../persistence/IgnitePdsPageSizesTest.java |8 + ...lWalModeChangeDuringRebalancingSelfTest.java | 15 + .../db/IgnitePdsCacheRestoreTest.java |8 +- .../db/IgnitePdsDataRegionMetricsTest.java | 10 +- .../db/IgnitePdsReserveWalSegmentsTest.java |2 - ...gniteCheckpointDirtyPagesForLowLoadTest.java |1 - ...faultPageSizeBackwardsCompatibilityTest.java | 19 +- .../persistence/db/wal/WalCompactionTest.java | 26 +- .../db/wal/WalDeletionArchiveAbstractTest.java |1 - .../database/IgniteDbAbstractTest.java |2
[34/50] [abbrv] ignite git commit: IGNITE-8718: Fixed doxygen comments in C++
IGNITE-8718: Fixed doxygen comments in C++ Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/90317330 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/90317330 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/90317330 Branch: refs/heads/ignite-9720 Commit: 9031733028ed79a35924319301279d3a2de8afbb Parents: 1906002 Author: Igor Sapego Authored: Tue Nov 27 19:17:16 2018 +0300 Committer: Igor Sapego Committed: Tue Nov 27 19:17:16 2018 +0300 -- .../include/ignite/binary/binary_object.h | 1 + .../include/ignite/binary/binary_raw_reader.h | 20 ++ .../include/ignite/binary/binary_raw_writer.h | 38 +- .../include/ignite/binary/binary_reader.h | 26 ++-- .../include/ignite/binary/binary_writer.h | 42 ++-- 5 files changed, 120 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/90317330/modules/platforms/cpp/binary/include/ignite/binary/binary_object.h -- diff --git a/modules/platforms/cpp/binary/include/ignite/binary/binary_object.h b/modules/platforms/cpp/binary/include/ignite/binary/binary_object.h index 4edbe84..bbad488 100644 --- a/modules/platforms/cpp/binary/include/ignite/binary/binary_object.h +++ b/modules/platforms/cpp/binary/include/ignite/binary/binary_object.h @@ -68,6 +68,7 @@ namespace ignite * @param mem Binary object memory. * @param start Object starting position in memory. * @param idRslvr ID resolver. + * @param metaMgr Metadata manager. */ BinaryObject(impl::interop::InteropMemory& mem, int32_t start, impl::binary::BinaryIdResolver* idRslvr, impl::binary::BinaryTypeManager* metaMgr) : http://git-wip-us.apache.org/repos/asf/ignite/blob/90317330/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_reader.h -- diff --git a/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_reader.h b/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_reader.h index 73d2525..dd7a696 100644 --- a/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_reader.h +++ b/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_reader.h @@ -342,6 +342,11 @@ namespace ignite /** * Start string array read. * + * Every time you get a BinaryStringArrayReader from BinaryRawReader + * you start reading session. Only one single reading session can be + * open at a time. So it is not allowed to start new reading session + * until all elements of the collection have been read. + * * @return String array reader. */ BinaryStringArrayReader ReadStringArray(); @@ -349,6 +354,11 @@ namespace ignite /** * Start array read. * + * Every time you get a BinaryArrayReader from BinaryRawReader you + * start reading session. Only one single reading session can be + * open at a time. So it is not allowed to start new reading session + * until all elements of the collection have been read. + * * @return Array reader. */ template @@ -364,6 +374,11 @@ namespace ignite /** * Start collection read. * + * Every time you get a BinaryCollectionReader from BinaryRawReader + * you start reading session. Only one single reading session can be + * open at a time. So it is not allowed to start new reading session + * until all elements of the collection have been read. + * * @return Collection reader. */ template @@ -392,6 +407,11 @@ namespace ignite /** * Start map read. * + * Every time you get a BinaryMapReader from BinaryRawReader you + * start reading session. Only one single reading session can be + * open at a time. So it is not allowed to start new reading session + * until all elements of the collection have been read. + * * @return Map reader. */ template http://git-wip-us.apache.org/repos/asf/ignite/blob/90317330/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_writer.h -- diff --git a/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_writer.h
[33/50] [abbrv] ignite git commit: IGNITE-7441 Drop IGNITE_SERVICES_COMPATIBILITY_MODE system property - Fixes #5482.
IGNITE-7441 Drop IGNITE_SERVICES_COMPATIBILITY_MODE system property - Fixes #5482. Signed-off-by: Ilya Kasnacheev Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/19060028 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/19060028 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/19060028 Branch: refs/heads/ignite-9720 Commit: 19060028185a82878891768ec34adc553384ef5e Parents: 41f4225 Author: Vyacheslav Daradur Authored: Tue Nov 27 18:45:28 2018 +0300 Committer: Ilya Kasnacheev Committed: Tue Nov 27 18:45:28 2018 +0300 -- .../apache/ignite/IgniteSystemProperties.java | 15 --- .../ignite/internal/IgniteNodeAttributes.java | 3 -- .../discovery/GridDiscoveryManager.java | 17 .../service/GridServiceProcessor.java | 12 -- .../ignite/spi/discovery/tcp/ServerImpl.java| 41 .../GridDiscoveryManagerAttributesSelfTest.java | 37 -- 6 files changed, 125 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/19060028/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java index 3c59ea1..d581e75 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java @@ -591,21 +591,6 @@ public final class IgniteSystemProperties { "IGNITE_H2_INDEXING_CACHE_THREAD_USAGE_TIMEOUT"; /** - * Manages backward compatibility of {@link IgniteServices}. All nodes in cluster must have identical value - * of this property. - * - * If property is {@code false} then node is not required to have service implementation class if service is not - * deployed on this node. - * - * If the property is {@code true} then service implementation class is required on node even if service - * is not deployed on this node. - * - * If the property is not set ({@code null}) then Ignite will automatically detect which compatibility mode - * should be used. - */ -public static final String IGNITE_SERVICES_COMPATIBILITY_MODE = "IGNITE_SERVICES_COMPATIBILITY_MODE"; - -/** * Manages backward compatibility of {@link StreamTransformer#from(CacheEntryProcessor)} method. * * If the property is {@code true}, then the wrapped {@link CacheEntryProcessor} won't be able to be loaded over http://git-wip-us.apache.org/repos/asf/ignite/blob/19060028/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java index 4ca4f1b..24a71a8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java @@ -174,9 +174,6 @@ public final class IgniteNodeAttributes { /** Late affinity assignment mode. */ public static final String ATTR_LATE_AFFINITY_ASSIGNMENT = ATTR_PREFIX + ".cache.lateAffinity"; -/** Ignite services compatibility mode (can be {@code null}). */ -public static final String ATTR_SERVICES_COMPATIBILITY_MODE = ATTR_PREFIX + ".services.compatibility.enabled"; - /** Late affinity assignment mode. */ public static final String ATTR_ACTIVE_ON_START = ATTR_PREFIX + ".active.on.start"; http://git-wip-us.apache.org/repos/asf/ignite/blob/19060028/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 0a982b0..9a0ca92 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -144,7 +144,6 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_BINARY_MARSHALLER_ import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISCOVERY_HISTORY_SIZE; import static org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID; import static
[37/50] [abbrv] ignite git commit: IGNITE-10390 Fixed BPlusTree#isEmpty - Fixes #5486.
IGNITE-10390 Fixed BPlusTree#isEmpty - Fixes #5486. 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/0b4282be Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0b4282be Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0b4282be Branch: refs/heads/ignite-9720 Commit: 0b4282be26b4d042637ce57821e9a3448043d56d Parents: 23de743 Author: Alexey Goncharuk Authored: Tue Nov 27 19:31:51 2018 +0300 Committer: Alexey Goncharuk Committed: Tue Nov 27 19:33:26 2018 +0300 -- .../persistence/GridCacheOffheapManager.java| 4 +--- .../cache/persistence/tree/BPlusTree.java | 23 .../processors/database/BPlusTreeSelfTest.java | 23 3 files changed, 38 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/0b4282be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java index 7d4a3ae..44ae6f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java @@ -1463,7 +1463,6 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple * @return Store delegate. * @throws IgniteCheckedException If failed. */ -@SuppressWarnings("SizeReplaceableByIsEmpty") private CacheDataStore init0(boolean checkExists) throws IgniteCheckedException { CacheDataStore delegate0 = delegate; @@ -1574,8 +1573,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple pendingTree = pendingTree0; -// TODO IGNITE-10390 replace size() > 0 with isEmpty() -if (!hasPendingEntries && pendingTree0.size() > 0) +if (!hasPendingEntries && !pendingTree0.isEmpty()) hasPendingEntries = true; int grpId = grp.groupId(); http://git-wip-us.apache.org/repos/asf/ignite/blob/0b4282be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java index 7852008..476667a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java @@ -2109,21 +2109,26 @@ public abstract class BPlusTree extends DataStructure implements long rootId, rootPage = acquirePage(rootId = treeMeta.rootId); -long rootAddr = readLock(rootId, rootPage); +try { +long rootAddr = readLock(rootId, rootPage); -if (rootAddr == 0) { -checkDestroyed(); +if (rootAddr == 0) { +checkDestroyed(); -continue; -} +continue; +} -try { -BPlusIO io = io(rootAddr); +try { +BPlusIO io = io(rootAddr); -return io.getCount(rootAddr) == 0; +return io.getCount(rootAddr) == 0; +} +finally { +readUnlock(rootId, rootPage, rootAddr); +} } finally { -readUnlock(rootId, rootPage, rootAddr); +releasePage(rootId, rootPage); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/0b4282be/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java index fa72978..ae9aff8 100644 ---
[43/50] [abbrv] ignite git commit: IGNITE-8542: [ML] Add OneVsRest Trainer to handle cases with multiple class labels in dataset.
IGNITE-8542: [ML] Add OneVsRest Trainer to handle cases with multiple class labels in dataset. This closes #5512 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c3fd4a93 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c3fd4a93 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c3fd4a93 Branch: refs/heads/ignite-9720 Commit: c3fd4a930cc1a76b4d1fbccc6d764bdfe88da941 Parents: 3885f3f Author: zaleslaw Authored: Wed Nov 28 01:45:11 2018 +0300 Committer: Yury Babak Committed: Wed Nov 28 01:45:11 2018 +0300 -- .../ignite/ml/multiclass/MultiClassModel.java | 115 +++ .../ignite/ml/multiclass/OneVsRestTrainer.java | 147 +++ .../org/apache/ignite/ml/IgniteMLTestSuite.java | 4 +- .../ml/multiclass/MultiClassTestSuite.java | 32 .../ml/multiclass/OneVsRestTrainerTest.java | 126 5 files changed, 423 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c3fd4a93/modules/ml/src/main/java/org/apache/ignite/ml/multiclass/MultiClassModel.java -- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/multiclass/MultiClassModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/multiclass/MultiClassModel.java new file mode 100644 index 000..8520aa9 --- /dev/null +++ b/modules/ml/src/main/java/org/apache/ignite/ml/multiclass/MultiClassModel.java @@ -0,0 +1,115 @@ +/* + * 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.ml.multiclass; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.TreeMap; +import org.apache.ignite.ml.Exportable; +import org.apache.ignite.ml.Exporter; +import org.apache.ignite.ml.Model; +import org.apache.ignite.ml.math.primitives.vector.Vector; + +/** Base class for multi-classification model for set of classifiers. */ +public class MultiClassModel> implements Model, Exportable, Serializable { +/** */ +private static final long serialVersionUID = -114986533359917L; + +/** List of models associated with each class. */ +private Map models; + +/** */ +public MultiClassModel() { +this.models = new HashMap<>(); +} + +/** + * Adds a specific binary classifier to the bunch of same classifiers. + * + * @param clsLb The class label for the added model. + * @param mdl The model. + */ +public void add(double clsLb, M mdl) { +models.put(clsLb, mdl); +} + +/** + * @param clsLb Class label. + * @return model for class label if it exists. + */ +public Optional getModel(Double clsLb) { +return Optional.ofNullable(models.get(clsLb)); +} + +/** {@inheritDoc} */ +@Override public Double apply(Vector input) { +TreeMap maxMargins = new TreeMap<>(); + +models.forEach((k, v) -> maxMargins.put(v.apply(input), k)); + +// returns value the most closest to 1 +return maxMargins.lastEntry().getValue(); +} + +/** {@inheritDoc} */ +@Override public void saveModel(Exporter exporter, P path) { +exporter.save(this, path); +} + +/** {@inheritDoc} */ +@Override public boolean equals(Object o) { +if (this == o) +return true; + +if (o == null || getClass() != o.getClass()) +return false; + +MultiClassModel mdl = (MultiClassModel)o; + +return Objects.equals(models, mdl.models); +} + +/** {@inheritDoc} */ +@Override public int hashCode() { +return Objects.hash(models); +} + +/** {@inheritDoc} */ +@Override public String toString() { +StringBuilder wholeStr = new StringBuilder(); + +models.forEach((clsLb, mdl) -> +wholeStr +.append("The class with label ") +.append(clsLb) +.append(" has classifier: ") +
[22/50] [abbrv] ignite git commit: IGNITE-9517: Replace uses of ConcurrentHashSet with GridConcurrentHashSet in tests. - Fixes #5397.
IGNITE-9517: Replace uses of ConcurrentHashSet with GridConcurrentHashSet in tests. - Fixes #5397. 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/acc10241 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/acc10241 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/acc10241 Branch: refs/heads/ignite-9720 Commit: acc1024158ef600cdb078b0de8a9859beaa8b330 Parents: c870500 Author: shroman Authored: Mon Nov 26 17:33:30 2018 +0300 Committer: Dmitriy Pavlov Committed: Mon Nov 26 17:33:30 2018 +0300 -- .../internal/GridMultithreadedJobStealingSelfTest.java | 6 +++--- .../internal/binary/BinaryArrayIdentityResolverSelfTest.java | 4 ++-- .../ignite/internal/binary/BinaryFieldsOffheapSelfTest.java | 4 ++-- .../internal/binary/BinaryFooterOffsetsOffheapSelfTest.java | 4 ++-- .../binary/BinarySerialiedFieldComparatorSelfTest.java | 4 ++-- ...GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java | 4 ++-- .../processors/cache/distributed/CacheExchangeMergeTest.java | 4 ++-- .../GridCachePartitionNotLoadedEventSelfTest.java| 4 ++-- .../cache/distributed/GridCacheTransformEventSelfTest.java | 6 +++--- .../IgniteCacheClientNodeChangingTopologyTest.java | 4 ++-- .../GridTcpCommunicationSpiConcurrentConnectSelfTest.java| 4 ++-- .../tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java | 4 ++-- .../tcp/GridTcpCommunicationSpiRecoverySelfTest.java | 4 ++-- .../IgniteTcpCommunicationRecoveryAckClosureSelfTest.java| 4 ++-- .../tcp/TcpDiscoveryPendingMessageDeliveryTest.java | 8 .../ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java| 8 .../ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java | 4 ++-- 17 files changed, 40 insertions(+), 40 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/acc10241/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java index 293c859..605cb3d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java @@ -37,6 +37,7 @@ import org.apache.ignite.compute.ComputeJobAdapter; import org.apache.ignite.compute.ComputeJobResult; import org.apache.ignite.compute.ComputeTaskAdapter; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.resources.LoggerResource; @@ -45,7 +46,6 @@ import org.apache.ignite.spi.failover.jobstealing.JobStealingFailoverSpi; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; -import org.eclipse.jetty.util.ConcurrentHashSet; import org.jetbrains.annotations.Nullable; /** @@ -86,7 +86,7 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest final AtomicInteger stolen = new AtomicInteger(0); final AtomicInteger noneStolen = new AtomicInteger(0); -final ConcurrentHashSet nodes = new ConcurrentHashSet(); +final GridConcurrentHashSet nodes = new GridConcurrentHashSet(); int threadsNum = 10; @@ -141,7 +141,7 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest final AtomicInteger stolen = new AtomicInteger(0); final AtomicInteger noneStolen = new AtomicInteger(0); -final ConcurrentHashSet nodes = new ConcurrentHashSet(); +final GridConcurrentHashSet nodes = new GridConcurrentHashSet(); int threadsNum = 10; http://git-wip-us.apache.org/repos/asf/ignite/blob/acc10241/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java index 27c39c3..7548cf0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java +++
[40/50] [abbrv] ignite git commit: IGNITE-10158 Some tests in IgniteCacheAbstractQuerySelfTest are incorrectly muted - Fixes #5344.
IGNITE-10158 Some tests in IgniteCacheAbstractQuerySelfTest are incorrectly muted - Fixes #5344. Signed-off-by: Pavel Kovalenko Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/be97bcdc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/be97bcdc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/be97bcdc Branch: refs/heads/ignite-9720 Commit: be97bcdcfa6f0ae0bc37d156806bbac4c09259dc Parents: 07f1dbf Author: Oleg Ignatenko Authored: Tue Nov 27 20:02:47 2018 +0300 Committer: Pavel Kovalenko Committed: Tue Nov 27 20:02:47 2018 +0300 -- .../cache/IgniteCacheAbstractQuerySelfTest.java | 54 +++- .../IgniteCacheQueryMultiThreadedSelfTest.java | 6 +-- 2 files changed, 8 insertions(+), 52 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/be97bcdc/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java index 1c1b879..d5b8ccc 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java @@ -286,21 +286,12 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ -public void _testDifferentKeyTypes() throws Exception { -fail("http://atlassian.gridgain.com/jira/browse/GG-11216;); - +public void testDifferentKeyTypes() throws Exception { final IgniteCache cache = jcache(Object.class, Object.class); cache.put(1, "value"); -try { -cache.put("key", "value"); - -fail(); -} -catch (CacheException ignored) { -// No-op. -} +cache.put("key", "value"); } /** @@ -521,7 +512,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac QueryCursor> qry = cache .query(new SqlQuery(GridCacheQueryTestValue.class, -"fieldName='field1' and field2=1 and field3=1 and id=100500 and embeddedField2=11 and x=3")); +"fieldName='field1' and field2=1 and field3=1 and id=100500 and embeddedField2=11 and x=3")); Cache.Entry entry = F.first(qry.getAll()); @@ -2232,39 +2223,6 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac } /** - * Empty test object. - */ -private static class EmptyObject { -/** */ -private int val; - -/** - * @param val Value. - */ -private EmptyObject(int val) { -this.val = val; -} - -/** {@inheritDoc} */ -@Override public int hashCode() { -return val; -} - -/** {@inheritDoc} */ -@Override public boolean equals(Object o) { -if (this == o) -return true; - -if (!(o instanceof EmptyObject)) -return false; - -EmptyObject that = (EmptyObject)o; - -return val == that.val; -} -} - -/** * */ private static class BadHashKeyObject implements Serializable, Comparable { @@ -2404,9 +2362,9 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac */ @Override public String toString() { return "EnumObject{" + -"id=" + id + -", type=" + type + -'}'; +"id=" + id + +", type=" + type + +'}'; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/be97bcdc/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java index 8f28501..e9ebc18 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java +++
[50/50] [abbrv] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-9720
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-9720 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/04fdbc1a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/04fdbc1a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/04fdbc1a Branch: refs/heads/ignite-9720 Commit: 04fdbc1afd989677991bca876fb0c2d7862262a1 Parents: 0063fb1 fe8c8cc Author: Alexey Goncharuk Authored: Wed Nov 28 14:45:02 2018 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 28 14:45:02 2018 +0300 -- examples/sql/world.sql | 28 +-- .../GridCacheDatabaseSharedManager.java | 20 ++- .../cache/CacheEnumOperationsAbstractTest.java | 2 - ...PdsCacheStartStopWithFreqCheckpointTest.java | 177 +++ ...GridTcpCommunicationSpiRecoverySelfTest.java | 1 - .../ignite/testsuites/IgnitePdsTestSuite2.java | 3 + modules/mesos/pom.xml | 48 - .../ignite/mesos/resource/IgniteProvider.java | 1 - .../components/modal-import-models/service.js | 24 ++- 9 files changed, 230 insertions(+), 74 deletions(-) --
[42/50] [abbrv] ignite git commit: IGNITE-10429: ML: TensorFlowLocalInferenceExample fails on Windows
IGNITE-10429: ML: TensorFlowLocalInferenceExample fails on Windows This closes #5514 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3885f3f1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3885f3f1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3885f3f1 Branch: refs/heads/ignite-9720 Commit: 3885f3f16c159c841a9219942156d12968f5f9d6 Parents: 566adaa Author: Anton Dmitriev Authored: Wed Nov 28 00:02:09 2018 +0300 Committer: Yury Babak Committed: Wed Nov 28 00:02:09 2018 +0300 -- .../inference/util/DirectorySerializerTest.java | 18 ++ parent/pom.xml| 1 + 2 files changed, 11 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/3885f3f1/modules/ml/src/test/java/org/apache/ignite/ml/inference/util/DirectorySerializerTest.java -- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/inference/util/DirectorySerializerTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/inference/util/DirectorySerializerTest.java index d2d6b16..87a515c 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/inference/util/DirectorySerializerTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/inference/util/DirectorySerializerTest.java @@ -63,10 +63,11 @@ public class DirectorySerializerTest { assertEquals(1, files.length); assertEquals("test.txt", files[0].getName()); -Scanner scanner = new Scanner(files[0]); -assertTrue(scanner.hasNextLine()); -assertEquals("Hello, world!", scanner.nextLine()); -assertFalse(scanner.hasNextLine()); +try (Scanner scanner = new Scanner(files[0])) { +assertTrue(scanner.hasNextLine()); +assertEquals("Hello, world!", scanner.nextLine()); +assertFalse(scanner.hasNextLine()); +} } finally { DirectorySerializer.deleteDirectory(src); @@ -111,10 +112,11 @@ public class DirectorySerializerTest { assertEquals(1, files.length); assertEquals("test.txt", files[0].getName()); -Scanner scanner = new Scanner(files[0]); -assertTrue(scanner.hasNextLine()); -assertEquals("Hello, world!", scanner.nextLine()); -assertFalse(scanner.hasNextLine()); +try (Scanner scanner = new Scanner(files[0])) { +assertTrue(scanner.hasNextLine()); +assertEquals("Hello, world!", scanner.nextLine()); +assertFalse(scanner.hasNextLine()); +} } finally { DirectorySerializer.deleteDirectory(src); http://git-wip-us.apache.org/repos/asf/ignite/blob/3885f3f1/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 23e0a0d..2032f1d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -878,6 +878,7 @@ src/main/java/org/apache/ignite/examples/streaming/wordcount/*.txt examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/*.txt **/resources/datasets/**/* + **/*.pb src/main/java/org/jetbrains/annotations/*.java dev-tools/IGNITE-*.patch dev-tools/.gradle/**/*
[36/50] [abbrv] ignite git commit: IGNITE-7072: IgniteCache.replace(k, v, nv) fix for binary mode
IGNITE-7072: IgniteCache.replace(k, v, nv) fix for binary mode Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/23de7435 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/23de7435 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/23de7435 Branch: refs/heads/ignite-9720 Commit: 23de74357483aa2979b54ea4e54254ef0d2f3637 Parents: 882b5a4 Author: Igor Sapego Authored: Tue Nov 27 19:26:26 2018 +0300 Committer: Igor Sapego Committed: Tue Nov 27 19:28:01 2018 +0300 -- .../cache/CacheEntryPredicateContainsValue.java | 4 ++ .../GridCacheBinaryObjectsAbstractSelfTest.java | 58 2 files changed, 62 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/23de7435/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java index 73a98b7..ad9861c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import java.nio.ByteBuffer; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.CU; @@ -60,6 +61,9 @@ public class CacheEntryPredicateContainsValue extends CacheEntryPredicateAdapter GridCacheContext cctx = e.context(); +if (this.val instanceof BinaryObject && val instanceof BinaryObject) +return F.eq(val, this.val); + Object thisVal = CU.value(this.val, cctx, false); Object cacheVal = CU.value(val, cctx, false); http://git-wip-us.apache.org/repos/asf/ignite/blob/23de7435/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java index 00a3181..98e906f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java @@ -290,6 +290,64 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA /** * @throws Exception If failed. */ +public void testReplace() throws Exception { +IgniteCache c = jcache(0); + +for (int i = 0; i < ENTRY_CNT; i++) +c.put(i, new TestObject(i)); + +for (int i = 0; i < ENTRY_CNT; i++) { +TestObject obj = c.get(i); + +assertEquals(i, obj.val); +} + +IgniteCache kpc = keepBinaryCache(); + +BinaryObjectBuilder bldr = grid(0).binary().builder(TestObject.class.getName()); + +bldr.setField("val", -42); + +BinaryObject testObj = bldr.build(); + +for (int i = 0; i < ENTRY_CNT; i++) { +BinaryObject po = kpc.get(i); + +assertEquals(i, (int)po.field("val")); + +assertTrue(kpc.replace(i, po, testObj)); +} +} + +/** + * @throws Exception If failed. + */ +public void testRemove() throws Exception { +IgniteCache c = jcache(0); + +for (int i = 0; i < ENTRY_CNT; i++) +c.put(i, new TestObject(i)); + +for (int i = 0; i < ENTRY_CNT; i++) { +TestObject obj = c.get(i); + +assertEquals(i, obj.val); +} + +IgniteCache kpc = keepBinaryCache(); + +for (int i = 0; i < ENTRY_CNT; i++) { +BinaryObject po = kpc.get(i); + +assertEquals(i, (int)po.field("val")); + +assertTrue(kpc.remove(i, po)); +} +} + +/** + * @throws Exception If failed. + */ public void testIterator() throws Exception { IgniteCache c = jcache(0);
[ignite-teamcity-bot] branch ignite-9542-new-run-stripe updated: IGNITE-9542 More profiling info, scheduler thread names
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-9542-new-run-stripe in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git The following commit(s) were added to refs/heads/ignite-9542-new-run-stripe by this push: new 0e5a1f6 IGNITE-9542 More profiling info, scheduler thread names 0e5a1f6 is described below commit 0e5a1f67a1660a0d4f3b08b672d30e9871ce105a Author: Dmitriy Pavlov AuthorDate: Wed Nov 28 15:10:49 2018 +0300 IGNITE-9542 More profiling info, scheduler thread names --- .../ignite/ci/di/scheduler/TcBotScheduler.java | 12 +++- .../ignited/runhist/RunHistCompactedDao.java | 32 ++ .../ci/teamcity/ignited/runhist/RunHistSync.java | 28 +-- 3 files changed, 15 insertions(+), 57 deletions(-) diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/scheduler/TcBotScheduler.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/scheduler/TcBotScheduler.java index e83e523..e1a56da 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/scheduler/TcBotScheduler.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/scheduler/TcBotScheduler.java @@ -33,8 +33,18 @@ class TcBotScheduler implements IScheduler { /** Logger. */ private static final Logger logger = LoggerFactory.getLogger(TcBotScheduler.class); +private ThreadFactory threadFactory = Executors.defaultThreadFactory(); + +private final ThreadFactory threadFactory1 = r -> { +Thread thread = threadFactory.newThread(r); + +thread.setName("tc-scheduler-" + thread.getName()); + +return thread; +}; + /** Executor service. */ -private volatile ScheduledExecutorService executorSvc = Executors.newScheduledThreadPool(POOL_SIZE); +private volatile ScheduledExecutorService executorSvc = Executors.newScheduledThreadPool(POOL_SIZE, threadFactory1); /** Submit named task checker guard. */ private AtomicBoolean tickGuard = new AtomicBoolean(); diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompactedDao.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompactedDao.java index 3d4377b..a4fa0c7 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompactedDao.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompactedDao.java @@ -80,34 +80,6 @@ public class RunHistCompactedDao { return testHistCache.get(new RunHistKey(srvIdMaskHigh, testName, branchId)); } -@AutoProfiling -public Boolean addInvocation(final int srvId, - final TestCompacted t, - final int buildId, - final int branchName, - Invocation inv) { -RunHistKey histKey = new RunHistKey(srvId, t.testName(), branchName); - -return testHistCache.invoke(histKey, (entry, parms) -> { -boolean newValue = false; -RunHistCompacted hist = entry.getValue(); - -if (hist == null) -hist = new RunHistCompacted(entry.getKey()); - -newValue= hist.addTestRun( -(Integer) parms[0], -(Invocation) parms[1]); - -entry.setValue(hist); - -return newValue; -}, -buildId, inv -); - -} - /** * @param srvId Server id mask high. * @param buildId Build id. @@ -116,15 +88,17 @@ public class RunHistCompactedDao { return (long)buildId | srvId << 32; } - +@AutoProfiling public boolean buildWasProcessed(int srvId, int buildId) { return buildStartTime.containsKey(buildIdToCacheKey(srvId, buildId)); } +@AutoProfiling public boolean setBuildProcessed(int srvId, int buildId, long ts) { return buildStartTime.putIfAbsent(buildIdToCacheKey(srvId, buildId), ts); } +@AutoProfiling public Integer addInvocations(RunHistKey histKey, List list) { if(list.isEmpty()) return 0; diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java index fe72d48..d14a8ed 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java @@ -130,7 +130,7 @@ public class RunHistSync { } @AutoProfiling -@NotNull private String saveInvocationsMap(Map> saveThisRun) { +
[25/50] [abbrv] ignite git commit: IGNITE-9442 Collocated IgniteSet#close is not working on non-affinity node.
IGNITE-9442 Collocated IgniteSet#close is not working on non-affinity node. Signed-off-by: Anton Vinogradov Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/507aeb21 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/507aeb21 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/507aeb21 Branch: refs/heads/ignite-9720 Commit: 507aeb21bf6792bb9efb6518f83049ebc7eab53f Parents: 6fd6c32 Author: pereslegin-pa Authored: Mon Nov 26 18:53:10 2018 +0300 Committer: Anton Vinogradov Committed: Mon Nov 26 18:53:10 2018 +0300 -- .../CacheDataStructuresManager.java | 15 +++--- .../datastructures/GridCacheSetImpl.java| 4 +- .../GridCacheSetAbstractSelfTest.java | 31 ++-- ...idCachePartitionedSetWithClientSelfTest.java | 52 ...chePartitionedSetWithNodeFilterSelfTest.java | 37 ++ ...ridCacheReplicatedSetWithClientSelfTest.java | 52 ...acheReplicatedSetWithNodeFilterSelfTest.java | 37 ++ .../IgniteCacheDataStructuresSelfTestSuite.java | 8 +++ 8 files changed, 224 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/507aeb21/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java index 932f000..9c3c4a6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java @@ -63,6 +63,7 @@ import org.apache.ignite.internal.processors.datastructures.GridTransactionalCac import org.apache.ignite.internal.processors.datastructures.SetItemKey; import org.apache.ignite.internal.processors.task.GridInternal; import org.apache.ignite.internal.util.GridSpinBusyLock; +import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteFuture; @@ -472,7 +473,7 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { while (true) { AffinityTopologyVersion topVer = cctx.topologyVersionFuture().get(); -Collection nodes = CU.affinityNodes(cctx, topVer); +Collection nodes = F.view(cctx.discovery().nodes(topVer), node -> !node.isDaemon()); try { cctx.closures().callAsyncNoFailover(BROADCAST, @@ -502,10 +503,12 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { throw e; } +Collection affNodes = CU.affinityNodes(cctx, topVer); + try { cctx.closures().callAsyncNoFailover(BROADCAST, new RemoveSetDataCallable(cctx.name(), id, topVer), -nodes, +affNodes, true, 0, false).get(); } @@ -516,7 +519,7 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { continue; } -else if (!pingNodes(nodes)) { +else if (!pingNodes(affNodes)) { if (log.isDebugEnabled()) log.debug("RemoveSetData job failed and set data node left, will retry: " + e); @@ -650,9 +653,9 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { GridCacheAdapter cache = ((IgniteKernal)ignite).context().cache().internalCache(cacheName); -assert cache != null : cacheName; - -cache.context().dataStructures().blockSet(setId); +// On non-affinity node cache starts on demand, so it may not be running. +if (cache != null) +cache.context().dataStructures().blockSet(setId); return null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/507aeb21/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
[16/50] [abbrv] ignite git commit: IGNITE-10330: Disk page compression. - Fixes #5200.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8eeea37/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java -- diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java new file mode 100644 index 000..70dda0b --- /dev/null +++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java @@ -0,0 +1,193 @@ +/* + * 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.internal.processors.compress; + +import java.io.FileDescriptor; +import java.nio.ByteBuffer; +import java.nio.channels.FileChannel; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import junit.framework.TestCase; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.typedef.internal.U; + +import static java.nio.file.StandardOpenOption.READ; +import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING; +import static java.nio.file.StandardOpenOption.WRITE; +import static org.apache.ignite.internal.processors.compress.CompressionProcessorImpl.allocateDirectBuffer; +import static org.apache.ignite.internal.processors.compress.FileSystemUtils.getFileSystemBlockSize; +import static org.apache.ignite.internal.processors.compress.FileSystemUtils.getSparseFileSize; +import static org.apache.ignite.internal.processors.compress.FileSystemUtils.punchHole; + +/** + */ +public class FileSystemUtilsTest extends TestCase { +/** + * @throws Exception If failed. + */ +public void testSparseFiles() throws Exception { +if (!U.isLinux()) +return; + +Path file = Files.createTempFile("test_sparse_file_", ".bin"); + +try { +doTestSparseFiles(file, false); // Ext4 expected as default FS. +} +finally { +Files.delete(file); +} +} + +/** + * @throws Exception If failed. + */ +public void _testFileSystems() throws Exception { +doTestSparseFiles(Paths.get("/ext4/test_file"), false); +doTestSparseFiles(Paths.get("/btrfs/test_file"), false); +doTestSparseFiles(Paths.get("/xfs/test_file"), true); +} + +private static int getFD(FileChannel ch) throws IgniteCheckedException { +return U.field(U.field(ch, "fd"), "fd"); +} + +/** + * @param file File path. + * @param reopen Reopen file after each hole punch. XFS needs it. + * @throws Exception If failed. + */ +private void doTestSparseFiles(Path file, boolean reopen) throws Exception { +System.out.println(file); + +FileChannel ch = FileChannel.open(file, +READ, WRITE, TRUNCATE_EXISTING); + +try { +int fd = getFD(ch); + +int fsBlockSize = getFileSystemBlockSize(fd); + +System.out.println("fsBlockSize: " + fsBlockSize); + +assertTrue(fsBlockSize > 0); + +int pageSize = fsBlockSize * 4; + +ByteBuffer page = allocateDirectBuffer(pageSize); + +while (page.remaining() > 0) +page.putLong(0xABCDEF7654321EADL); +page.flip(); + +int pages = 5; +int blocks = pages * pageSize / fsBlockSize; +int fileSize = pages * pageSize; +int sparseSize = fileSize; + +for (int i = 0; i < pages; i++) { +ch.write(page, i * pageSize); +assertEquals(0, page.remaining()); +page.flip(); +} + +if (reopen) { +ch.force(true); +ch.close(); +ch = FileChannel.open(file, READ, WRITE); +fd = getFD(ch); +} + +assertEquals(fileSize, ch.size()); +assertEquals(fileSize, getSparseFileSize(fd)); + +int off = fsBlockSize * 3 - (fsBlockSize >>> 2); +int len = fsBlockSize; +assertEquals(0,
[12/50] [abbrv] ignite git commit: IGNITE-10216: disable sort annotations in inspection config - Fixes #5471.
IGNITE-10216: disable sort annotations in inspection config - Fixes #5471. Signed-off-by: Nikolay Izhikov Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cdaeda10 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cdaeda10 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cdaeda10 Branch: refs/heads/ignite-9720 Commit: cdaeda108c7ce42e9b32264a37ce4ccbdbf55e42 Parents: 475a0a7 Author: Maxim Muzafarov Authored: Fri Nov 23 23:03:15 2018 +0300 Committer: Nikolay Izhikov Committed: Fri Nov 23 23:03:15 2018 +0300 -- idea/ignite_inspections.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/cdaeda10/idea/ignite_inspections.xml -- diff --git a/idea/ignite_inspections.xml b/idea/ignite_inspections.xml index 7ce5af8..9695fca 100644 --- a/idea/ignite_inspections.xml +++ b/idea/ignite_inspections.xml @@ -518,7 +518,7 @@ - +
[48/50] [abbrv] ignite git commit: IGNITE-10002 Fixed inspections
IGNITE-10002 Fixed inspections Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2418d876 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2418d876 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2418d876 Branch: refs/heads/ignite-9720 Commit: 2418d876339f8b79666b361848e6378a3d83b7fd Parents: d21f86f Author: Alexey Goncharuk Authored: Wed Nov 28 11:10:18 2018 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 28 11:12:09 2018 +0300 -- .../internal/processors/cache/CacheEnumOperationsAbstractTest.java | 2 -- .../communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java | 1 - 2 files changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/2418d876/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java index 480d959..0cffeb6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java @@ -32,7 +32,6 @@ import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; -import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -40,7 +39,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; -import static org.junit.Assert.fail; /** * http://git-wip-us.apache.org/repos/asf/ignite/blob/2418d876/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java index 12cf4d9..27f7fa3 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java @@ -105,7 +105,6 @@ public class GridTcpCommunicationSpiRecoverySelfTest } /** */ -@SuppressWarnings({"deprecation"}) private class TestListener implements CommunicationListener { /** */ private boolean block;
[47/50] [abbrv] ignite git commit: IGNITE-10432: Fixed data types in world.sql.
IGNITE-10432: Fixed data types in world.sql. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d21f86f9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d21f86f9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d21f86f9 Branch: refs/heads/ignite-9720 Commit: d21f86f9e7817481acbb9438a9e07ca605246807 Parents: 3606b21 Author: devozerov Authored: Wed Nov 28 11:11:20 2018 +0300 Committer: devozerov Committed: Wed Nov 28 11:11:20 2018 +0300 -- examples/sql/world.sql | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d21f86f9/examples/sql/world.sql -- diff --git a/examples/sql/world.sql b/examples/sql/world.sql index a34ee71..829fba1 100644 --- a/examples/sql/world.sql +++ b/examples/sql/world.sql @@ -2,30 +2,30 @@ DROP TABLE IF EXISTS Country; CREATE TABLE Country ( Code CHAR(3) PRIMARY KEY, - Name CHAR(52), - Continent CHAR(50), - Region CHAR(26), + Name VARCHAR, + Continent VARCHAR, + Region VARCHAR, SurfaceArea DECIMAL(10,2), - IndepYear SMALLINT(6), - Population INT(11), + IndepYear SMALLINT, + Population INT, LifeExpectancy DECIMAL(3,1), GNP DECIMAL(10,2), GNPOld DECIMAL(10,2), - LocalName CHAR(45), - GovernmentForm CHAR(45), - HeadOfState CHAR(60), - Capital INT(11), + LocalName VARCHAR, + GovernmentForm VARCHAR, + HeadOfState VARCHAR, + Capital INT, Code2 CHAR(2) ) WITH "template=partitioned, backups=1, CACHE_NAME=Country, VALUE_TYPE=demo.model.Country"; DROP TABLE IF EXISTS City; CREATE TABLE City ( - ID INT(11), - Name CHAR(35), + ID INT, + Name VARCHAR, CountryCode CHAR(3), - District CHAR(20), - Population INT(11), + District VARCHAR, + Population INT, PRIMARY KEY (ID, CountryCode) ) WITH "template=partitioned, backups=1, affinityKey=CountryCode, CACHE_NAME=City, KEY_TYPE=demo.model.CityKey, VALUE_TYPE=demo.model.City"; @@ -35,7 +35,7 @@ DROP TABLE IF EXISTS CountryLanguage; CREATE TABLE CountryLanguage ( CountryCode CHAR(3), - Language CHAR(30), + Language VARCHAR, IsOfficial CHAR(2), Percentage DECIMAL(4,1), PRIMARY KEY (CountryCode, Language)
[32/50] [abbrv] ignite git commit: IGNITE-9284: [ML] Add a Standard Scaler
IGNITE-9284: [ML] Add a Standard Scaler this closes #4964 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/41f4225c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/41f4225c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/41f4225c Branch: refs/heads/ignite-9720 Commit: 41f4225c4b2f2735bce4ce861b9a51afc80d5815 Parents: 46a84fd Author: Ravil Galeyev Authored: Tue Nov 27 14:05:17 2018 +0300 Committer: Yury Babak Committed: Tue Nov 27 14:05:17 2018 +0300 -- .../ml/preprocessing/StandardScalerExample.java | 84 +++ .../standardscaling/StandardScalerData.java | 56 ++ .../StandardScalerPreprocessor.java | 91 + .../standardscaling/StandardScalerTrainer.java | 101 +++ .../standardscaling/package-info.java | 22 .../StandardScalerPreprocessorTest.java | 59 +++ .../StandardScalerTrainerTest.java | 85 7 files changed, 498 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/41f4225c/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/StandardScalerExample.java -- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/StandardScalerExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/StandardScalerExample.java new file mode 100644 index 000..13d8635 --- /dev/null +++ b/examples/src/main/java/org/apache/ignite/examples/ml/preprocessing/StandardScalerExample.java @@ -0,0 +1,84 @@ +/* + * 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.examples.ml.preprocessing; + +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.Ignition; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.examples.ml.dataset.model.Person; +import org.apache.ignite.examples.ml.util.DatasetHelper; +import org.apache.ignite.ml.dataset.DatasetFactory; +import org.apache.ignite.ml.dataset.primitive.SimpleDataset; +import org.apache.ignite.ml.math.functions.IgniteBiFunction; +import org.apache.ignite.ml.math.primitives.vector.Vector; +import org.apache.ignite.ml.math.primitives.vector.VectorUtils; +import org.apache.ignite.ml.preprocessing.standardscaling.StandardScalerTrainer; + +/** + * Example that shows how to use StandardScaler preprocessor to scale the given data. + * + * Machine learning preprocessors are built as a chain. Most often the first preprocessor is a feature extractor as + * shown in this example. The second preprocessor here is a {@code StandardScaler} preprocessor which is built on top of + * the feature extractor and represents a chain of itself and the underlying feature extractor. + */ +public class StandardScalerExample { +/** Run example. */ +public static void main(String[] args) throws Exception { +try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) { +System.out.println(">>> Standard scaler example started."); + +IgniteCache persons = createCache(ignite); + +// Defines first preprocessor that extracts features from an upstream data. +IgniteBiFunction featureExtractor = (k, v) -> VectorUtils.of( +v.getAge(), +v.getSalary() +); + +// Defines second preprocessor that processes features. +IgniteBiFunction preprocessor = new StandardScalerTrainer() +.fit(ignite, persons, featureExtractor); + +// Creates a cache based simple dataset containing features and providing standard dataset API. +try (SimpleDataset dataset = DatasetFactory.createSimpleDataset(ignite, persons, preprocessor)) { +new DatasetHelper(dataset).describe(); +} + +
[38/50] [abbrv] ignite git commit: IGNITE-10106 Optimize several Cache 5 tests by scale factor - Fixes #5252.
IGNITE-10106 Optimize several Cache 5 tests by scale factor - Fixes #5252. Signed-off-by: Pavel Kovalenko Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9d3c7573 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9d3c7573 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9d3c7573 Branch: refs/heads/ignite-9720 Commit: 9d3c757355980fae9b558b0c2e736265adc028a0 Parents: 0b4282b Author: Alexey Platonov Authored: Tue Nov 27 19:55:06 2018 +0300 Committer: Pavel Kovalenko Committed: Tue Nov 27 19:55:06 2018 +0300 -- .../CacheSerializableTransactionsTest.java | 32 +--- .../IgniteCacheStarvationOnRebalanceTest.java | 5 +-- 2 files changed, 17 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9d3c7573/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java index 714ae6a..0afd4ba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java @@ -71,6 +71,7 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.GridTestUtils.SF; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; @@ -3529,9 +3530,9 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { IgniteTransactions txs = ignite.transactions(); -final int KEYS = 100; +final int KEYS = SF.apply(100); -for (int i = 0; i < 1000; i++) { +for (int i = 0; i < SF.apply(1000); i++) { Integer key1 = rnd.nextInt(KEYS); Integer key2; @@ -3671,14 +3672,14 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { final long stopTime = U.currentTimeMillis() + getTestTimeout() - 30_000; -for (int i = 0; i < 30; i++) { +for (int i = 0; i < SF.apply(30); i++) { final AtomicInteger cntr = new AtomicInteger(); final Integer key = i; final AtomicInteger threadIdx = new AtomicInteger(); -final int THREADS = 10; +final int THREADS = SF.applyLB(10, 2); final CyclicBarrier barrier = new CyclicBarrier(THREADS); @@ -3696,7 +3697,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { barrier.await(); -for (int i = 0; i < 1000; i++) { +for (int i = 0; i < SF.apply(1000); i++) { if (i % 100 == 0 && U.currentTimeMillis() > stopTime) break; @@ -3911,7 +3912,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { caches.add(client.cache(cacheName)); } -for (int i = 0; i < 100; i++) { +for (int i = 0; i < SF.apply(100); i++) { if (U.currentTimeMillis() > stopTime) break; @@ -3921,7 +3922,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { final AtomicInteger threadIdx = new AtomicInteger(); -final int THREADS = 10; +final int THREADS = SF.applyLB(10, 2); final CyclicBarrier barrier = new CyclicBarrier(THREADS); @@ -3943,7 +3944,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { barrier.await(); -for (int i = 0; i < 50; i++) { +for (int i = 0; i < SF.apply(50); i++) { while (true) { try { ThreadLocalRandom rnd = ThreadLocalRandom.current(); @@ -3963,10 +3964,8 @@ public class CacheSerializableTransactionsTest
[41/50] [abbrv] ignite git commit: IGNITE-10193 Removed non-actual muted baseline deletion test - Fixes #5446.
IGNITE-10193 Removed non-actual muted baseline deletion test - Fixes #5446. Signed-off-by: Pavel Kovalenko Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/566adaac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/566adaac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/566adaac Branch: refs/heads/ignite-9720 Commit: 566adaac9b70cbba94b97afadecb9525b3900733 Parents: be97bcd Author: Alexey Platonov Authored: Tue Nov 27 20:30:42 2018 +0300 Committer: Pavel Kovalenko Committed: Tue Nov 27 20:30:42 2018 +0300 -- ...eBaselineAffinityTopologyActivationTest.java | 59 1 file changed, 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/566adaac/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java index f44e792..838c732 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java @@ -1030,65 +1030,6 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst } /** - * Restore this test when requirements for BaselineTopology deletion are clarified and this feature - * is covered with more tests. - */ -public void _testBaselineTopologyHistoryIsDeletedOnBaselineDelete() throws Exception { -BaselineTopologyHistoryVerifier verifier = new BaselineTopologyHistoryVerifier() { -@Override public void verify(BaselineTopologyHistory bltHist) { -assertNotNull(bltHist); - -assertEquals(0, bltHist.history().size()); -} -}; - -Ignite nodeA = startGridWithConsistentId("A"); -startGridWithConsistentId("B"); -startGridWithConsistentId("C"); - -nodeA.cluster().active(true); - -stopAllGrids(false); - -nodeA = startGridWithConsistentId("A"); -startGridWithConsistentId("B"); - -nodeA.cluster().active(true); - - nodeA.cluster().setBaselineTopology(baselineNodes(nodeA.cluster().forServers().nodes())); - -stopAllGrids(false); - -nodeA = startGridWithConsistentId("A"); - -nodeA.cluster().active(true); - - nodeA.cluster().setBaselineTopology(baselineNodes(nodeA.cluster().forServers().nodes())); - -stopAllGrids(false); - -final Ignite node = startGridWithConsistentId("A"); - -boolean activated = GridTestUtils.waitForCondition(new GridAbsPredicate() { -@Override public boolean apply() { -return node.cluster().active(); -} -}, 10_000); - -assertTrue(activated); - -node.cluster().setBaselineTopology(null); - -verifyBaselineTopologyHistoryOnNodes(verifier, new Ignite[] {node}); - -stopAllGrids(false); - -nodeA = startGridWithConsistentId("A"); - -verifyBaselineTopologyHistoryOnNodes(verifier, new Ignite[] {nodeA}); -} - -/** * Retrieves baseline topology from ignite node instance. * * @param ig Ig.
[46/50] [abbrv] ignite git commit: IGNITE-10433 Web Console: Fixed "Import models" dialog cleanup on exit logic.
IGNITE-10433 Web Console: Fixed "Import models" dialog cleanup on exit logic. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3606b21b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3606b21b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3606b21b Branch: refs/heads/ignite-9720 Commit: 3606b21bfe0d254864b284571a3f2692d4d4870a Parents: 8e170d6 Author: Alexander Kalinin Authored: Wed Nov 28 14:52:14 2018 +0700 Committer: Alexey Kuznetsov Committed: Wed Nov 28 14:52:14 2018 +0700 -- .../components/modal-import-models/service.js | 24 +++- 1 file changed, 18 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/3606b21b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/service.js -- diff --git a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/service.js b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/service.js index 3c0ecbb..e17721db 100644 --- a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/service.js +++ b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/service.js @@ -16,12 +16,18 @@ */ export default class ModalImportModels { -static $inject = ['$modal', 'AgentManager', '$uiRouter']; -constructor($modal, AgentManager, $uiRouter) { -Object.assign(this, {$modal, AgentManager, $uiRouter}); +static $inject = ['$modal', '$uiRouter', 'AgentManager']; + +constructor($modal, $uiRouter, AgentManager) { +this.$modal = $modal; +this.$uiRouter = $uiRouter; +this.AgentManager = AgentManager; } + _goToDynamicState() { -if (this._state) this.$uiRouter.stateRegistry.deregister(this._state); +if (this._state) +this.$uiRouter.stateRegistry.deregister(this._state); + this._state = this.$uiRouter.stateRegistry.register({ name: 'importModels', parent: this.$uiRouter.stateService.current, @@ -29,11 +35,15 @@ export default class ModalImportModels { this._open(); }, onExit: () => { +this.AgentManager.stopWatch(); + this._modal && this._modal.hide(); } }); + return this.$uiRouter.stateService.go(this._state, this.$uiRouter.stateService.params); } + _open() { this._modal = this.$modal({ template: ` @@ -46,10 +56,12 @@ export default class ModalImportModels { controllerAs: '$ctrl', show: false }); + return this.AgentManager.startAgentWatch('Back', this.$uiRouter.globals.current.name) -.then(() => this._modal.$promise) -.then(() => this._modal.show()); +.then(() => this._modal.$promise) +.then(() => this._modal.show()); } + open() { this._goToDynamicState(); }
[21/50] [abbrv] ignite git commit: IGNITE-10184 enable of test after IGNITE-5380 uncomment after fix. - Fixes #5390.
IGNITE-10184 enable of test after IGNITE-5380 uncomment after fix. - Fixes #5390. 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/c870500a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c870500a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c870500a Branch: refs/heads/ignite-9720 Commit: c870500a4144168e31a75046f848cba741dba96d Parents: 7e1d178 Author: Albert Iskhakov Authored: Mon Nov 26 17:28:38 2018 +0300 Committer: Dmitriy Pavlov Committed: Mon Nov 26 17:28:38 2018 +0300 -- .../processors/query/SqlSchemaSelfTest.java | 25 +--- 1 file changed, 17 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c870500a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java index b271d80..dcfffd8 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java @@ -20,14 +20,18 @@ package org.apache.ignite.internal.processors.query; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicInteger; +import javax.cache.CacheException; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.QueryEntity; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.processors.query.schema.SchemaOperationException; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; @@ -292,19 +296,24 @@ public class SqlSchemaSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ -public void _testTypeConflictInPublicSchema() throws Exception { -// TODO: IGNITE-5380: uncomment work after fix. -fail("Hang for now, need to fix"); - +public void testTypeConflictInPublicSchema() throws Exception { node.createCache(new CacheConfiguration() .setName(CACHE_PERSON) .setIndexedTypes(PersonKey.class, Person.class) .setSqlSchema(QueryUtils.DFLT_SCHEMA)); -node.createCache(new CacheConfiguration() -.setName(CACHE_PERSON_2) -.setIndexedTypes(PersonKey.class, Person.class) -.setSqlSchema(QueryUtils.DFLT_SCHEMA)); +Throwable th = GridTestUtils.assertThrows(log, (Callable) () -> { +node.createCache(new CacheConfiguration() +.setName(CACHE_PERSON_2) +.setIndexedTypes(PersonKey.class, Person.class) +.setSqlSchema(QueryUtils.DFLT_SCHEMA)); + +return null; +}, CacheException.class, null); + +SchemaOperationException e = X.cause(th, SchemaOperationException.class); + +assertEquals(SchemaOperationException.CODE_TABLE_EXISTS, e.code()); } /**
[31/50] [abbrv] ignite git commit: IGNITE-10343 Stop grid in IgniteCacheGetRestartTest.testGetRestartReplicated test - Fixes #5447.
IGNITE-10343 Stop grid in IgniteCacheGetRestartTest.testGetRestartReplicated test - Fixes #5447. Signed-off-by: Aleksey Plekhanov Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/46a84fdd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/46a84fdd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/46a84fdd Branch: refs/heads/ignite-9720 Commit: 46a84fddb701f8e26741ddaa1ee3ab3ffa2234c2 Parents: 7577c87 Author: Fedotov Authored: Tue Nov 27 13:24:50 2018 +0300 Committer: Aleksey Plekhanov Committed: Tue Nov 27 13:24:50 2018 +0300 -- .../distributed/IgniteCacheGetRestartTest.java | 29 +++- 1 file changed, 16 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/46a84fdd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java index e194e28..ba22048 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java @@ -209,25 +209,28 @@ public class IgniteCacheGetRestartTest extends GridCommonAbstractTest { log.info("Restart node [node=" + nodeIdx + ", client=" + clientMode + ']'); -Ignite ignite = startGrid(nodeIdx); +try { +Ignite ignite = startGrid(nodeIdx); -IgniteCache cache; +IgniteCache cache; -if (clientMode && ccfg.getNearConfiguration() != null) -cache = ignite.createNearCache(ccfg.getName(), new NearCacheConfiguration<>()); -else -cache = ignite.cache(ccfg.getName()); +if (clientMode && ccfg.getNearConfiguration() != null) +cache = ignite.createNearCache(ccfg.getName(), new NearCacheConfiguration<>()); +else +cache = ignite.cache(ccfg.getName()); -checkGet(cache); - -IgniteInternalFuture syncFut = ((IgniteCacheProxy)cache).context().preloader().syncFuture(); - -while (!syncFut.isDone() && U.currentTimeMillis() < stopTime) checkGet(cache); -checkGet(cache); +IgniteInternalFuture syncFut = ((IgniteCacheProxy)cache).context().preloader().syncFuture(); + +while (!syncFut.isDone() && U.currentTimeMillis() < stopTime) +checkGet(cache); -stopGrid(nodeIdx); +checkGet(cache); +} +finally { +stopGrid(nodeIdx); +} } return null;
[09/50] [abbrv] ignite git commit: IGNITE-10339 Skip index partition file integrity check for in-memory caches - Fixes #5475.
IGNITE-10339 Skip index partition file integrity check for in-memory caches - Fixes #5475. 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/5b656e2f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5b656e2f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5b656e2f Branch: refs/heads/ignite-9720 Commit: 5b656e2f3b2157200d650923e5aca800c4d61635 Parents: 97d2422 Author: Ivan Daschinskiy Authored: Fri Nov 23 19:36:00 2018 +0300 Committer: Alexey Goncharuk Committed: Fri Nov 23 19:36:00 2018 +0300 -- .../apache/ignite/internal/commandline/CommandHandler.java | 6 -- .../ignite/internal/visor/verify/ValidateIndexesClosure.java | 8 +--- 2 files changed, 9 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/5b656e2f/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 56fbfae..e9a4281 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 @@ -820,7 +820,11 @@ public class CommandHandler { VisorValidateIndexesTaskResult taskRes = executeTaskByNameOnNode( client, VALIDATE_INDEXES_TASK, taskArg, null); +boolean errors = false; + if (!F.isEmpty(taskRes.exceptions())) { +errors = true; + log("Index validation failed on nodes:"); for (Map.Entry e : taskRes.exceptions().entrySet()) { @@ -832,8 +836,6 @@ public class CommandHandler { } } -boolean errors = false; - for (Map.Entry nodeEntry : taskRes.results().entrySet()) { if (!nodeEntry.getValue().hasIssues()) continue; http://git-wip-us.apache.org/repos/asf/ignite/blob/5b656e2f/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java index ec02c25..b6909e3 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java @@ -260,7 +260,8 @@ public class ValidateIndexesClosure implements IgniteCallable partRes = fut.get(); -partResults.putAll(partRes); +if (!partRes.isEmpty() && partRes.entrySet().stream().anyMatch(e -> !e.getValue().issues().isEmpty())) +partResults.putAll(partRes); } for (; curIdx < procIdxFutures.size(); curIdx++) { @@ -268,7 +269,8 @@ public class ValidateIndexesClosure implements IgniteCallable idxRes = fut.get(); -idxResults.putAll(idxRes); +if (!idxRes.isEmpty() && idxRes.entrySet().stream().anyMatch(e -> !e.getValue().issues().isEmpty())) +idxResults.putAll(idxRes); } log.warning("ValidateIndexesClosure finished: processed " + totalPartitions + " partitions and " @@ -296,7 +298,7 @@ public class ValidateIndexesClosure implements IgniteCallable
[44/50] [abbrv] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-9720
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-9720 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0063fb1d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0063fb1d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0063fb1d Branch: refs/heads/ignite-9720 Commit: 0063fb1d7addad2407598ee56bcb92a473dde9dc Parents: ceacab0 c3fd4a9 Author: Alexey Goncharuk Authored: Wed Nov 28 10:31:37 2018 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 28 10:31:37 2018 +0300 -- ...niteFunctionDistributedInferenceExample.java | 100 + .../TensorFlowDistributedInferenceExample.java | 99 + .../TensorFlowLocalInferenceExample.java| 85 + .../TensorFlowThreadedInferenceExample.java | 95 + .../examples/ml/inference/package-info.java | 22 + .../ml/preprocessing/StandardScalerExample.java | 84 + .../examples/ml/util/MLSandboxDatasets.java | 16 +- .../ignite/examples/ml/util/SandboxMLCache.java | 11 +- .../ignite/examples/ml/util/datasets/README.md |2 - .../ml/util/datasets/boston_housing_dataset.txt | 505 .../ml/util/datasets/cleared_machines.csv | 209 -- .../ml/util/datasets/glass_identification.csv | 116 - .../ignite/examples/ml/util/datasets/iris.txt | 150 -- .../examples/ml/util/datasets/mortalitydata.csv | 53 - .../examples/ml/util/datasets/titanic.csv | 1310 - .../ml/util/datasets/titanic_10_rows.csv| 11 - .../ml/util/datasets/two_classed_iris.csv | 100 - .../ignite/examples/ml/util/datasets/wine.txt | 178 -- examples/src/main/resources/datasets/README.md |2 + .../datasets/boston_housing_dataset.txt | 505 .../resources/datasets/cleared_machines.csv | 209 ++ .../resources/datasets/glass_identification.csv | 116 + examples/src/main/resources/datasets/iris.txt | 150 ++ .../main/resources/datasets/mortalitydata.csv | 53 + .../resources/datasets/t10k-images-idx3-ubyte | Bin 0 -> 9876027 bytes .../resources/datasets/t10k-labels-idx1-ubyte | Bin 0 -> 10008 bytes .../src/main/resources/datasets/titanic.csv | 1310 + .../main/resources/datasets/titanic_10_rows.csv | 11 + .../resources/datasets/two_classed_iris.csv | 100 + examples/src/main/resources/datasets/wine.txt | 178 ++ .../resources/ml/mnist_tf_model/saved_model.pb | Bin 0 -> 37185 bytes .../variables/variables.data-0-of-1 | Bin 0 -> 13098544 bytes .../ml/mnist_tf_model/variables/variables.index | Bin 0 -> 410 bytes .../ignite/examples/BasicExamplesSelfTest.java |6 + .../examples/CacheClientBinaryExampleTest.java |3 + .../CacheContinuousQueryExamplesSelfTest.java |4 + .../ignite/examples/CacheExamplesSelfTest.java |4 + .../ComputeClientBinaryExampleTest.java |2 + .../examples/EncryptedCacheExampleSelfTest.java |3 + .../ignite/examples/EventsExamplesSelfTest.java |2 + .../examples/MessagingExamplesSelfTest.java |3 + .../examples/SpringDataExampleSelfTest.java |2 + .../ignite/examples/SqlExamplesSelfTest.java|4 + .../IgniteExamplesJ8SelfTestSuite.java | 53 +- .../testsuites/IgniteExamplesSelfTestSuite.java | 59 +- idea/ignite_inspections.xml |2 +- .../jdbc2/JdbcDistributedJoinsQueryTest.java|4 - .../JettyRestProcessorAbstractSelfTest.java | 90 +- ...RestProcessorAuthenticationAbstractTest.java |6 +- ...tingToWalV2SerializerWithCompactionTest.java |5 - .../PersistenceBasicCompatibilityTest.java |5 - modules/compress/licenses/Snappy-LICENSE.txt| 29 + .../compress/licenses/Snappy-java-LICENSE.txt | 202 ++ modules/compress/licenses/Zstd-LICENSE.txt | 30 + modules/compress/licenses/Zstd-jni-LICENSE.txt | 26 + modules/compress/licenses/jnr-ffi-LICENSE.txt | 25 + modules/compress/licenses/jnr-posix-LICENSE.txt | 2486 ++ modules/compress/licenses/lz4-LICENSE.txt | 11 + modules/compress/licenses/lz4-java-LICENSE.txt | 202 ++ modules/compress/pom.xml| 113 + .../compress/CompressionProcessorImpl.java | 403 +++ .../compress/NativeFileSystemLinux.java | 142 + .../compress/NativeFileSystemPosix.java | 54 + .../compress/CompressionProcessorTest.java | 1021 +++ ...DiskPageCompressionIntegrationAsyncTest.java | 30 + .../DiskPageCompressionIntegrationTest.java | 468 .../compress/FileSystemUtilsTest.java | 193 ++ .../IgnitePdsCompressionTestSuite.java | 56 + .../IgnitePdsCompressionTestSuite2.java | 38 + .../org/apache/ignite/DataStorageMetrics.java | 18 + .../apache/ignite/IgniteSystemProperties.java | 62 +- .../cache/affinity/AffinityKeyMapped.java |4 +-
[15/50] [abbrv] ignite git commit: IGNITE-10330: Disk page compression. - Fixes #5200.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8eeea37/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/AbstractDataPageIO.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/AbstractDataPageIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/AbstractDataPageIO.java index 4a12045..6176eeb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/AbstractDataPageIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/AbstractDataPageIO.java @@ -33,10 +33,12 @@ import org.apache.ignite.internal.util.GridStringBuilder; import org.apache.ignite.internal.util.typedef.internal.SB; import org.jetbrains.annotations.Nullable; +import static org.apache.ignite.internal.util.GridUnsafe.bufferAddress; + /** * Data pages IO. */ -public abstract class AbstractDataPageIO extends PageIO { +public abstract class AbstractDataPageIO extends PageIO implements CompactablePageIO { /** */ private static final int SHOW_ITEM = 0b0001; @@ -228,7 +230,7 @@ public abstract class AbstractDataPageIO extends PageIO { * @param pageAddr Page address. * @return Free space. */ -private int getRealFreeSpace(long pageAddr) { +public int getRealFreeSpace(long pageAddr) { return PageUtils.getShort(pageAddr, FREE_SPACE_OFF); } @@ -822,9 +824,10 @@ public abstract class AbstractDataPageIO extends PageIO { * @param pageAddr Page address. * @param payload Payload. * @param pageSize Page size. + * @return Item ID. * @throws IgniteCheckedException If failed. */ -public void addRow( +public int addRow( long pageAddr, byte[] payload, int pageSize @@ -840,7 +843,7 @@ public abstract class AbstractDataPageIO extends PageIO { writeRowData(pageAddr, dataOff, payload); -addItem(pageAddr, fullEntrySize, directCnt, indirectCnt, dataOff, pageSize); +return addItem(pageAddr, fullEntrySize, directCnt, indirectCnt, dataOff, pageSize); } /** @@ -1106,6 +1109,62 @@ public abstract class AbstractDataPageIO extends PageIO { return directCnt; // Previous directCnt will be our itemId. } +/** {@inheritDoc} */ +@Override public void compactPage(ByteBuffer page, ByteBuffer out, int pageSize) { +// TODO May we compactDataEntries in-place and then copy compacted data to out? +copyPage(page, out, pageSize); + +long pageAddr = bufferAddress(out); + +int freeSpace = getRealFreeSpace(pageAddr); + +if (freeSpace == 0) +return; // No garbage: nothing to compact here. + +int directCnt = getDirectCount(pageAddr); + +if (directCnt != 0) { +int firstOff = getFirstEntryOffset(pageAddr); + +if (firstOff - freeSpace != getHeaderSizeWithItems(pageAddr, directCnt)) { +firstOff = compactDataEntries(pageAddr, directCnt, pageSize); +setFirstEntryOffset(pageAddr, firstOff, pageSize); +} + +// Move all the data entries from page end to the page header to close the gap. +moveBytes(pageAddr, firstOff, pageSize - firstOff, -freeSpace, pageSize); +} + +out.limit(pageSize - freeSpace); // Here we have only meaningful data of this page. +} + +/** {@inheritDoc} */ +@Override public void restorePage(ByteBuffer page, int pageSize) { +assert page.isDirect(); +assert page.position() == 0; +assert page.limit() <= pageSize; + +long pageAddr = bufferAddress(page); + +int freeSpace = getRealFreeSpace(pageAddr); + +if (freeSpace != 0) { +int firstOff = getFirstEntryOffset(pageAddr); +int cnt = pageSize - firstOff; + +if (cnt != 0) { +int off = page.limit() - cnt; + +assert off > PageIO.COMMON_HEADER_END: off; +assert cnt > 0 : cnt; + +moveBytes(pageAddr, off, cnt, freeSpace, pageSize); +} +} + +page.limit(pageSize); +} + /** * @param pageAddr Page address. * @param directCnt Direct items count. @@ -1203,7 +1262,16 @@ public abstract class AbstractDataPageIO extends PageIO { entriesSize += entrySize; } -return pageSize - ITEMS_OFF - entriesSize - (directCnt + getIndirectCount(pageAddr)) * ITEM_SIZE; +return pageSize - entriesSize - getHeaderSizeWithItems(pageAddr, directCnt); +} + +/** + * @param pageAddr Page address. + * @param directCnt Direct items count. + * @return Size of the page header including all items. + */ +private int
[07/50] [abbrv] ignite git commit: IGNITE-9828: Muted tests.
IGNITE-9828: Muted tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae5bfadf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae5bfadf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae5bfadf Branch: refs/heads/ignite-9720 Commit: ae5bfadf09254fd62416c887c1404713582a4571 Parents: 1dea0a4 Author: Igor Seliverstov Authored: Fri Nov 23 17:32:00 2018 +0300 Committer: Igor Seliverstov Committed: Fri Nov 23 17:32:22 2018 +0300 -- .../CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java| 5 + .../continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java | 5 + 2 files changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ae5bfadf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java index 334d219..7c15f38 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java @@ -50,4 +50,9 @@ public class CacheContinuousQueryAsyncFailoverMvccTxSelfTest extends CacheConti @Override public void testLeftPrimaryAndBackupNodes() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-10047;); } + +/** {@inheritDoc} */ +@Override public void testFailoverStartStopBackup() throws Exception { +fail("https://issues.apache.org/jira/browse/IGNITE-10391;); +} } http://git-wip-us.apache.org/repos/asf/ignite/blob/ae5bfadf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java index 76d1689..2d578f2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java @@ -45,4 +45,9 @@ public class CacheContinuousQueryFailoverMvccTxSelfTest extends CacheContinuousQ @Override public void testLeftPrimaryAndBackupNodes() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-10047;); } + +/** {@inheritDoc} */ +@Override public void testFailoverStartStopBackup() throws Exception { +fail("https://issues.apache.org/jira/browse/IGNITE-10391;); +} } \ No newline at end of file
[01/50] [abbrv] ignite git commit: IGNITE-10323 Don't run deactivation process on inactive cluster - Fixes #5476.
Repository: ignite Updated Branches: refs/heads/ignite-9720 ceacab0dd -> 04fdbc1af IGNITE-10323 Don't run deactivation process on inactive cluster - Fixes #5476. Signed-off-by: Pavel Kovalenko Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/39b59d21 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/39b59d21 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/39b59d21 Branch: refs/heads/ignite-9720 Commit: 39b59d21e96bac51dca9a12702f1993ad96fead9 Parents: d45ea4b Author: vd-pyatkov Authored: Fri Nov 23 14:05:46 2018 +0300 Committer: Pavel Kovalenko Committed: Fri Nov 23 14:05:46 2018 +0300 -- .../cluster/GridClusterStateProcessor.java | 3 +- ...erActivateDeactivateTestWithPersistence.java | 37 2 files changed, 39 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/39b59d21/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java index 6d5d474..95ff770 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java @@ -849,7 +849,8 @@ public class GridClusterStateProcessor extends GridProcessorAdapter implements I DiscoveryDataClusterState curState = globalState; -if (!curState.transition() && curState.active() == activate && BaselineTopology.equals(curState.baselineTopology(), blt)) +if (!curState.transition() && curState.active() == activate +&& (!activate || BaselineTopology.equals(curState.baselineTopology(), blt))) return new GridFinishedFuture<>(); GridChangeGlobalStateFuture startedFut = null; http://git-wip-us.apache.org/repos/asf/ignite/blob/39b59d21/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java index 0972ea2..4dc4f27 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java @@ -98,6 +98,43 @@ public class IgniteClusterActivateDeactivateTestWithPersistence extends IgniteCl activateCachesRestore(5, true); } +/** + * Test deactivation on cluster that is not yet activated. + * + * @throws Exception If failed. + */ +public void testDeactivateInactiveCluster() throws Exception { +ccfgs = new CacheConfiguration[] { +new CacheConfiguration<>("test_cache_1") +.setGroupName("test_cache"), +new CacheConfiguration<>("test_cache_2") +.setGroupName("test_cache") +}; + +Ignite ignite = startGrids(3); + +ignite.cluster().active(true); + +ignite.cache("test_cache_1") +.put("key1", "val1"); +ignite.cache("test_cache_2") +.put("key1", "val1"); + +ignite.cluster().active(false); + +assertFalse(ignite.cluster().active()); + +stopAllGrids(); + +ignite = startGrids(2); + +assertFalse(ignite.cluster().active()); + +ignite.cluster().active(false); + +assertFalse(ignite.cluster().active()); +} + /** */ private Map startGridsAndLoadData(int srvs) throws Exception { Ignite srv = startGrids(srvs);
[26/50] [abbrv] ignite git commit: IGNITE-10399 Remove unused import. - Fixes #5493.
IGNITE-10399 Remove unused import. - Fixes #5493. Signed-off-by: Nikolay Izhikov Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/25c41fa1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/25c41fa1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/25c41fa1 Branch: refs/heads/ignite-9720 Commit: 25c41fa1de910a0eab29b2e9b3c53ca3307d3a97 Parents: 507aeb2 Author: Sergey Antonov Authored: Mon Nov 26 22:43:55 2018 +0300 Committer: Nikolay Izhikov Committed: Mon Nov 26 22:43:55 2018 +0300 -- .../processors/cache/persistence/pagemem/PageMemoryImpl.java| 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/25c41fa1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java index 03f66c0..f6aa059 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java @@ -85,7 +85,6 @@ import org.apache.ignite.internal.util.offheap.GridOffHeapOutOfMemoryException; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; -import org.apache.ignite.spi.encryption.EncryptionSpi; import org.apache.ignite.spi.encryption.noop.NoopEncryptionSpi; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable;
[23/50] [abbrv] ignite git commit: IGNITE-10358: Added collections data type specification for python thin client
IGNITE-10358: Added collections data type specification for python thin client This closes #5470 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/04fae6d2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/04fae6d2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/04fae6d2 Branch: refs/heads/ignite-9720 Commit: 04fae6d2cbbd83b15a43cf17da9011c0eccec41b Parents: acc1024 Author: Dmitry Melnichuk Authored: Mon Nov 26 17:14:59 2018 +0300 Committer: Igor Sapego Committed: Mon Nov 26 17:34:19 2018 +0300 -- .../docs/source/pyignite.datatypes.base.rst | 7 ++ .../python/docs/source/pyignite.datatypes.rst | 1 + .../platforms/python/pyignite/datatypes/base.py | 24 +++ .../python/pyignite/datatypes/complex.py| 23 +++--- .../python/pyignite/datatypes/internal.py | 19 +++-- .../python/pyignite/datatypes/null_object.py| 3 +- .../python/pyignite/datatypes/primitive.py | 3 +- .../pyignite/datatypes/primitive_arrays.py | 3 +- .../pyignite/datatypes/primitive_objects.py | 3 +- .../python/pyignite/datatypes/standard.py | 9 +-- modules/platforms/python/pyignite/utils.py | 6 +- modules/platforms/python/setup.py | 2 +- .../platforms/python/tests/test_key_value.py| 75 +++- 13 files changed, 149 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/04fae6d2/modules/platforms/python/docs/source/pyignite.datatypes.base.rst -- diff --git a/modules/platforms/python/docs/source/pyignite.datatypes.base.rst b/modules/platforms/python/docs/source/pyignite.datatypes.base.rst new file mode 100644 index 000..849a028 --- /dev/null +++ b/modules/platforms/python/docs/source/pyignite.datatypes.base.rst @@ -0,0 +1,7 @@ +pyignite.datatypes.base module +== + +.. automodule:: pyignite.datatypes.base +:members: +:undoc-members: +:show-inheritance: http://git-wip-us.apache.org/repos/asf/ignite/blob/04fae6d2/modules/platforms/python/docs/source/pyignite.datatypes.rst -- diff --git a/modules/platforms/python/docs/source/pyignite.datatypes.rst b/modules/platforms/python/docs/source/pyignite.datatypes.rst index 77e7183..d72f844 100644 --- a/modules/platforms/python/docs/source/pyignite.datatypes.rst +++ b/modules/platforms/python/docs/source/pyignite.datatypes.rst @@ -11,6 +11,7 @@ Submodules .. toctree:: + pyignite.datatypes.base pyignite.datatypes.binary pyignite.datatypes.cache_config pyignite.datatypes.cache_properties http://git-wip-us.apache.org/repos/asf/ignite/blob/04fae6d2/modules/platforms/python/pyignite/datatypes/base.py -- diff --git a/modules/platforms/python/pyignite/datatypes/base.py b/modules/platforms/python/pyignite/datatypes/base.py new file mode 100644 index 000..a0522c0 --- /dev/null +++ b/modules/platforms/python/pyignite/datatypes/base.py @@ -0,0 +1,24 @@ +# 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. + +from abc import ABC + + +class IgniteDataType(ABC): +""" +This is a base class for all Ignite data types, a.k.a. parser/constructor +classes, both object and payload varieties. +""" +pass http://git-wip-us.apache.org/repos/asf/ignite/blob/04fae6d2/modules/platforms/python/pyignite/datatypes/complex.py -- diff --git a/modules/platforms/python/pyignite/datatypes/complex.py b/modules/platforms/python/pyignite/datatypes/complex.py index 9a5664c..87e5130 100644 --- a/modules/platforms/python/pyignite/datatypes/complex.py +++ b/modules/platforms/python/pyignite/datatypes/complex.py @@ -20,7 +20,8 @@ import inspect from pyignite.constants import * from pyignite.exceptions import ParseError from pyignite.utils import entity_id, hashcode, is_hinted -from .internal import
[14/50] [abbrv] ignite git commit: IGNITE-10330: Disk page compression. - Fixes #5200.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8eeea37/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteFileIOTest.java -- diff --git a/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteFileIOTest.java b/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteFileIOTest.java index 9620eb0..640932dc 100644 --- a/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteFileIOTest.java +++ b/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteFileIOTest.java @@ -55,6 +55,21 @@ public class IgniteFileIOTest extends TestCase { } /** {@inheritDoc} */ +@Override public int getFileSystemBlockSize() { +return -1; +} + +/** {@inheritDoc} */ +@Override public long getSparseSize() { +return -1; +} + +/** {@inheritDoc} */ +@Override public int punchHole(long position, int len) { +throw new UnsupportedOperationException(); +} + +/** {@inheritDoc} */ @Override public long position() throws IOException { return position; } http://git-wip-us.apache.org/repos/asf/ignite/blob/e8eeea37/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java -- diff --git a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java index 2ed7450..dab99c9 100644 --- a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java +++ b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java @@ -19,6 +19,7 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.persistence.IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest; import org.apache.ignite.internal.processors.cache.persistence.IgniteNativeIoPdsRecoveryAfterFileCorruptionTest; +import org.apache.ignite.internal.processors.cache.persistence.DiskPageCompressionIntegrationDirectIOTest; import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteNativeIoWalFlushFsyncSelfTest; /** @@ -34,6 +35,9 @@ public class IgnitePdsNativeIoTestSuite2 extends TestSuite { IgnitePdsTestSuite2.addRealPageStoreTests(suite); +// Direct IO + Page compression. +suite.addTestSuite(DiskPageCompressionIntegrationDirectIOTest.class); + //Integrity test with reduced count of pages. suite.addTestSuite(IgniteNativeIoPdsRecoveryAfterFileCorruptionTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/e8eeea37/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 14f970e..23e0a0d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -84,6 +84,8 @@ 9.4.11.v20180605 1.13 1.1.1 +4.5.2 +3.0.46 0.1.54_1 0.1.54 2.4_1 @@ -94,6 +96,7 @@ 2.11.0 7.4.0_1 7.4.0 +1.5.0 3.5.0 1.10.19 5.1.39 @@ -110,6 +113,7 @@ 2.2.6 1.7.7 1.6.4 +1.1.7.2 2.6.5 2.3.0 1.13.14.RELEASE @@ -125,6 +129,7 @@ 0.8.3 0.5 3.4.13 +1.3.7-2 * http://git-wip-us.apache.org/repos/asf/ignite/blob/e8eeea37/pom.xml -- diff --git a/pom.xml b/pom.xml index 6de435a..54756bb 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,7 @@ modules/apache-license-gen modules/tools modules/core +modules/compress modules/dev-utils modules/direct-io modules/hadoop
[10/50] [abbrv] ignite git commit: IGNITE-10392 Use lasdAffChangedTopVer if DiscoCache for the requested topVer isn't ready - Fixes #5488.
IGNITE-10392 Use lasdAffChangedTopVer if DiscoCache for the requested topVer isn't ready - Fixes #5488. 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/5c01c419 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5c01c419 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5c01c419 Branch: refs/heads/ignite-9720 Commit: 5c01c4199df3ba3a479d4566561335d57adffd0f Parents: 5b656e2 Author: Ilya Lantukh Authored: Fri Nov 23 20:23:16 2018 +0300 Committer: Alexey Goncharuk Committed: Fri Nov 23 20:23:16 2018 +0300 -- .../internal/managers/discovery/GridDiscoveryManager.java| 8 1 file changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/5c01c419/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 476fe7e..0a982b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -2058,6 +2058,14 @@ public class GridDiscoveryManager extends GridManagerAdapter { snap.discoCache : discoCacheHist.get(topVer); if (cache == null) { +AffinityTopologyVersion lastAffChangedTopVer = + ctx.cache().context().exchange().lastAffinityChangedTopologyVersion(topVer); + +DiscoCache lastAffChangedDiscoCache = discoCacheHist.get(lastAffChangedTopVer); + +if (lastAffChangedDiscoCache != null) +return lastAffChangedDiscoCache; + CacheGroupDescriptor desc = ctx.cache().cacheGroupDescriptors().get(grpId); throw new IgniteException("Failed to resolve nodes topology [" +
[03/50] [abbrv] ignite git commit: IGNITE-10335: move ML examples datasets files to resources
http://git-wip-us.apache.org/repos/asf/ignite/blob/1dea0a42/examples/src/main/resources/datasets/titanic.csv -- diff --git a/examples/src/main/resources/datasets/titanic.csv b/examples/src/main/resources/datasets/titanic.csv new file mode 100644 index 000..6994016 --- /dev/null +++ b/examples/src/main/resources/datasets/titanic.csv @@ -0,0 +1,1310 @@ +pclass;survived;name;sex;age;sibsp;parch;ticket;fare;cabin;embarked;boat;body;homedest +1;1;Allen, Miss. Elisabeth Walton;;29;;;24160;211,3375;B5;;2;;St Louis, MO +1;1;Allison, Master. Hudson Trevor;male;0,9167;1;2;113781;151,55;C22 C26;AA;11;;Montreal, PQ / Chesterville, ON +1;0;Allison, Miss. Helen Loraine;female;2;1;2;113781;151,55;C22 C26;S;;;Montreal, PQ / Chesterville, ON +1;0;Allison, Mr. Hudson Joshua Creighton;male;30;1;2;113781;151,55;C22 C26;S;;135;Montreal, PQ / Chesterville, ON +1;0;Allison, Mrs. Hudson J C (Bessie Waldo Daniels);female;25;1;2;113781;151,55;C22 C26;S;;;Montreal, PQ / Chesterville, ON +1;1;Anderson, Mr. Harry;male;48;0;0;19952;26,55;E12;S;3;;New York, NY +1;1;Andrews, Miss. Kornelia Theodosia;female;63;1;0;13502;77,9583;D7;S;10;;Hudson, NY +1;0;Andrews, Mr. Thomas Jr;male;39;0;0;112050;0;A36;S;;;Belfast, NI +1;1;Appleton, Mrs. Edward Dale (Charlotte Lamson);female;53;2;0;11769;51,4792;C101;S;D;;Bayside, Queens, NY +1;0;Artagaveytia, Mr. Ramon;male;71;0;0;PC 17609;49,5042;;C;;22;Montevideo, Uruguay +1;0;Astor, Col. John Jacob;male;47;1;0;PC 17757;227,525;C62 C64;C;;124;New York, NY +1;1;Astor, Mrs. John Jacob (Madeleine Talmadge Force);female;18;1;0;PC 17757;227,525;C62 C64;C;4;;New York, NY +1;1;Aubart, Mme. Leontine Pauline;female;24;0;0;PC 17477;69,3;B35;C;9;;Paris, France +1;1;"Barber, Miss. Ellen ""Nellie""";female;26;0;0;19877;78,85;;S;6;; +1;1;Barkworth, Mr. Algernon Henry Wilson;male;80;0;0;27042;30;A23;S;B;;Hessle, Yorks +1;0;Baumann, Mr. John D;male;;0;0;PC 17318;25,925;;S;;;New York, NY +1;0;Baxter, Mr. Quigg Edmond;male;24;0;1;PC 17558;247,5208;B58 B60;C;;;Montreal, PQ +1;1;Baxter, Mrs. James (Helene DeLaudeniere Chaput);female;50;0;1;PC 17558;247,5208;B58 B60;C;6;;Montreal, PQ +1;1;Bazzani, Miss. Albina;female;32;0;0;11813;76,2917;D15;C;8;; +1;0;Beattie, Mr. Thomson;male;36;0;0;13050;75,2417;C6;C;A;;Winnipeg, MN +1;1;Beckwith, Mr. Richard Leonard;male;37;1;1;11751;52,5542;D35;S;5;;New York, NY +1;1;Beckwith, Mrs. Richard Leonard (Sallie Monypeny);female;47;1;1;11751;52,5542;D35;S;5;;New York, NY +1;1;Behr, Mr. Karl Howell;male;26;0;0;111369;30;C148;C;5;;New York, NY +1;1;Bidois, Miss. Rosalie;female;42;0;0;PC 17757;227,525;;C;4;; +1;1;Bird, Miss. Ellen;female;29;0;0;PC 17483;221,7792;C97;S;8;; +1;0;Birnbaum, Mr. Jakob;male;25;0;0;13905;26;;C;;148;San Francisco, CA +1;1;Bishop, Mr. Dickinson H;male;25;1;0;11967;91,0792;B49;C;7;;Dowagiac, MI +1;1;Bishop, Mrs. Dickinson H (Helen Walton);female;19;1;0;11967;91,0792;B49;C;7;;Dowagiac, MI +1;1;Bissette, Miss. Amelia;female;35;0;0;PC 17760;135,6333;C99;S;8;; +1;1;Bjornstrom-Steffansson, Mr. Mauritz Hakan;male;28;0;0;110564;26,55;C52;S;D;;Stockholm, Sweden / Washington, DC +1;0;Blackwell, Mr. Stephen Weart;male;45;0;0;113784;35,5;T;S;;;Trenton, NJ +1;1;Blank, Mr. Henry;male;40;0;0;112277;31;A31;C;7;;Glen Ridge, NJ +1;1;Bonnell, Miss. Caroline;female;30;0;0;36928;164,8667;C7;S;8;;Youngstown, OH +1;1;Bonnell, Miss. Elizabeth;female;58;0;0;113783;26,55;C103;S;8;;Birkdale, England Cleveland, Ohio +1;0;Borebank, Mr. John James;male;42;0;0;110489;26,55;D22;S;;;London / Winnipeg, MB +1;1;Bowen, Miss. Grace Scott;female;45;0;0;PC 17608;262,375;;C;4;;Cooperstown, NY +1;1;Bowerman, Miss. Elsie Edith;female;22;0;1;113505;55;E33;S;6;;St Leonards-on-Sea, England Ohio +1;1;"Bradley, Mr. George (""George Arthur Brayton"")";male;;0;0;111427;26,55;;S;9;;Los Angeles, CA +1;0;Brady, Mr. John Bertram;male;41;0;0;113054;30,5;A21;S;;;Pomeroy, WA +1;0;Brandeis, Mr. Emil;male;48;0;0;PC 17591;50,4958;B10;C;;208;Omaha, NE +1;0;Brewe, Dr. Arthur Jackson;male;;0;0;112379;39,6;;C;;;Philadelphia, PA +1;1;Brown, Mrs. James Joseph (Margaret Tobin);female;44;0;0;PC 17610;27,7208;B4;C;6;;Denver, CO +1;1;Brown, Mrs. John Murray (Caroline Lane Lamson);female;59;2;0;11769;51,4792;C101;S;D;;Belmont, MA +1;1;Bucknell, Mrs. William Robert (Emma Eliza Ward);female;60;0;0;11813;76,2917;D15;C;8;;Philadelphia, PA +1;1;Burns, Miss. Elizabeth Margaret;female;41;0;0;16966;134,5;E40;C;3;; +1;0;Butt, Major. Archibald Willingham;male;45;0;0;113050;26,55;B38;S;;;Washington, DC +1;0;Cairns, Mr. Alexander;male;;0;0;113798;31;;S;;; +1;1;Calderhead, Mr. Edward Pennington;male;42;0;0;PC 17476;26,2875;E24;S;5;;New York, NY +1;1;Candee, Mrs. Edward (Helen Churchill Hungerford);female;53;0;0;PC 17606;27,4458;;C;6;;Washington, DC +1;1;Cardeza, Mr. Thomas Drake Martinez;male;36;0;1;PC 17755;512,3292;B51 B53 B55;C;3;;Austria-Hungary / Germantown, Philadelphia, PA +1;1;Cardeza, Mrs. James Warburton Martinez (Charlotte Wardle
[39/50] [abbrv] ignite git commit: IGNITE-1793 [Failed Test] IgnitePartitionedCountDownLatchSelfTest.testLatch hangs on TC sometimes - Fixes #2882.
IGNITE-1793 [Failed Test] IgnitePartitionedCountDownLatchSelfTest.testLatch hangs on TC sometimes - Fixes #2882. 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/07f1dbfc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/07f1dbfc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/07f1dbfc Branch: refs/heads/ignite-9720 Commit: 07f1dbfcb899d604d6637a71c956b14e6d52ac9c Parents: 9d3c757 Author: vd-pyatkov Authored: Tue Nov 27 19:58:54 2018 +0300 Committer: Dmitriy Pavlov Committed: Tue Nov 27 19:58:54 2018 +0300 -- .../partitioned/IgnitePartitionedCountDownLatchSelfTest.java| 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/07f1dbfc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedCountDownLatchSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedCountDownLatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedCountDownLatchSelfTest.java index fc9356e..fbd3779 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedCountDownLatchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedCountDownLatchSelfTest.java @@ -30,9 +30,4 @@ public class IgnitePartitionedCountDownLatchSelfTest extends IgniteCountDownLatc @Override protected CacheMode atomicsCacheMode() { return PARTITIONED; } - -/** {@inheritDoc} */ -@Override public void testLatch() throws Exception { -fail("https://issues.apache.org/jira/browse/IGNITE-1793;); -} }
[24/50] [abbrv] ignite git commit: IGNITE-9818 Fix javadoc for annotation AffinityKeyMapped - Fixes #4927.
IGNITE-9818 Fix javadoc for annotation AffinityKeyMapped - Fixes #4927. 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/6fd6c320 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6fd6c320 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6fd6c320 Branch: refs/heads/ignite-9720 Commit: 6fd6c320ed0f79dc71a54981982361ab8dc30f44 Parents: 04fae6d Author: Max-Pudov Authored: Mon Nov 26 17:46:56 2018 +0300 Committer: Dmitriy Pavlov Committed: Mon Nov 26 17:46:56 2018 +0300 -- .../java/org/apache/ignite/cache/affinity/AffinityKeyMapped.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6fd6c320/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapped.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapped.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapped.java index 8b19338..e7e9eba 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapped.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityKeyMapped.java @@ -91,8 +91,8 @@ import java.util.concurrent.Callable; * is otherwise known as {@code Collocation Of Computations And Data}. In this case, * {@code @AffinityKeyMapped} annotation allows to specify a routing affinity key for a * {@link org.apache.ignite.compute.ComputeJob} or any other grid computation, such as {@link Runnable}, - * {@link Callable}, or {@link org.apache.ignite.lang.IgniteClosure}. It should be attached to a method or - * field that provides affinity key for the computation. Only one annotation per class is allowed. + * {@link Callable}, or {@link org.apache.ignite.lang.IgniteClosure}. It should be attached to a field + * that provides affinity key for the computation. Only one annotation per class is allowed. * Whenever such annotation is detected, then {@link org.apache.ignite.spi.loadbalancing.LoadBalancingSpi} * will be bypassed, and computation will be routed to the grid node where the specified affinity key is cached. *
[35/50] [abbrv] ignite git commit: IGNITE-9948 Fixed ettyRestProcessorAuthenticationWithTokenSelfTest.testGetOrCreate - Fixes #5038.
IGNITE-9948 Fixed ettyRestProcessorAuthenticationWithTokenSelfTest.testGetOrCreate - Fixes #5038. 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/882b5a4a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/882b5a4a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/882b5a4a Branch: refs/heads/ignite-9720 Commit: 882b5a4a80dd1c49d4ff17818a07e38f4279ff3c Parents: 9031733 Author: NSAmelchev Authored: Tue Nov 27 19:21:08 2018 +0300 Committer: Alexey Goncharuk Committed: Tue Nov 27 19:21:08 2018 +0300 -- .../JettyRestProcessorAbstractSelfTest.java | 90 ++-- ...RestProcessorAuthenticationAbstractTest.java | 6 +- 2 files changed, 50 insertions(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/882b5a4a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java -- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java index 703f50d..81f0a36f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.rest; +import com.fasterxml.jackson.databind.JsonNode; import java.io.IOException; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -34,9 +35,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; - -import com.fasterxml.jackson.databind.JsonNode; - import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; @@ -238,17 +236,21 @@ public abstract class JettyRestProcessorAbstractSelfTest extends JettyRestProces } /** + * Validates JSON response. + * * @param content Content to check. * @return REST result. + * @throws IOException If parsing failed. */ -protected JsonNode jsonResponse(String content) throws IOException { +protected JsonNode validateJsonResponse(String content) throws IOException { assertNotNull(content); assertFalse(content.isEmpty()); JsonNode node = JSON_MAPPER.readTree(content); +assertTrue("Unexpected error: " + node.get("error").asText(), node.get("error").isNull()); + assertEquals(STATUS_SUCCESS, node.get("successStatus").asInt()); -assertTrue(node.get("error").isNull()); assertNotSame(securityEnabled(), node.get("sessionToken").isNull()); @@ -341,7 +343,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends JettyRestProces // Test with SQL. SqlFieldsQuery qry = new SqlFieldsQuery( "create table employee(id integer primary key, name varchar(100), salary integer);" + -"insert into employee(id, name, salary) values (1, 'Alex', 300);" +"insert into employee(id, name, salary) values (1, 'Alex', 300);" ); grid(0).context().query().querySqlFields(qry, true, false); @@ -420,7 +422,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends JettyRestProces info("Get command result: " + ret); -JsonNode res = jsonResponse(ret); +JsonNode res = validateJsonResponse(ret); assertEquals(F.asMap("", null, "key", "value"), JSON_MAPPER.treeToValue(res, HashMap.class)); @@ -434,7 +436,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends JettyRestProces info("Get command result: " + ret); -res = jsonResponse(ret); +res = validateJsonResponse(ret); assertEquals(F.asMap("", "value", "key", null), JSON_MAPPER.treeToValue(res, HashMap.class)); } @@ -565,7 +567,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends JettyRestProces info("Name command result: " + ret); -assertEquals(getTestIgniteInstanceName(0), jsonResponse(ret).asText()); +assertEquals(getTestIgniteInstanceName(0), validateJsonResponse(ret).asText()); } /** @@ -588,6 +590,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends JettyRestProces info("GetOrCreateCache command result: " + ret); +validateJsonResponse(ret); + IgniteCache cache = grid(0).cache(cacheName);
[05/50] [abbrv] ignite git commit: IGNITE-10335: move ML examples datasets files to resources
http://git-wip-us.apache.org/repos/asf/ignite/blob/1dea0a42/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic.csv -- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic.csv b/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic.csv deleted file mode 100644 index 6994016..000 --- a/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic.csv +++ /dev/null @@ -1,1310 +0,0 @@ -pclass;survived;name;sex;age;sibsp;parch;ticket;fare;cabin;embarked;boat;body;homedest -1;1;Allen, Miss. Elisabeth Walton;;29;;;24160;211,3375;B5;;2;;St Louis, MO -1;1;Allison, Master. Hudson Trevor;male;0,9167;1;2;113781;151,55;C22 C26;AA;11;;Montreal, PQ / Chesterville, ON -1;0;Allison, Miss. Helen Loraine;female;2;1;2;113781;151,55;C22 C26;S;;;Montreal, PQ / Chesterville, ON -1;0;Allison, Mr. Hudson Joshua Creighton;male;30;1;2;113781;151,55;C22 C26;S;;135;Montreal, PQ / Chesterville, ON -1;0;Allison, Mrs. Hudson J C (Bessie Waldo Daniels);female;25;1;2;113781;151,55;C22 C26;S;;;Montreal, PQ / Chesterville, ON -1;1;Anderson, Mr. Harry;male;48;0;0;19952;26,55;E12;S;3;;New York, NY -1;1;Andrews, Miss. Kornelia Theodosia;female;63;1;0;13502;77,9583;D7;S;10;;Hudson, NY -1;0;Andrews, Mr. Thomas Jr;male;39;0;0;112050;0;A36;S;;;Belfast, NI -1;1;Appleton, Mrs. Edward Dale (Charlotte Lamson);female;53;2;0;11769;51,4792;C101;S;D;;Bayside, Queens, NY -1;0;Artagaveytia, Mr. Ramon;male;71;0;0;PC 17609;49,5042;;C;;22;Montevideo, Uruguay -1;0;Astor, Col. John Jacob;male;47;1;0;PC 17757;227,525;C62 C64;C;;124;New York, NY -1;1;Astor, Mrs. John Jacob (Madeleine Talmadge Force);female;18;1;0;PC 17757;227,525;C62 C64;C;4;;New York, NY -1;1;Aubart, Mme. Leontine Pauline;female;24;0;0;PC 17477;69,3;B35;C;9;;Paris, France -1;1;"Barber, Miss. Ellen ""Nellie""";female;26;0;0;19877;78,85;;S;6;; -1;1;Barkworth, Mr. Algernon Henry Wilson;male;80;0;0;27042;30;A23;S;B;;Hessle, Yorks -1;0;Baumann, Mr. John D;male;;0;0;PC 17318;25,925;;S;;;New York, NY -1;0;Baxter, Mr. Quigg Edmond;male;24;0;1;PC 17558;247,5208;B58 B60;C;;;Montreal, PQ -1;1;Baxter, Mrs. James (Helene DeLaudeniere Chaput);female;50;0;1;PC 17558;247,5208;B58 B60;C;6;;Montreal, PQ -1;1;Bazzani, Miss. Albina;female;32;0;0;11813;76,2917;D15;C;8;; -1;0;Beattie, Mr. Thomson;male;36;0;0;13050;75,2417;C6;C;A;;Winnipeg, MN -1;1;Beckwith, Mr. Richard Leonard;male;37;1;1;11751;52,5542;D35;S;5;;New York, NY -1;1;Beckwith, Mrs. Richard Leonard (Sallie Monypeny);female;47;1;1;11751;52,5542;D35;S;5;;New York, NY -1;1;Behr, Mr. Karl Howell;male;26;0;0;111369;30;C148;C;5;;New York, NY -1;1;Bidois, Miss. Rosalie;female;42;0;0;PC 17757;227,525;;C;4;; -1;1;Bird, Miss. Ellen;female;29;0;0;PC 17483;221,7792;C97;S;8;; -1;0;Birnbaum, Mr. Jakob;male;25;0;0;13905;26;;C;;148;San Francisco, CA -1;1;Bishop, Mr. Dickinson H;male;25;1;0;11967;91,0792;B49;C;7;;Dowagiac, MI -1;1;Bishop, Mrs. Dickinson H (Helen Walton);female;19;1;0;11967;91,0792;B49;C;7;;Dowagiac, MI -1;1;Bissette, Miss. Amelia;female;35;0;0;PC 17760;135,6333;C99;S;8;; -1;1;Bjornstrom-Steffansson, Mr. Mauritz Hakan;male;28;0;0;110564;26,55;C52;S;D;;Stockholm, Sweden / Washington, DC -1;0;Blackwell, Mr. Stephen Weart;male;45;0;0;113784;35,5;T;S;;;Trenton, NJ -1;1;Blank, Mr. Henry;male;40;0;0;112277;31;A31;C;7;;Glen Ridge, NJ -1;1;Bonnell, Miss. Caroline;female;30;0;0;36928;164,8667;C7;S;8;;Youngstown, OH -1;1;Bonnell, Miss. Elizabeth;female;58;0;0;113783;26,55;C103;S;8;;Birkdale, England Cleveland, Ohio -1;0;Borebank, Mr. John James;male;42;0;0;110489;26,55;D22;S;;;London / Winnipeg, MB -1;1;Bowen, Miss. Grace Scott;female;45;0;0;PC 17608;262,375;;C;4;;Cooperstown, NY -1;1;Bowerman, Miss. Elsie Edith;female;22;0;1;113505;55;E33;S;6;;St Leonards-on-Sea, England Ohio -1;1;"Bradley, Mr. George (""George Arthur Brayton"")";male;;0;0;111427;26,55;;S;9;;Los Angeles, CA -1;0;Brady, Mr. John Bertram;male;41;0;0;113054;30,5;A21;S;;;Pomeroy, WA -1;0;Brandeis, Mr. Emil;male;48;0;0;PC 17591;50,4958;B10;C;;208;Omaha, NE -1;0;Brewe, Dr. Arthur Jackson;male;;0;0;112379;39,6;;C;;;Philadelphia, PA -1;1;Brown, Mrs. James Joseph (Margaret Tobin);female;44;0;0;PC 17610;27,7208;B4;C;6;;Denver, CO -1;1;Brown, Mrs. John Murray (Caroline Lane Lamson);female;59;2;0;11769;51,4792;C101;S;D;;Belmont, MA -1;1;Bucknell, Mrs. William Robert (Emma Eliza Ward);female;60;0;0;11813;76,2917;D15;C;8;;Philadelphia, PA -1;1;Burns, Miss. Elizabeth Margaret;female;41;0;0;16966;134,5;E40;C;3;; -1;0;Butt, Major. Archibald Willingham;male;45;0;0;113050;26,55;B38;S;;;Washington, DC -1;0;Cairns, Mr. Alexander;male;;0;0;113798;31;;S;;; -1;1;Calderhead, Mr. Edward Pennington;male;42;0;0;PC 17476;26,2875;E24;S;5;;New York, NY -1;1;Candee, Mrs. Edward (Helen Churchill Hungerford);female;53;0;0;PC 17606;27,4458;;C;6;;Washington, DC -1;1;Cardeza, Mr. Thomas Drake Martinez;male;36;0;1;PC 17755;512,3292;B51 B53
[29/50] [abbrv] ignite git commit: IGNITE-10002: MVCC: Create "Cache 2" test suite for MVCC mode. This closes #5198.
http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java index ce8749c..dd6e36e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java @@ -86,6 +86,7 @@ import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; @@ -140,6 +141,13 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac } /** {@inheritDoc} */ +@Override public void beforeTestsStarted() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.ENTRY_LOCK); + +super.beforeTestsStarted(); +} + +/** {@inheritDoc} */ @Override protected void afterTest() throws Exception { super.afterTest(); http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java index c211590..e5bb583 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java @@ -27,8 +27,9 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.configuration.TransactionConfiguration; -import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.testframework.MvccFeatureChecker; +import org.apache.ignite.testframework.MvccFeatureChecker.Feature; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; @@ -105,14 +106,14 @@ public class IgniteCacheTxIteratorSelfTest extends GridCommonAbstractTest { try { for (CacheMode mode : CacheMode.values()) { for (CacheAtomicityMode atomMode : CacheAtomicityMode.values()) { -if (mode == CacheMode.PARTITIONED && atomMode != CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT) { +if (mode == CacheMode.PARTITIONED) { // Near cache makes sense only for partitioned cache. checkTxCache(CacheMode.PARTITIONED, atomMode, true, false); } -checkTxCache(CacheMode.PARTITIONED, atomMode, false, true); +checkTxCache(mode, atomMode, false, true); -checkTxCache(CacheMode.PARTITIONED, atomMode, false, false); +checkTxCache(mode, atomMode, false, false); } } } @@ -130,6 +131,13 @@ public class IgniteCacheTxIteratorSelfTest extends GridCommonAbstractTest { boolean nearEnabled, boolean useEvicPlc ) throws Exception { +if (atomMode == CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT) { +if (!MvccFeatureChecker.isSupported(mode) || +(nearEnabled && !MvccFeatureChecker.isSupported(Feature.NEAR_CACHE)) || +(useEvicPlc && !MvccFeatureChecker.isSupported(Feature.EVICTION))) +return; // Nothing to do. Mode is not supported. +} + final Ignite ignite = grid(0); final CacheConfiguration ccfg = cacheConfiguration( @@ -154,14
[45/50] [abbrv] ignite git commit: IGNITE-9700: Remove configurable values from mesos pom.xml. - Fixes #4838.
IGNITE-9700: Remove configurable values from mesos pom.xml. - Fixes #4838. Signed-off-by: shroman Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8e170d69 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8e170d69 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8e170d69 Branch: refs/heads/ignite-9720 Commit: 8e170d699ac081952c09bdba753e3a529916365c Parents: c3fd4a9 Author: Roman Shtykh Authored: Wed Nov 28 16:46:38 2018 +0900 Committer: shroman Committed: Wed Nov 28 16:46:38 2018 +0900 -- modules/mesos/pom.xml | 48 .../ignite/mesos/resource/IgniteProvider.java | 1 - 2 files changed, 49 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8e170d69/modules/mesos/pom.xml -- diff --git a/modules/mesos/pom.xml b/modules/mesos/pom.xml index 1841650..6234c81 100644 --- a/modules/mesos/pom.xml +++ b/modules/mesos/pom.xml @@ -36,9 +36,6 @@ 1.5.0 - https://ignite.apache.org/latest -/ignite/%s/apache-ignite-%s-bin.zip - https://www.apache.org/dyn/closer.cgi?as_json=1 @@ -71,51 +68,6 @@ -org.apache.maven.plugins -maven-antrun-plugin -1.7 - - -update-versions - -run - -generate-sources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - maven-assembly-plugin 2.4.1 http://git-wip-us.apache.org/repos/asf/ignite/blob/8e170d69/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java -- diff --git a/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java b/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java index 892a592..438f40d 100644 --- a/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java +++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java @@ -47,7 +47,6 @@ public class IgniteProvider { /** Logger. */ private static final Logger log = Logger.getLogger(IgniteProvider.class.getSimpleName()); -// This constants are set by maven-ant-plugin. /** */ private static final String DOWNLOAD_URL_PATTERN = "https://archive.apache.org/dist/ignite/%s/apache-ignite-%s-bin.zip;;
[02/50] [abbrv] ignite git commit: IGNITE-10335: move ML examples datasets files to resources
http://git-wip-us.apache.org/repos/asf/ignite/blob/1dea0a42/examples/src/main/resources/datasets/titanic_10_rows.csv -- diff --git a/examples/src/main/resources/datasets/titanic_10_rows.csv b/examples/src/main/resources/datasets/titanic_10_rows.csv new file mode 100644 index 000..8146db3 --- /dev/null +++ b/examples/src/main/resources/datasets/titanic_10_rows.csv @@ -0,0 +1,11 @@ +pclass;survived;name;sex;age;sibsp;parch;ticket;fare;cabin;embarked;boat;body;homedest +1;1;Allen, Miss. Elisabeth Walton;;29;;;24160;211,3375;B5;;2;;St Louis, MO +1;1;Allison, Master. Hudson Trevor;male;0,9167;1;2;113781;151,55;C22 C26;S;11;;Montreal, PQ / Chesterville, ON +1;0;Allison, Miss. Helen Loraine;female;2;1;2;113781;151,55;C22 C26;S;;;Montreal, PQ / Chesterville, ON +1;0;Allison, Mr. Hudson Joshua Creighton;male;30;1;2;113781;151,55;C22 C26;S;;135;Montreal, PQ / Chesterville, ON +1;0;Allison, Mrs. Hudson J C (Bessie Waldo Daniels);female;25;1;2;113781;151,55;C22 C26;S;;;Montreal, PQ / Chesterville, ON +1;1;Anderson, Mr. Harry;male;48;0;0;19952;26,55;E12;S;3;;New York, NY +1;1;Andrews, Miss. Kornelia Theodosia;female;63;1;0;13502;77,9583;D7;S;10;;Hudson, NY +1;0;Andrews, Mr. Thomas Jr;male;39;0;0;112050;0;A36;S;;;Belfast, NI +1;1;Appleton, Mrs. Edward Dale (Charlotte Lamson);female;53;2;0;11769;51,4792;C101;S;D;;Bayside, Queens, NY +1;0;Artagaveytia, Mr. Ramon;male;71;0;0;PC 17609;49,5042;;C;;22;Montevideo, Uruguay http://git-wip-us.apache.org/repos/asf/ignite/blob/1dea0a42/examples/src/main/resources/datasets/two_classed_iris.csv -- diff --git a/examples/src/main/resources/datasets/two_classed_iris.csv b/examples/src/main/resources/datasets/two_classed_iris.csv new file mode 100644 index 000..872c699 --- /dev/null +++ b/examples/src/main/resources/datasets/two_classed_iris.csv @@ -0,0 +1,100 @@ +0 5.1 3.5 1.4 0.2 +0 4.9 3 1.4 0.2 +0 4.7 3.2 1.3 0.2 +0 4.6 3.1 1.5 0.2 +0 5 3.6 1.4 0.2 +0 5.4 3.9 1.7 0.4 +0 4.6 3.4 1.4 0.3 +0 5 3.4 1.5 0.2 +0 4.4 2.9 1.4 0.2 +0 4.9 3.1 1.5 0.1 +0 5.4 3.7 1.5 0.2 +0 4.8 3.4 1.6 0.2 +0 4.8 3 1.4 0.1 +0 4.3 3 1.1 0.1 +0 5.8 4 1.2 0.2 +0 5.7 4.4 1.5 0.4 +0 5.4 3.9 1.3 0.4 +0 5.1 3.5 1.4 0.3 +0 5.7 3.8 1.7 0.3 +0 5.1 3.8 1.5 0.3 +0 5.4 3.4 1.7 0.2 +0 5.1 3.7 1.5 0.4 +0 4.6 3.6 1 0.2 +0 5.1 3.3 1.7 0.5 +0 4.8 3.4 1.9 0.2 +0 5 3 1.6 0.2 +0 5 3.4 1.6 0.4 +0 5.2 3.5 1.5 0.2 +0 5.2 3.4 1.4 0.2 +0 4.7 3.2 1.6 0.2 +0 4.8 3.1 1.6 0.2 +0 5.4 3.4 1.5 0.4 +0 5.2 4.1 1.5 0.1 +0 5.5 4.2 1.4 0.2 +0 4.9 3.1 1.5 0.1 +0 5 3.2 1.2 0.2 +0 5.5 3.5 1.3 0.2 +0 4.9 3.1 1.5 0.1 +0 4.4 3 1.3 0.2 +0 5.1 3.4 1.5 0.2 +0 5 3.5 1.3 0.3 +0 4.5 2.3 1.3 0.3 +0 4.4 3.2 1.3 0.2 +0 5 3.5 1.6 0.6 +0 5.1 3.8 1.9 0.4 +0 4.8 3 1.4 0.3 +0 5.1 3.8 1.6 0.2 +0 4.6 3.2 1.4 0.2 +0 5.3 3.7 1.5 0.2 +0 5 3.3 1.4 0.2 +1 7 3.2 4.7 1.4 +1 6.4 3.2 4.5 1.5 +1 6.9 3.1 4.9 1.5 +1 5.5 2.3 4 1.3 +1 6.5 2.8 4.6 1.5 +1 5.7 2.8 4.5 1.3 +1 6.3 3.3 4.7 1.6 +1 4.9 2.4 3.3 1 +1 6.6 2.9 4.6 1.3 +1 5.2 2.7 3.9 1.4 +1 5 2 3.5 1 +1 5.9 3 4.2 1.5 +1 6 2.2 4 1 +1 6.1 2.9 4.7 1.4 +1 5.6 2.9 3.6 1.3 +1 6.7 3.1 4.4 1.4 +1 5.6 3 4.5 1.5 +1 5.8 2.7 4.1 1 +1 6.2 2.2 4.5 1.5 +1 5.6 2.5 3.9 1.1 +1 5.9 3.2 4.8 1.8 +1 6.1 2.8 4 1.3 +1 6.3 2.5 4.9 1.5 +1 6.1 2.8 4.7 1.2 +1 6.4 2.9 4.3 1.3 +1 6.6 3 4.4 1.4 +1 6.8 2.8 4.8 1.4 +1 6.7 3 5 1.7 +1 6 2.9 4.5 1.5 +1 5.7 2.6 3.5 1 +1 5.5 2.4 3.8 1.1 +1 5.5 2.4 3.7 1 +1 5.8 2.7 3.9 1.2 +1 6 2.7 5.1 1.6 +1 5.4
[27/50] [abbrv] ignite git commit: IGNITE-10393: MVCC: Fixed streamer with persistence on. This closes #5497.
IGNITE-10393: MVCC: Fixed streamer with persistence on. This closes #5497. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c63a60a3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c63a60a3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c63a60a3 Branch: refs/heads/ignite-9720 Commit: c63a60a39d4131861c98a84440ecb8c67b10ba25 Parents: 25c41fa Author: Igor Seliverstov Authored: Tue Nov 27 10:31:01 2018 +0300 Committer: devozerov Committed: Tue Nov 27 10:31:01 2018 +0300 -- .../processors/cache/GridCacheMapEntry.java | 2 +- .../persistence/pagemem/PageMemoryImpl.java | 2 +- ...aStreamProcessorMvccPersistenceSelfTest.java | 28 + .../DataStreamProcessorPersistenceSelfTest.java | 28 + .../DataStreamProcessorSelfTest.java| 63 +++- .../testsuites/IgniteBinaryCacheTestSuite.java | 2 + .../testsuites/IgniteCacheMvccTestSuite.java| 2 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + 8 files changed, 126 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c63a60a3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 5f4f974..bbdff35 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -3478,7 +3478,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme expireTime, partition(), updateCntr, -mvccVer +mvccVer == null ? MvccUtils.INITIAL_VERSION : mvccVer ))); } else { cctx.shared().wal().log(new DataRecord(new DataEntry( http://git-wip-us.apache.org/repos/asf/ignite/blob/c63a60a3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java index f6aa059..c4b0104 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java @@ -53,7 +53,6 @@ import org.apache.ignite.internal.pagemem.PageIdUtils; import org.apache.ignite.internal.pagemem.PageUtils; import org.apache.ignite.internal.pagemem.store.IgnitePageStoreManager; import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager; -import org.apache.ignite.internal.processors.cache.persistence.StorageException; import org.apache.ignite.internal.pagemem.wal.WALIterator; import org.apache.ignite.internal.pagemem.wal.WALPointer; import org.apache.ignite.internal.pagemem.wal.record.CheckpointRecord; @@ -65,6 +64,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.persistence.CheckpointLockStateChecker; import org.apache.ignite.internal.processors.cache.persistence.CheckpointWriteProgressSupplier; import org.apache.ignite.internal.processors.cache.persistence.DataRegionMetricsImpl; +import org.apache.ignite.internal.processors.cache.persistence.StorageException; import org.apache.ignite.internal.processors.cache.persistence.freelist.io.PagesListMetaIO; import org.apache.ignite.internal.processors.cache.persistence.partstate.GroupPartitionId; import org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO; http://git-wip-us.apache.org/repos/asf/ignite/blob/c63a60a3/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccPersistenceSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccPersistenceSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorMvccPersistenceSelfTest.java new file mode 100644 index 000..9360cab
[17/50] [abbrv] ignite git commit: IGNITE-10330: Disk page compression. - Fixes #5200.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8eeea37/modules/compress/licenses/lz4-LICENSE.txt -- diff --git a/modules/compress/licenses/lz4-LICENSE.txt b/modules/compress/licenses/lz4-LICENSE.txt new file mode 100644 index 000..c221aeb --- /dev/null +++ b/modules/compress/licenses/lz4-LICENSE.txt @@ -0,0 +1,11 @@ +This repository uses 2 different licenses : +- all files in the `lib` directory use a BSD 2-Clause license +- all other files use a GPLv2 license, unless explicitly stated otherwise + +Relevant license is reminded at the top of each source file, +and with presence of COPYING or LICENSE file in associated directories. + +This model is selected to emphasize that +files in the `lib` directory are designed to be included into 3rd party applications, +while all other files, in `programs`, `tests` or `examples`, +receive more limited attention and support for such scenario. http://git-wip-us.apache.org/repos/asf/ignite/blob/e8eeea37/modules/compress/licenses/lz4-java-LICENSE.txt -- diff --git a/modules/compress/licenses/lz4-java-LICENSE.txt b/modules/compress/licenses/lz4-java-LICENSE.txt new file mode 100644 index 000..d645695 --- /dev/null +++ b/modules/compress/licenses/lz4-java-LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License.
[30/50] [abbrv] ignite git commit: IGNITE-10002: MVCC: Create "Cache 2" test suite for MVCC mode. This closes #5198.
IGNITE-10002: MVCC: Create "Cache 2" test suite for MVCC mode. This closes #5198. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7577c877 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7577c877 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7577c877 Branch: refs/heads/ignite-9720 Commit: 7577c8770eaf29e21f1d46f650af1d8fbd891c42 Parents: c63a60a Author: Andrey V. Mashenkov Authored: Tue Nov 27 11:45:12 2018 +0300 Committer: Igor Seliverstov Committed: Tue Nov 27 11:45:26 2018 +0300 -- .../apache/ignite/IgniteSystemProperties.java | 3 + .../cache/mvcc/MvccProcessorImpl.java | 11 + .../cache/CacheConcurrentReadThroughTest.java | 8 + .../cache/CacheEnumOperationsAbstractTest.java | 18 +- .../cache/CrossCacheTxRandomOperationsTest.java | 23 +- .../cache/GridCacheBasicApiAbstractTest.java| 27 ++ .../cache/GridCacheBasicStoreAbstractTest.java | 8 + .../GridCacheEvictionEventAbstractTest.java | 9 + .../GridCacheFinishPartitionsSelfTest.java | 8 + ...idCacheGetAndTransformStoreAbstractTest.java | 8 + .../cache/GridCacheOffheapUpdateSelfTest.java | 17 +- .../cache/GridCachePartitionedGetSelfTest.java | 6 + .../GridCacheVariableTopologySelfTest.java | 9 + .../IgniteCacheEntryProcessorNodeJoinTest.java | 111 --- .../cache/IgniteCacheIncrementTxTest.java | 7 + .../cache/IgniteCacheNoSyncForGetTest.java | 8 + .../IgniteClientCacheStartFailoverTest.java | 37 +++ .../IgniteMvccTxMultiThreadedAbstractTest.java | 121 +++ .../IgniteMvccTxSingleThreadedAbstractTest.java | 50 +++ .../cache/IgniteNearClientCacheCloseTest.java | 22 ++ .../processors/cache/IgniteTxAbstractTest.java | 16 +- .../IgniteTxMultiThreadedAbstractTest.java | 1 - ...CacheLoadingConcurrentGridStartSelfTest.java | 8 + .../CacheLockReleaseNodeLeaveTest.java | 8 + .../GridCacheAbstractPrimarySyncSelfTest.java | 4 + .../GridCacheBasicOpAbstractTest.java | 8 + .../distributed/GridCacheLockAbstractTest.java | 8 + .../GridCacheMultiNodeAbstractTest.java | 5 + .../GridCacheMultiNodeLockAbstractTest.java | 9 + .../GridCacheNodeFailureAbstractTest.java | 8 + ...ridCachePartitionNotLoadedEventSelfTest.java | 13 +- ...NearDisabledMvccTxMultiThreadedSelfTest.java | 31 ++ ...GridCachePreloadRestartAbstractSelfTest.java | 12 + .../GridCacheTransformEventSelfTest.java| 64 +++- ...niteCacheClientNodeChangingTopologyTest.java | 8 + .../IgniteCacheTxIteratorSelfTest.java | 27 +- .../IgniteMvccTxTimeoutAbstractTest.java| 146 + .../IgniteTxTimeoutAbstractTest.java| 39 ++- ...heColocatedMvccTxSingleThreadedSelfTest.java | 85 + .../dht/GridCacheDhtEntrySelfTest.java | 5 + .../dht/GridCacheDhtMappingSelfTest.java| 8 + .../GridCacheDhtPreloadDisabledSelfTest.java| 8 + ...ridCacheDhtPreloadMultiThreadedSelfTest.java | 3 + .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 7 + .../dht/GridCacheDhtPreloadSelfTest.java| 2 - .../IgniteCacheClearDuringRebalanceTest.java| 9 + ...artitionedBackupNodeFailureRecoveryTest.java | 2 +- .../near/GridCacheNearClientHitTest.java| 5 +- .../near/GridCacheNearMultiGetSelfTest.java | 73 +++-- .../near/GridCacheNearMultiNodeSelfTest.java| 10 + .../near/GridCacheNearOneNodeSelfTest.java | 11 +- .../GridCacheNearPartitionedClearSelfTest.java | 8 + .../GridCacheNearReaderPreloadSelfTest.java | 8 + .../near/GridCacheNearReadersSelfTest.java | 10 +- ...ePartitionedBasicStoreMultiNodeSelfTest.java | 6 + .../near/GridCachePartitionedEventSelfTest.java | 8 + ...titionedExplicitLockNodeFailureSelfTest.java | 8 + .../GridCachePartitionedLoadCacheSelfTest.java | 8 + ...ePartitionedMvccTxMultiThreadedSelfTest.java | 101 ++ ...PartitionedMvccTxSingleThreadedSelfTest.java | 84 + ...idCachePartitionedMvccTxTimeoutSelfTest.java | 47 +++ ...achePartitionedPreloadLifecycleSelfTest.java | 1 - .../GridCachePartitionedTxTimeoutSelfTest.java | 21 -- .../near/GridNearCacheStoreUpdateTest.java | 9 + .../near/NearCacheSyncUpdateTest.java | 17 + .../near/NoneRebalanceModeSelfTest.java | 9 + .../GridCacheReplicatedTxTimeoutSelfTest.java | 18 -- .../local/GridCacheLocalBasicApiSelfTest.java | 8 + .../local/GridCacheLocalBasicStoreSelfTest.java | 8 + .../local/GridCacheLocalEventSelfTest.java | 9 + .../GridCacheLocalEvictionEventSelfTest.java| 8 + ...dCacheLocalGetAndTransformStoreSelfTest.java | 8 + .../GridCacheLocalIsolatedNodesSelfTest.java| 8 + .../local/GridCacheLocalLoadAllSelfTest.java| 8 + .../cache/local/GridCacheLocalLockSelfTest.java | 8 +
[04/50] [abbrv] ignite git commit: IGNITE-10335: move ML examples datasets files to resources
http://git-wip-us.apache.org/repos/asf/ignite/blob/1dea0a42/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic_10_rows.csv -- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic_10_rows.csv b/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic_10_rows.csv deleted file mode 100644 index 8146db3..000 --- a/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic_10_rows.csv +++ /dev/null @@ -1,11 +0,0 @@ -pclass;survived;name;sex;age;sibsp;parch;ticket;fare;cabin;embarked;boat;body;homedest -1;1;Allen, Miss. Elisabeth Walton;;29;;;24160;211,3375;B5;;2;;St Louis, MO -1;1;Allison, Master. Hudson Trevor;male;0,9167;1;2;113781;151,55;C22 C26;S;11;;Montreal, PQ / Chesterville, ON -1;0;Allison, Miss. Helen Loraine;female;2;1;2;113781;151,55;C22 C26;S;;;Montreal, PQ / Chesterville, ON -1;0;Allison, Mr. Hudson Joshua Creighton;male;30;1;2;113781;151,55;C22 C26;S;;135;Montreal, PQ / Chesterville, ON -1;0;Allison, Mrs. Hudson J C (Bessie Waldo Daniels);female;25;1;2;113781;151,55;C22 C26;S;;;Montreal, PQ / Chesterville, ON -1;1;Anderson, Mr. Harry;male;48;0;0;19952;26,55;E12;S;3;;New York, NY -1;1;Andrews, Miss. Kornelia Theodosia;female;63;1;0;13502;77,9583;D7;S;10;;Hudson, NY -1;0;Andrews, Mr. Thomas Jr;male;39;0;0;112050;0;A36;S;;;Belfast, NI -1;1;Appleton, Mrs. Edward Dale (Charlotte Lamson);female;53;2;0;11769;51,4792;C101;S;D;;Bayside, Queens, NY -1;0;Artagaveytia, Mr. Ramon;male;71;0;0;PC 17609;49,5042;;C;;22;Montevideo, Uruguay http://git-wip-us.apache.org/repos/asf/ignite/blob/1dea0a42/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/two_classed_iris.csv -- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/two_classed_iris.csv b/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/two_classed_iris.csv deleted file mode 100644 index 872c699..000 --- a/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/two_classed_iris.csv +++ /dev/null @@ -1,100 +0,0 @@ -0 5.1 3.5 1.4 0.2 -0 4.9 3 1.4 0.2 -0 4.7 3.2 1.3 0.2 -0 4.6 3.1 1.5 0.2 -0 5 3.6 1.4 0.2 -0 5.4 3.9 1.7 0.4 -0 4.6 3.4 1.4 0.3 -0 5 3.4 1.5 0.2 -0 4.4 2.9 1.4 0.2 -0 4.9 3.1 1.5 0.1 -0 5.4 3.7 1.5 0.2 -0 4.8 3.4 1.6 0.2 -0 4.8 3 1.4 0.1 -0 4.3 3 1.1 0.1 -0 5.8 4 1.2 0.2 -0 5.7 4.4 1.5 0.4 -0 5.4 3.9 1.3 0.4 -0 5.1 3.5 1.4 0.3 -0 5.7 3.8 1.7 0.3 -0 5.1 3.8 1.5 0.3 -0 5.4 3.4 1.7 0.2 -0 5.1 3.7 1.5 0.4 -0 4.6 3.6 1 0.2 -0 5.1 3.3 1.7 0.5 -0 4.8 3.4 1.9 0.2 -0 5 3 1.6 0.2 -0 5 3.4 1.6 0.4 -0 5.2 3.5 1.5 0.2 -0 5.2 3.4 1.4 0.2 -0 4.7 3.2 1.6 0.2 -0 4.8 3.1 1.6 0.2 -0 5.4 3.4 1.5 0.4 -0 5.2 4.1 1.5 0.1 -0 5.5 4.2 1.4 0.2 -0 4.9 3.1 1.5 0.1 -0 5 3.2 1.2 0.2 -0 5.5 3.5 1.3 0.2 -0 4.9 3.1 1.5 0.1 -0 4.4 3 1.3 0.2 -0 5.1 3.4 1.5 0.2 -0 5 3.5 1.3 0.3 -0 4.5 2.3 1.3 0.3 -0 4.4 3.2 1.3 0.2 -0 5 3.5 1.6 0.6 -0 5.1 3.8 1.9 0.4 -0 4.8 3 1.4 0.3 -0 5.1 3.8 1.6 0.2 -0 4.6 3.2 1.4 0.2 -0 5.3 3.7 1.5 0.2 -0 5 3.3 1.4 0.2 -1 7 3.2 4.7 1.4 -1 6.4 3.2 4.5 1.5 -1 6.9 3.1 4.9 1.5 -1 5.5 2.3 4 1.3 -1 6.5 2.8 4.6 1.5 -1 5.7 2.8 4.5 1.3 -1 6.3 3.3 4.7 1.6 -1 4.9 2.4 3.3 1 -1 6.6 2.9 4.6 1.3 -1 5.2 2.7 3.9 1.4 -1 5 2 3.5 1 -1 5.9 3 4.2 1.5 -1 6 2.2 4 1 -1 6.1 2.9 4.7 1.4 -1 5.6 2.9 3.6 1.3 -1 6.7 3.1 4.4 1.4 -1 5.6 3 4.5 1.5 -1 5.8 2.7 4.1 1 -1 6.2 2.2 4.5 1.5 -1 5.6 2.5 3.9 1.1 -1 5.9 3.2 4.8 1.8 -1 6.1 2.8 4 1.3 -1 6.3 2.5 4.9 1.5 -1 6.1 2.8 4.7 1.2 -1 6.4 2.9 4.3 1.3 -1 6.6 3 4.4 1.4 -1 6.8 2.8 4.8 1.4 -1
[11/50] [abbrv] ignite git commit: IGNITE-9996: Performance drop final fix.
IGNITE-9996: Performance drop final fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/475a0a71 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/475a0a71 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/475a0a71 Branch: refs/heads/ignite-9720 Commit: 475a0a71500dc4f638100f3ec0c7f8029db42f4a Parents: 5c01c41 Author: Nikolay Izhikov Authored: Fri Nov 23 21:22:12 2018 +0300 Committer: Nikolay Izhikov Committed: Fri Nov 23 21:31:02 2018 +0300 -- .../cache/persistence/pagemem/PageMemoryImpl.java | 6 +++--- .../wal/serializer/RecordDataV1Serializer.java | 17 ++--- 2 files changed, 17 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/475a0a71/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java index 6f7d2c5..b64b294 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java @@ -228,7 +228,7 @@ public class PageMemoryImpl implements PageMemoryEx { private final GridEncryptionManager encMgr; /** */ -private final EncryptionSpi encSpi; +private final boolean encryptionDisabled; /** */ private final IgniteLogger log; @@ -324,7 +324,7 @@ public class PageMemoryImpl implements PageMemoryEx { storeMgr = ctx.pageStore(); walMgr = ctx.wal(); encMgr = ctx.kernalContext().encryption(); -encSpi = ctx.gridConfig().getEncryptionSpi(); +encryptionDisabled = ctx.gridConfig().getEncryptionSpi() instanceof NoopEncryptionSpi; assert storeMgr != null; assert walMgr != null; @@ -973,7 +973,7 @@ public class PageMemoryImpl implements PageMemoryEx { /** {@inheritDoc} */ @Override public int realPageSize(int grpId) { -if ((encSpi instanceof NoopEncryptionSpi) || encMgr.groupKey(grpId) == null) +if (encryptionDisabled || encMgr.groupKey(grpId) == null) return pageSize(); return encPageSize; http://git-wip-us.apache.org/repos/asf/ignite/blob/475a0a71/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java index ab35f46..84c4074 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java @@ -146,6 +146,9 @@ public class RecordDataV1Serializer implements RecordDataSerializer { private final GridEncryptionManager encMgr; /** */ +private final boolean encryptionDisabled; + +/** */ private static final byte ENCRYPTED = 1; /** */ @@ -162,6 +165,8 @@ public class RecordDataV1Serializer implements RecordDataSerializer { this.encSpi = cctx.gridConfig().getEncryptionSpi(); this.encMgr = cctx.kernalContext().encryption(); +encryptionDisabled = encSpi instanceof NoopEncryptionSpi; + //This happen on offline WAL iteration(we don't have encryption keys available). if (encSpi != null) this.realPageSize = CU.encryptedPageSize(pageSize, encSpi); @@ -227,7 +232,7 @@ public class RecordDataV1Serializer implements RecordDataSerializer { * @return {@code True} if this record should be encrypted. */ private boolean needEncryption(WALRecord rec) { -if (encSpi instanceof NoopEncryptionSpi) +if (encryptionDisabled) return false; if (!(rec instanceof WalRecordCacheGroupAware)) @@ -241,7 +246,7 @@ public class RecordDataV1Serializer implements RecordDataSerializer { * @return {@code True} if this record should be encrypted. */ private boolean needEncryption(int grpId) { -if (encSpi instanceof NoopEncryptionSpi) +if (encryptionDisabled) return false; GridEncryptionManager
[08/50] [abbrv] ignite git commit: IGNITE-10381 Fixed U.doInParallel not to terminate early - Fixes #5483.
IGNITE-10381 Fixed U.doInParallel not to terminate early - Fixes #5483. 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/97d24226 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97d24226 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97d24226 Branch: refs/heads/ignite-9720 Commit: 97d242263a2b2f8f2c6677df1007a6bd3188522b Parents: ae5bfad Author: Alexey Goncharuk Authored: Fri Nov 23 19:11:31 2018 +0300 Committer: Alexey Goncharuk Committed: Fri Nov 23 19:11:31 2018 +0300 -- .../GridCachePartitionExchangeManager.java | 4 +- .../GridDhtPartitionsExchangeFuture.java| 3 +- .../ignite/internal/util/IgniteUtils.java | 189 +++ ...ynamicCacheStartFailWithPersistenceTest.java | 1 + .../internal/util/IgniteUtilsSelfTest.java | 43 - 5 files changed, 34 insertions(+), 206 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/97d24226/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index fed5686..6dad367 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -2906,8 +2906,8 @@ public class GridCachePartitionExchangeManager extends GridCacheSharedMana "topVer=" + exchFut.initialVersion() + ", node=" + cctx.localNodeId() + "]. " + (curTimeout <= 0 && !txRolledBack ? "Consider changing " + - "TransactionConfiguration.txTimeoutOnPartitionMapSynchronization" + -" to non default value to avoid this message. " : "") + + "TransactionConfiguration.txTimeoutOnPartitionMapSynchronization" + +" to non default value to avoid this message. " : "") + "Dumping pending objects that might be the cause: "); try { http://git-wip-us.apache.org/repos/asf/ignite/blob/97d24226/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 9d81405..3384bb9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -1189,7 +1189,8 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte // This exception will be handled by init() method. throw e; -U.error(log, "Failed to initialize cache(s) (will try to rollback). " + exchId, e); +U.error(log, "Failed to initialize cache(s) (will try to rollback) [exchId=" + exchId + +", caches=" + exchActions.cacheGroupsToStart() + ']', e); exchangeLocE = new IgniteCheckedException( "Failed to initialize exchange locally [locNodeId=" + cctx.localNodeId() + "]", e); http://git-wip-us.apache.org/repos/asf/ignite/blob/97d24226/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index f1f4253..2d6b584 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -202,7 +202,6 @@ import java.sql.SQLException; import java.text.SimpleDateFormat; import
[06/50] [abbrv] ignite git commit: IGNITE-10335: move ML examples datasets files to resources
IGNITE-10335: move ML examples datasets files to resources This closes #5434 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1dea0a42 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1dea0a42 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1dea0a42 Branch: refs/heads/ignite-9720 Commit: 1dea0a4273bf54ca2361a3a940db22ba89274ab5 Parents: 39b59d2 Author: Oleg Ignatenko Authored: Fri Nov 23 16:54:25 2018 +0300 Committer: Yury Babak Committed: Fri Nov 23 16:54:25 2018 +0300 -- .../TensorFlowDistributedInferenceExample.java | 16 +- .../TensorFlowLocalInferenceExample.java| 16 +- .../TensorFlowThreadedInferenceExample.java | 16 +- .../examples/ml/util/MLSandboxDatasets.java | 16 +- .../ignite/examples/ml/util/SandboxMLCache.java | 11 +- .../ignite/examples/ml/util/datasets/README.md |2 - .../ml/util/datasets/boston_housing_dataset.txt | 505 --- .../ml/util/datasets/cleared_machines.csv | 209 --- .../ml/util/datasets/glass_identification.csv | 116 -- .../ignite/examples/ml/util/datasets/iris.txt | 150 -- .../examples/ml/util/datasets/mortalitydata.csv | 53 - .../ml/util/datasets/t10k-images-idx3-ubyte | Bin 7840016 -> 0 bytes .../ml/util/datasets/t10k-labels-idx1-ubyte | Bin 10008 -> 0 bytes .../examples/ml/util/datasets/titanic.csv | 1310 -- .../ml/util/datasets/titanic_10_rows.csv| 11 - .../ml/util/datasets/two_classed_iris.csv | 100 -- .../ignite/examples/ml/util/datasets/wine.txt | 178 --- examples/src/main/resources/datasets/README.md |2 + .../datasets/boston_housing_dataset.txt | 505 +++ .../resources/datasets/cleared_machines.csv | 209 +++ .../resources/datasets/glass_identification.csv | 116 ++ examples/src/main/resources/datasets/iris.txt | 150 ++ .../main/resources/datasets/mortalitydata.csv | 53 + .../resources/datasets/t10k-images-idx3-ubyte | Bin 0 -> 9876027 bytes .../resources/datasets/t10k-labels-idx1-ubyte | Bin 0 -> 10008 bytes .../src/main/resources/datasets/titanic.csv | 1310 ++ .../main/resources/datasets/titanic_10_rows.csv | 11 + .../resources/datasets/two_classed_iris.csv | 100 ++ examples/src/main/resources/datasets/wine.txt | 178 +++ parent/pom.xml |1 - 30 files changed, 2676 insertions(+), 2668 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1dea0a42/examples/src/main/java/org/apache/ignite/examples/ml/inference/TensorFlowDistributedInferenceExample.java -- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/inference/TensorFlowDistributedInferenceExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/inference/TensorFlowDistributedInferenceExample.java index cc22df3..ec8cac6 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ml/inference/TensorFlowDistributedInferenceExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/ml/inference/TensorFlowDistributedInferenceExample.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.Random; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; @@ -46,10 +47,10 @@ public class TensorFlowDistributedInferenceExample { private static final String MODEL_PATH = "examples/src/main/resources/ml/mnist_tf_model"; /** Path to the MNIST images data. */ -private static final String MNIST_IMG_PATH = "org/apache/ignite/examples/ml/util/datasets/t10k-images-idx3-ubyte"; +private static final String MNIST_IMG_PATH = "examples/src/main/resources/datasets/t10k-images-idx3-ubyte"; /** Path to the MNIST labels data. */ -private static final String MNIST_LBL_PATH = "org/apache/ignite/examples/ml/util/datasets/t10k-labels-idx1-ubyte"; +private static final String MNIST_LBL_PATH = "examples/src/main/resources/datasets/t10k-labels-idx1-ubyte"; /** Run example. */ public static void main(String[] args) throws IOException, ExecutionException, InterruptedException { @@ -69,13 +70,12 @@ public class TensorFlowDistributedInferenceExample { return Tensor.create(reshaped); }) -.withOutput(Collections.singletonList("ArgMax"), collectedTensors -> { -return collectedTensors.get("ArgMax").copyTo(new long[1])[0]; -}); +.withOutput(Collections.singletonList("ArgMax"), collectedTensors -> collectedTensors.get("ArgMax") +.copyTo(new
[13/50] [abbrv] ignite git commit: IGNITE-9145:[ML] Add different strategies to index labels in StringEncoderTrainer
IGNITE-9145:[ML] Add different strategies to index labels in StringEncoderTrainer this closes #5481 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9137af73 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9137af73 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9137af73 Branch: refs/heads/ignite-9720 Commit: 9137af73ef20228ee98e4bc95a8ccb15dadd0010 Parents: cdaeda1 Author: zaleslaw Authored: Mon Nov 26 14:10:51 2018 +0300 Committer: Yury Babak Committed: Mon Nov 26 14:10:51 2018 +0300 -- .../encoding/EncoderSortingStrategy.java| 31 .../preprocessing/encoding/EncoderTrainer.java | 25 +++- .../encoding/EncoderTrainerTest.java| 27 + 3 files changed, 82 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9137af73/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/EncoderSortingStrategy.java -- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/EncoderSortingStrategy.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/EncoderSortingStrategy.java new file mode 100644 index 000..22cca53 --- /dev/null +++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/EncoderSortingStrategy.java @@ -0,0 +1,31 @@ +/* + * 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.ml.preprocessing.encoding; + +/** + * Describes Encoder sorting strategy to define mapping of integer values to values of categorical feature . + * + * @see EncoderTrainer + */ +public enum EncoderSortingStrategy { +/** Descending order by label frequency (most frequent label assigned 0). */ +FREQUENCY_DESC, + +/** Ascending order by label frequency (least frequent label assigned 0). */ +FREQUENCY_ASC +} http://git-wip-us.apache.org/repos/asf/ignite/blob/9137af73/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/EncoderTrainer.java -- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/EncoderTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/EncoderTrainer.java index 9a97a6d..d5668e4 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/EncoderTrainer.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/preprocessing/encoding/EncoderTrainer.java @@ -17,6 +17,8 @@ package org.apache.ignite.ml.preprocessing.encoding; +import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; @@ -47,6 +49,9 @@ public class EncoderTrainer implements PreprocessingTrainer fit(DatasetBuilder datasetBuilder, IgniteBiFunction basePreprocessor) { @@ -129,9 +134,16 @@ public class EncoderTrainer implements PreprocessingTrainer transformFrequenciesToEncodingValues(Map frequencies) { +Comparator> comp; + +if (encoderSortingStgy.equals(EncoderSortingStrategy.FREQUENCY_DESC)) +comp = Map.Entry.comparingByValue(); +else +comp = Collections.reverseOrder(Map.Entry.comparingByValue()); + final HashMap resMap = frequencies.entrySet() .stream() -.sorted(Map.Entry.comparingByValue()) +.sorted(comp) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new)); @@ -211,6 +223,17 @@ public class EncoderTrainer implements PreprocessingTrainer withEncoderIndexingStrategy(EncoderSortingStrategy encoderSortingStgy) { +this.encoderSortingStgy = encoderSortingStgy; +return this; +} + +/** * Sets the encoder preprocessor type. * * @param type The encoder
[28/50] [abbrv] ignite git commit: IGNITE-10002: MVCC: Create "Cache 2" test suite for MVCC mode. This closes #5198.
http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java index 53122c7..e5d3b48 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java @@ -23,6 +23,7 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheMode.LOCAL; @@ -31,6 +32,13 @@ import static org.apache.ignite.cache.CacheMode.LOCAL; * Isolated nodes LOCAL cache self test. */ public class GridCacheLocalIsolatedNodesSelfTest extends GridCommonAbstractTest { +/** {@inheritDoc} */ +@Override protected void beforeTestsStarted() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); + +super.beforeTestsStarted(); +} + /** * */ http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java index f10cefd..647027f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java @@ -27,6 +27,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheMode.LOCAL; @@ -35,6 +36,13 @@ import static org.apache.ignite.cache.CacheMode.LOCAL; * Load-All self test. */ public class GridCacheLocalLoadAllSelfTest extends GridCommonAbstractTest { +/** {@inheritDoc} */ +@Override public void setUp() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); + +super.setUp(); +} + /** * */ http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java index c7809df..8f27b1b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java @@ -28,6 +28,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestThread; +import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; @@ -37,6 +38,13 @@ import static org.apache.ignite.cache.CacheMode.LOCAL; * Test cases for multi-threaded tests. */ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest { +/** {@inheritDoc} */ +@Override public void setUp() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); + +super.setUp(); +} + /** Grid. */ private Ignite ignite;
[18/50] [abbrv] ignite git commit: IGNITE-10330: Disk page compression. - Fixes #5200.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8eeea37/modules/compress/licenses/jnr-posix-LICENSE.txt -- diff --git a/modules/compress/licenses/jnr-posix-LICENSE.txt b/modules/compress/licenses/jnr-posix-LICENSE.txt new file mode 100644 index 000..58011d4 --- /dev/null +++ b/modules/compress/licenses/jnr-posix-LICENSE.txt @@ -0,0 +1,2486 @@ +jnr-posix is released under a tri EPL/GPL/LGPL license. You can use it, +redistribute it and/or modify it under the terms of the: + + Eclipse Public License version 1.0 + GNU General Public License version 2 + GNU Lesser General Public License version 2.1 + +The complete text of the Eclipse Public License is as follows: + + Eclipse Public License - v 1.0 + + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + + 1. DEFINITIONS + + "Contribution" means: + + a) in the case of the initial Contributor, the initial code and + documentation distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + + i) changes to the Program, and + + ii) additions to the Program; + where such changes and/or additions to the Program + originate from and are distributed by that particular + Contributor. A Contribution 'originates' from a + Contributor if it was added to the Program by such + Contributor itself or anyone acting on such + Contributor's behalf. Contributions do not include + additions to the Program which: (i) are separate modules + of software distributed in conjunction with the Program + under their own license agreement, and (ii) are not + derivative works of the Program. + + "Contributor" means any person or entity that distributes the Program. + + "Licensed Patents" mean patent claims licensable by a Contributor + which are necessarily infringed by the use or sale of its + Contribution alone or when combined with the Program. + + "Program" means the Contributions distributed in accordance with + this Agreement. + + "Recipient" means anyone who receives the Program under this + Agreement, including all Contributors. + + 2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor + hereby grants Recipient a non-exclusive, worldwide, + royalty-free copyright license to reproduce, prepare + derivative works of, publicly display, publicly perform, + distribute and sublicense the Contribution of such + Contributor, if any, and such derivative works, in source + code and object code form. + + b) Subject to the terms of this Agreement, each Contributor + hereby grants Recipient a non-exclusive, worldwide, + royalty-free patent license under Licensed Patents to make, + use, sell, offer to sell, import and otherwise transfer the + Contribution of such Contributor, if any, in source code and + object code form. This patent license shall apply to the + combination of the Contribution and the Program if, at the + time the Contribution is added by the Contributor, such + addition of the Contribution causes such combination to be + covered by the Licensed Patents. The patent license shall not + apply to any other combinations which include the + Contribution. No hardware per se is licensed hereunder. + + c) Recipient understands that although each Contributor grants + the licenses to its Contributions set forth herein, no + assurances are provided by any Contributor that the Program + does not infringe the patent or other intellectual property + rights of any other entity. Each Contributor disclaims any + liability to Recipient for claims brought by any other entity + based on infringement of intellectual property rights or + otherwise. As a condition to exercising the rights and + licenses granted hereunder, each Recipient hereby assumes + sole responsibility to secure any other intellectual property + rights needed, if any. For example, if a third party patent + license is required to allow Recipient to distribute the + Program, it is Recipient's responsibility to acquire that + license before distributing the Program. + + d) Each Contributor represents that to its knowledge it has + sufficient copyright rights in its Contribution, if any, to + grant the copyright license set forth in this Agreement. + + 3. REQUIREMENTS + + A Contributor may choose to distribute the Program in object code + form under its own license agreement, provided
[ignite-teamcity-bot] branch ignite-9542-new-run-stripe updated: IGNITE-9542 OOME fix, limited number of builds in a queue of saving statistics
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-9542-new-run-stripe in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git The following commit(s) were added to refs/heads/ignite-9542-new-run-stripe by this push: new 75abc46 IGNITE-9542 OOME fix, limited number of builds in a queue of saving statistics 75abc46 is described below commit 75abc46f109f604bd85c170b48126fb4544bb360 Author: Dmitriy Pavlov AuthorDate: Wed Nov 28 14:30:18 2018 +0300 IGNITE-9542 OOME fix, limited number of builds in a queue of saving statistics --- .../ci/teamcity/ignited/runhist/Invocation.java| 8 ++ .../ignited/runhist/RunHistCompactedDao.java | 34 + .../ci/teamcity/ignited/runhist/RunHistSync.java | 141 + 3 files changed, 157 insertions(+), 26 deletions(-) diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java index 5ec8b68..88e8510 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java @@ -56,4 +56,12 @@ public class Invocation { public boolean isFailure() { return status == InvocationData.FAILURE || status == InvocationData.MUTED; } + +public int buildId() { +return buildId; +} + +public long startDate() { +return startDate; +} } diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompactedDao.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompactedDao.java index 922742a..3d4377b 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompactedDao.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompactedDao.java @@ -17,10 +17,13 @@ package org.apache.ignite.ci.teamcity.ignited.runhist; +import java.util.Iterator; +import java.util.List; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.QueryEntity; import org.apache.ignite.ci.db.TcHelperDb; +import org.apache.ignite.ci.di.AutoProfiling; import org.apache.ignite.ci.teamcity.ignited.IRunHistory; import org.apache.ignite.ci.teamcity.ignited.IStringCompactor; import org.apache.ignite.ci.teamcity.ignited.fatbuild.TestCompacted; @@ -77,6 +80,7 @@ public class RunHistCompactedDao { return testHistCache.get(new RunHistKey(srvIdMaskHigh, testName, branchId)); } +@AutoProfiling public Boolean addInvocation(final int srvId, final TestCompacted t, final int buildId, @@ -120,4 +124,34 @@ public class RunHistCompactedDao { public boolean setBuildProcessed(int srvId, int buildId, long ts) { return buildStartTime.putIfAbsent(buildIdToCacheKey(srvId, buildId), ts); } + +public Integer addInvocations(RunHistKey histKey, List list) { +if(list.isEmpty()) +return 0; + +return testHistCache.invoke(histKey, (entry, parms) -> { +int cnt = 0; +RunHistCompacted hist = entry.getValue(); + +if (hist == null) +hist = new RunHistCompacted(entry.getKey()); + +List invocationList = (List)parms[0]; + +for (Invocation invocation : invocationList) { +boolean added = hist.addTestRun( +invocation.buildId(), +invocation); +if (added) +cnt++; + +} + +entry.setValue(hist); + +return cnt; +}, +list +); +} } diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java index 9d9b3b3..fe72d48 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java @@ -19,10 +19,15 @@ package org.apache.ignite.ci.teamcity.ignited.runhist; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import javax.annotation.Nullable; import
ignite git commit: IGNITE-10298 Cover possible deadlock in case of caches start and frequent checkpoints. - Fixes #5517.
Repository: ignite Updated Branches: refs/heads/master 2418d8763 -> fe8c8cc58 IGNITE-10298 Cover possible deadlock in case of caches start and frequent checkpoints. - Fixes #5517. Signed-off-by: Pavel Kovalenko Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fe8c8cc5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fe8c8cc5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fe8c8cc5 Branch: refs/heads/master Commit: fe8c8cc5816872ba58bbd2401698b9e847788ea0 Parents: 2418d87 Author: Pavel Kovalenko Authored: Wed Nov 28 13:32:50 2018 +0300 Committer: Pavel Kovalenko Committed: Wed Nov 28 13:32:50 2018 +0300 -- .../GridCacheDatabaseSharedManager.java | 20 ++- ...PdsCacheStartStopWithFreqCheckpointTest.java | 177 +++ .../ignite/testsuites/IgnitePdsTestSuite2.java | 3 + 3 files changed, 198 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/fe8c8cc5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java index 9a083f8..eb52ee6 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java @@ -250,6 +250,9 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan /** Checkpoint thread. Needs to be volatile because it is created in exchange worker. */ private volatile Checkpointer checkpointer; +/** Checkpointer thread instance. */ +private volatile IgniteThread checkpointerThread; + /** For testing only. */ private volatile boolean checkpointsEnabled = true; @@ -427,6 +430,15 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan /** * For test use only. + * + * @return Checkpointer thread instance. + */ +public IgniteThread checkpointerThread() { +return checkpointerThread; +} + +/** + * For test use only. */ public IgniteInternalFuture enableCheckpoints(boolean enable) { GridFutureAdapter fut = new GridFutureAdapter<>(); @@ -2014,7 +2026,11 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan @Override public void onStateRestored(AffinityTopologyVersion topVer) throws IgniteCheckedException { long time = System.currentTimeMillis(); -new IgniteThread(cctx.igniteInstanceName(), "db-checkpoint-thread", checkpointer).start(); +IgniteThread cpThread = new IgniteThread(cctx.igniteInstanceName(), "db-checkpoint-thread", checkpointer); + +cpThread.start(); + +checkpointerThread = cpThread; CheckpointProgressSnapshot chp = checkpointer.wakeupForCheckpoint(0, "node started"); @@ -4648,7 +4664,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan pageStore.ensure(grp.groupId(), p); if (pageStore.pages(grp.groupId(), p) <= 1) { -log.info("Partition [id=" + p + ", state=N/A (only file header) ]"); +log.info("Partition [grp=" + grp.cacheOrGroupName() + ", id=" + p + ", state=N/A (only file header) ]"); continue; } http://git-wip-us.apache.org/repos/asf/ignite/blob/fe8c8cc5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java new file mode 100644 index 000..8e00d88 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java @@ -0,0 +1,177 @@ +/* + * 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
ignite git commit: WIP.
Repository: ignite Updated Branches: refs/heads/ignite-10291 [created] 10f5f9e32 WIP. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/10f5f9e3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/10f5f9e3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/10f5f9e3 Branch: refs/heads/ignite-10291 Commit: 10f5f9e328c081953462c498b58edad636e307fb Parents: 2418d87 Author: devozerov Authored: Wed Nov 28 12:28:40 2018 +0300 Committer: devozerov Committed: Wed Nov 28 12:28:40 2018 +0300 -- .../cache/IgniteCacheOffheapManager.java| 5 +- .../cache/IgniteCacheOffheapManagerImpl.java| 4 +- .../GridCacheDatabaseSharedManager.java | 7 +- .../persistence/GridCacheOffheapManager.java| 15 ++-- .../cache/persistence/IndexStorage.java | 26 ++- .../cache/persistence/IndexStorageImpl.java | 75 +++- .../UpgradePendingTreeToPerPartitionTask.java | 4 +- .../database/IndexStorageSelfTest.java | 21 -- .../query/h2/database/H2TreeIndex.java | 4 +- 9 files changed, 131 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/10f5f9e3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java index cdc44a5..ed3697a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java @@ -588,17 +588,18 @@ public interface IgniteCacheOffheapManager { /** * @param cacheId Cache ID. * @param idxName Index name. + * @param segment Segment. * @return Root page for index tree. * @throws IgniteCheckedException If failed. */ -public RootPage rootPageForIndex(int cacheId, String idxName) throws IgniteCheckedException; +public RootPage rootPageForIndex(int cacheId, String idxName, int segment) throws IgniteCheckedException; /** * @param cacheId Cache ID. * @param idxName Index name. * @throws IgniteCheckedException If failed. */ -public void dropRootPageForIndex(int cacheId, String idxName) throws IgniteCheckedException; +public void dropRootPageForIndex(int cacheId, String idxName, int segment) throws IgniteCheckedException; /** * @param idxName Index name. http://git-wip-us.apache.org/repos/asf/ignite/blob/10f5f9e3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java index e15009e..ca14f68 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java @@ -1142,14 +1142,14 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager } /** {@inheritDoc} */ -@Override public RootPage rootPageForIndex(int cacheId, String idxName) throws IgniteCheckedException { +@Override public RootPage rootPageForIndex(int cacheId, String idxName, int segment) throws IgniteCheckedException { long pageId = allocateForTree(); return new RootPage(new FullPageId(pageId, grp.groupId()), true); } /** {@inheritDoc} */ -@Override public void dropRootPageForIndex(int cacheId, String idxName) throws IgniteCheckedException { +@Override public void dropRootPageForIndex(int cacheId, String idxName, int segment) throws IgniteCheckedException { // No-op. } http://git-wip-us.apache.org/repos/asf/ignite/blob/10f5f9e3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java index 9a083f8..c9bf673 100755 ---
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-10435 [deleted] 0379f945c
[2/2] ignite git commit: Done.
Done. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0379f945 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0379f945 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0379f945 Branch: refs/heads/ignite-10435 Commit: 0379f945cbd5c095d9cfb84ac01f9a0d97334f4f Parents: 8d2f8ba Author: devozerov Authored: Wed Nov 28 11:42:54 2018 +0300 Committer: devozerov Committed: Wed Nov 28 11:42:54 2018 +0300 -- .../platform/client/ClientRequest.java | 19 --- ...lientCacheCreateWithConfigurationRequest.java | 7 +++ ...CacheGetOrCreateWithConfigurationRequest.java | 4 +--- 3 files changed, 4 insertions(+), 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/0379f945/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java index 3e4bf06..76823b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java @@ -19,8 +19,6 @@ package org.apache.ignite.internal.processors.platform.client; import org.apache.ignite.binary.BinaryRawReader; import org.apache.ignite.internal.processors.odbc.ClientListenerRequest; -import org.apache.ignite.plugin.security.SecurityException; -import org.apache.ignite.plugin.security.SecurityPermission; /** * Thin client request. @@ -60,21 +58,4 @@ public class ClientRequest implements ClientListenerRequest { public ClientResponse process(ClientConnectionContext ctx) { return new ClientResponse(reqId); } - -/** - * Run the code with converting {@link SecurityException} to {@link IgniteClientException}. - */ -// TODO -protected static void runWithSecurityExceptionHandler(Runnable runnable) { -try { -runnable.run(); -} -catch (SecurityException ex) { -throw new IgniteClientException( -ClientStatus.SECURITY_VIOLATION, -"Client is not authorized to perform this operation", -ex -); -} -} } http://git-wip-us.apache.org/repos/asf/ignite/blob/0379f945/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java index 3683cfe..93a18ed 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java @@ -26,7 +26,6 @@ import org.apache.ignite.internal.processors.platform.client.ClientRequest; import org.apache.ignite.internal.processors.platform.client.ClientResponse; import org.apache.ignite.internal.processors.platform.client.ClientStatus; import org.apache.ignite.internal.processors.platform.client.IgniteClientException; -import org.apache.ignite.plugin.security.SecurityPermission; /** * Cache create with configuration request. @@ -51,9 +50,9 @@ public class ClientCacheCreateWithConfigurationRequest extends ClientRequest { /** {@inheritDoc} */ @Override public ClientResponse process(ClientConnectionContext ctx) { try { -// Use security exception handler since the code authorizes "enable on-heap cache" permission -runWithSecurityExceptionHandler(() -> ctx.kernalContext().grid().createCache(cacheCfg)); -} catch (CacheExistsException e) { +ctx.kernalContext().grid().createCache(cacheCfg); +} +catch (CacheExistsException e) { throw new IgniteClientException(ClientStatus.CACHE_EXISTS, e.getMessage()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/0379f945/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithConfigurationRequest.java -- diff --git
[1/2] ignite git commit: Removing.
Repository: ignite Updated Branches: refs/heads/ignite-10435 [created] 0379f945c Removing. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8d2f8bae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8d2f8bae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8d2f8bae Branch: refs/heads/ignite-10435 Commit: 8d2f8bae27befe91af0c7763739d026163a6e3b7 Parents: d21f86f Author: devozerov Authored: Wed Nov 28 11:40:29 2018 +0300 Committer: devozerov Committed: Wed Nov 28 11:40:29 2018 +0300 -- .../platform/client/ClientRequest.java | 11 +-- .../cache/ClientCacheClearKeyRequest.java | 2 -- .../cache/ClientCacheClearKeysRequest.java | 2 -- .../client/cache/ClientCacheClearRequest.java | 2 -- .../cache/ClientCacheContainsKeyRequest.java| 2 -- .../cache/ClientCacheContainsKeysRequest.java | 2 -- ...ientCacheCreateWithConfigurationRequest.java | 2 -- .../cache/ClientCacheCreateWithNameRequest.java | 5 ++-- .../client/cache/ClientCacheDestroyRequest.java | 2 -- .../client/cache/ClientCacheGetAllRequest.java | 4 +-- .../ClientCacheGetAndPutIfAbsentRequest.java| 2 -- .../cache/ClientCacheGetAndPutRequest.java | 2 -- .../cache/ClientCacheGetAndRemoveRequest.java | 2 -- .../cache/ClientCacheGetAndReplaceRequest.java | 2 -- ...acheGetOrCreateWithConfigurationRequest.java | 5 ++-- .../ClientCacheGetOrCreateWithNameRequest.java | 2 -- .../client/cache/ClientCacheGetRequest.java | 2 -- .../client/cache/ClientCacheGetSizeRequest.java | 2 -- .../cache/ClientCacheLocalPeekRequest.java | 2 -- .../cache/ClientCacheNodePartitionsRequest.java | 1 - .../client/cache/ClientCachePutAllRequest.java | 2 -- .../cache/ClientCachePutIfAbsentRequest.java| 2 -- .../client/cache/ClientCachePutRequest.java | 2 -- .../cache/ClientCacheRemoveAllRequest.java | 2 -- .../cache/ClientCacheRemoveIfEqualsRequest.java | 2 -- .../cache/ClientCacheRemoveKeyRequest.java | 2 -- .../cache/ClientCacheRemoveKeysRequest.java | 2 -- .../ClientCacheReplaceIfEqualsRequest.java | 2 -- .../client/cache/ClientCacheReplaceRequest.java | 2 -- .../client/cache/ClientCacheRequest.java| 30 .../cache/ClientCacheScanQueryRequest.java | 2 -- 31 files changed, 6 insertions(+), 100 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java index 6a53517..3e4bf06 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java @@ -64,6 +64,7 @@ public class ClientRequest implements ClientListenerRequest { /** * Run the code with converting {@link SecurityException} to {@link IgniteClientException}. */ +// TODO protected static void runWithSecurityExceptionHandler(Runnable runnable) { try { runnable.run(); @@ -76,14 +77,4 @@ public class ClientRequest implements ClientListenerRequest { ); } } - -/** - * Authorize for specified permission. - */ -protected void authorize(ClientConnectionContext ctx, SecurityPermission perm) { -//SecurityContext secCtx = ctx.securityContext(); -// -//if (secCtx != null) -//runWithSecurityExceptionHandler(() -> ctx.kernalContext().security().authorize(null, perm, secCtx)); -} } http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeyRequest.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeyRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeyRequest.java index 5f8e952..10b4be2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeyRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeyRequest.java @@ -38,8 +38,6 @@ public class ClientCacheClearKeyRequest extends ClientCacheKeyRequest { /** {@inheritDoc} */
ignite git commit: IGNITE-10432: Fixed data types in world.sql.
Repository: ignite Updated Branches: refs/heads/ignite-2.7 038bb75d4 -> c87e67069 IGNITE-10432: Fixed data types in world.sql. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c87e6706 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c87e6706 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c87e6706 Branch: refs/heads/ignite-2.7 Commit: c87e67069ac692084054dd9c1c283e142abc5f57 Parents: 038bb75 Author: devozerov Authored: Wed Nov 28 11:11:20 2018 +0300 Committer: devozerov Committed: Wed Nov 28 11:14:21 2018 +0300 -- examples/sql/world.sql | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c87e6706/examples/sql/world.sql -- diff --git a/examples/sql/world.sql b/examples/sql/world.sql index a34ee71..829fba1 100644 --- a/examples/sql/world.sql +++ b/examples/sql/world.sql @@ -2,30 +2,30 @@ DROP TABLE IF EXISTS Country; CREATE TABLE Country ( Code CHAR(3) PRIMARY KEY, - Name CHAR(52), - Continent CHAR(50), - Region CHAR(26), + Name VARCHAR, + Continent VARCHAR, + Region VARCHAR, SurfaceArea DECIMAL(10,2), - IndepYear SMALLINT(6), - Population INT(11), + IndepYear SMALLINT, + Population INT, LifeExpectancy DECIMAL(3,1), GNP DECIMAL(10,2), GNPOld DECIMAL(10,2), - LocalName CHAR(45), - GovernmentForm CHAR(45), - HeadOfState CHAR(60), - Capital INT(11), + LocalName VARCHAR, + GovernmentForm VARCHAR, + HeadOfState VARCHAR, + Capital INT, Code2 CHAR(2) ) WITH "template=partitioned, backups=1, CACHE_NAME=Country, VALUE_TYPE=demo.model.Country"; DROP TABLE IF EXISTS City; CREATE TABLE City ( - ID INT(11), - Name CHAR(35), + ID INT, + Name VARCHAR, CountryCode CHAR(3), - District CHAR(20), - Population INT(11), + District VARCHAR, + Population INT, PRIMARY KEY (ID, CountryCode) ) WITH "template=partitioned, backups=1, affinityKey=CountryCode, CACHE_NAME=City, KEY_TYPE=demo.model.CityKey, VALUE_TYPE=demo.model.City"; @@ -35,7 +35,7 @@ DROP TABLE IF EXISTS CountryLanguage; CREATE TABLE CountryLanguage ( CountryCode CHAR(3), - Language CHAR(30), + Language VARCHAR, IsOfficial CHAR(2), Percentage DECIMAL(4,1), PRIMARY KEY (CountryCode, Language)
ignite git commit: IGNITE-10002 Fixed inspections
Repository: ignite Updated Branches: refs/heads/master d21f86f9e -> 2418d8763 IGNITE-10002 Fixed inspections Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2418d876 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2418d876 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2418d876 Branch: refs/heads/master Commit: 2418d876339f8b79666b361848e6378a3d83b7fd Parents: d21f86f Author: Alexey Goncharuk Authored: Wed Nov 28 11:10:18 2018 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 28 11:12:09 2018 +0300 -- .../internal/processors/cache/CacheEnumOperationsAbstractTest.java | 2 -- .../communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java | 1 - 2 files changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/2418d876/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java index 480d959..0cffeb6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java @@ -32,7 +32,6 @@ import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; -import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -40,7 +39,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; -import static org.junit.Assert.fail; /** * http://git-wip-us.apache.org/repos/asf/ignite/blob/2418d876/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java index 12cf4d9..27f7fa3 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java @@ -105,7 +105,6 @@ public class GridTcpCommunicationSpiRecoverySelfTest } /** */ -@SuppressWarnings({"deprecation"}) private class TestListener implements CommunicationListener { /** */ private boolean block;
ignite git commit: IGNITE-10432: Fixed data types in world.sql.
Repository: ignite Updated Branches: refs/heads/master 3606b21bf -> d21f86f9e IGNITE-10432: Fixed data types in world.sql. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d21f86f9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d21f86f9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d21f86f9 Branch: refs/heads/master Commit: d21f86f9e7817481acbb9438a9e07ca605246807 Parents: 3606b21 Author: devozerov Authored: Wed Nov 28 11:11:20 2018 +0300 Committer: devozerov Committed: Wed Nov 28 11:11:20 2018 +0300 -- examples/sql/world.sql | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d21f86f9/examples/sql/world.sql -- diff --git a/examples/sql/world.sql b/examples/sql/world.sql index a34ee71..829fba1 100644 --- a/examples/sql/world.sql +++ b/examples/sql/world.sql @@ -2,30 +2,30 @@ DROP TABLE IF EXISTS Country; CREATE TABLE Country ( Code CHAR(3) PRIMARY KEY, - Name CHAR(52), - Continent CHAR(50), - Region CHAR(26), + Name VARCHAR, + Continent VARCHAR, + Region VARCHAR, SurfaceArea DECIMAL(10,2), - IndepYear SMALLINT(6), - Population INT(11), + IndepYear SMALLINT, + Population INT, LifeExpectancy DECIMAL(3,1), GNP DECIMAL(10,2), GNPOld DECIMAL(10,2), - LocalName CHAR(45), - GovernmentForm CHAR(45), - HeadOfState CHAR(60), - Capital INT(11), + LocalName VARCHAR, + GovernmentForm VARCHAR, + HeadOfState VARCHAR, + Capital INT, Code2 CHAR(2) ) WITH "template=partitioned, backups=1, CACHE_NAME=Country, VALUE_TYPE=demo.model.Country"; DROP TABLE IF EXISTS City; CREATE TABLE City ( - ID INT(11), - Name CHAR(35), + ID INT, + Name VARCHAR, CountryCode CHAR(3), - District CHAR(20), - Population INT(11), + District VARCHAR, + Population INT, PRIMARY KEY (ID, CountryCode) ) WITH "template=partitioned, backups=1, affinityKey=CountryCode, CACHE_NAME=City, KEY_TYPE=demo.model.CityKey, VALUE_TYPE=demo.model.City"; @@ -35,7 +35,7 @@ DROP TABLE IF EXISTS CountryLanguage; CREATE TABLE CountryLanguage ( CountryCode CHAR(3), - Language CHAR(30), + Language VARCHAR, IsOfficial CHAR(2), Percentage DECIMAL(4,1), PRIMARY KEY (CountryCode, Language)