[ignite] Git Push Summary
Repository: ignite Updated Tags: refs/tags/2.5.0-rc1 [deleted] ec51bdc5a
ignite git commit: IGNITE-8544 Use exchange result topology version for local wal state management. - Fixes #4039.
Repository: ignite Updated Branches: refs/heads/master 028df980a -> fe38f3e38 IGNITE-8544 Use exchange result topology version for local wal state management. - Fixes #4039. Signed-off-by: Alexey GoncharukProject: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fe38f3e3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fe38f3e3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fe38f3e3 Branch: refs/heads/master Commit: fe38f3e389ed2cf9ccdf4146a7960a3375ee4d72 Parents: 028df98 Author: Pavel Kovalenko Authored: Mon May 21 22:33:50 2018 +0300 Committer: Alexey Goncharuk Committed: Mon May 21 22:33:50 2018 +0300 -- .../GridDhtPartitionsExchangeFuture.java| 2 +- ...lWalModeChangeDuringRebalancingSelfTest.java | 66 2 files changed, 67 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/fe38f3e3/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 1b79b76..c62b067 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 @@ -1723,7 +1723,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte grp.topology().onExchangeDone(this, grp.affinity().readyAffinity(res), false); } - cctx.walState().changeLocalStatesOnExchangeDone(exchId.topologyVersion()); +cctx.walState().changeLocalStatesOnExchangeDone(res); } if (super.onDone(res, err)) { http://git-wip-us.apache.org/repos/asf/ignite/blob/fe38f3e3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java index 07653f2..ca46a75 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java @@ -24,10 +24,12 @@ import java.nio.MappedByteBuffer; import java.nio.file.OpenOption; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; +import com.sun.org.apache.regexp.internal.RE; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteSystemProperties; +import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.DataRegionConfiguration; @@ -49,6 +51,7 @@ import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Assert; /** * @@ -63,6 +66,9 @@ public class LocalWalModeChangeDuringRebalancingSelfTest extends GridCommonAbstr /** */ private static final AtomicReference fileIOLatch = new AtomicReference<>(); +/** Replicated cache name. */ +private static final String REPL_CACHE = "cache"; + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); @@ -83,7 +89,11 @@ public class LocalWalModeChangeDuringRebalancingSelfTest extends GridCommonAbstr cfg.setCacheConfiguration( new CacheConfiguration(DEFAULT_CACHE_NAME) // Test checks internal state before and after rebalance, so it is configured to be triggered manually +
ignite git commit: Apache Ignite 2.5 release notes updated
Repository: ignite Updated Branches: refs/heads/ignite-2.5 e77722e06 -> 073fad69b Apache Ignite 2.5 release notes updated Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/073fad69 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/073fad69 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/073fad69 Branch: refs/heads/ignite-2.5 Commit: 073fad69b82f7f3698c0c9d5663e0f762ff76f1a Parents: e77722e Author: Andrey GuraAuthored: Mon May 21 19:43:19 2018 +0300 Committer: Andrey Gura Committed: Mon May 21 21:06:00 2018 +0300 -- RELEASE_NOTES.txt | 116 + 1 file changed, 116 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/073fad69/RELEASE_NOTES.txt -- diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 77db736..69da06b 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,6 +1,122 @@ Apache Ignite Release Notes === +Apache Ignite In-Memory Data Fabric 2.5 +--- +Ignite: +* Implemented Zookeeper discovery SPI. +* Added Java thin client. +* Added continuous queries with transformers. +* Implemented general approach for critical failures handling. +* Added the new method IgniteMXBean.getCurrentCoordinatorFormatted() which displays formatted information about current coordiantor. +* Added partition update counters verification on partition map exchange. +* Added ability to disable WAL during initial data rebalancing. +* Added additional data storage metrics +* Added additional transactional metrics. +* Added DEB package and improved RPM package. +* Added information about fields serialization/deserialization errors in BinaryMarshaller. +* Added configurable automatic rollback timeout for pending transactions preventing partition map exchange to complete. +* Added preventing infinite iterations of corrupted B+Tree. New IGNITE_BPLUS_TREE_LOCK_RETRIES property was added, default value is Integer.MAX_VALUE. +* Implemented handling of broken segment in WAL compaction. +* Fixed affinity to always choose primary node from one of the owners when persistence is enabled. +* Partition eviction now does not block exchange. +* Fixed the issue that prevented rebalancing on a new baseline node join. +* Fixed potential deadlock during preloading. +* Fixed exception handling in IsolatedUpdater of DataStreamer. +* Fixed the issue when ComputeTaskFuture.get() threw a trimmed exception chain: now full exception chain is propagated to the caller; the exception thrown from IgniteCompute methods may now differ from the previous behavior. +* Fixed null value being passed to entry processor when such entry actually exists. +* Fixed problem when cluster could not survive after IgniteOutOfMemoryException. +* Fixed NullPointerException on batch atomic cache operations with cache store. +* Fixed bug with ScanQuery transformer which applies to the first result page only. +* Fixed hanging of node stopping in case when node is invalidated and persistence is enabled. +* BinaryMetadata exchange is triggered only if there are actual changes in BinaryMetadata. +* Fixed contention while executing parallel atomic single get operations. +* Fixed cache metadata corruption during concurrent checkpoint and cache destroy. +* Implemented additional synchronization for correct partition counters update on partition map exchange. +* Optimized checkpoint lock acquisition for demander thread. +* Destroyed caches with enabled persistence now will not survive grid restart. +* Nodes with incompatible SQL metadata will not be able to join grid. This fixes known case for index corruption. +* Fixed fillFactor memory metric value. +* Fixed bug with checkpoint buffer overflow with enabled throttling. +* Fixed crash recovery problem when index tree could reference to removed data pages. +* Fixed error during cluster initialization with partially acceptable WAL archive. +* Fixed issue with local partitions size changing inside checkpoint write lock. +* Fixed LOG_ONLY and BACKGROUND modes to be power-crash resistant. +* Fixed incorrect finishing of implicit transactions on unstable topology. +* Fixed incorrect mapping of smallint Cassandra type. +* Introduced log markers support to IgniteLogger and standard DEV_ONLY marker. +* Changed Log4J and Log4J2 adapters to update active logger configuration when configuration source file is modified. +* Fixed sqlline.sh script to use Java from JAVA_HOME. +* Improved Docker image build. +* Default and recommended JVM options are updated. + +Ignite .Net: +* Added SSL configuration for node-to-node links. +* Added dynamic service proxies. +*
ignite-release git commit: IGNITE-8172 Update Apache Ignite's release scripts to match new RPM and DEB build and deploy architecture
Repository: ignite-release Updated Branches: refs/heads/ignite-2.5 903eb904c -> b4e1f5ab0 IGNITE-8172 Update Apache Ignite's release scripts to match new RPM and DEB build and deploy architecture Signed-off-by: Andrey GuraProject: http://git-wip-us.apache.org/repos/asf/ignite-release/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite-release/commit/b4e1f5ab Tree: http://git-wip-us.apache.org/repos/asf/ignite-release/tree/b4e1f5ab Diff: http://git-wip-us.apache.org/repos/asf/ignite-release/diff/b4e1f5ab Branch: refs/heads/ignite-2.5 Commit: b4e1f5ab012903b4b1ee3fec9472089ef900112e Parents: 903eb90 Author: Ivanov Petr Authored: Mon May 21 19:51:59 2018 +0300 Committer: Andrey Gura Committed: Mon May 21 19:51:59 2018 +0300 -- scripts/release_1[svn]move_artifacts.sh| 19 --- scripts/release_1[svn]move_binaries.sh | 29 scripts/release_2[bintray]upload_packages.sh | 150 scripts/release_2[svn]deploy_docs_to_site.sh | 24 scripts/release_3[git]create_release_tag.sh| 18 --- scripts/release_3[svn]deploy_docs_to_site.sh | 24 scripts/release_4[git]create_release_tag.sh| 18 +++ scripts/vote_3_step_1[packages]build.sh| 47 ++ scripts/vote_3_step_1[rpm]create_repository.sh | 56 scripts/vote_3_step_2[pgp]sign_artifacts.sh| 24 +++- scripts/vote_3_step_3[svn]deploy_artifacts.sh | 25 ++-- 11 files changed, 305 insertions(+), 129 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite-release/blob/b4e1f5ab/scripts/release_1[svn]move_artifacts.sh -- diff --git a/scripts/release_1[svn]move_artifacts.sh b/scripts/release_1[svn]move_artifacts.sh deleted file mode 100644 index 86e1ff4..000 --- a/scripts/release_1[svn]move_artifacts.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -chmod +x release.properties -. ./release.properties - -echo "Releasing ${ignite_version}${rc_name}" - -#uncomment subsequent line in case you want to remove incorrectly released vote -#svn rm -m "Removing redundant Release" https://dist.apache.org/repos/dist/release/ignite/$ignite_version || true -svn mv https://dist.apache.org/repos/dist/dev/ignite/${ignite_version}${rc_name} https://dist.apache.org/repos/dist/release/ignite/${ignite_version} -m "Release ${ignite_version}: Binaries" -svn mv https://dist.apache.org/repos/dist/dev/ignite/rpm_${ignite_version}${rc_name} https://dist.apache.org/repos/dist/release/ignite/rpm -m "Release ${ignite_version}: RPMs" - -echo "Please check results..." - -echo " " -echo "==" -echo "Artifacts should be moved to release repository" -echo "Please check results at" -echo "https://dist.apache.org/repos/dist/release/ignite/; http://git-wip-us.apache.org/repos/asf/ignite-release/blob/b4e1f5ab/scripts/release_1[svn]move_binaries.sh -- diff --git a/scripts/release_1[svn]move_binaries.sh b/scripts/release_1[svn]move_binaries.sh new file mode 100644 index 000..1db1bcc --- /dev/null +++ b/scripts/release_1[svn]move_binaries.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +set -o nounset +set -o errexit +set -o pipefail +set -o errtrace +set -o functrace + + +chmod +x release.properties +. ./release.properties + + +echo "# Releasing ${ignite_version}${rc_name} :: Binaries #" +# Uncomment subsequent line in case you want to remove incorrectly released vote +#svn rm -m "Removing redundant Release" https://dist.apache.org/repos/dist/release/ignite/$ignite_version || true +svn mv https://dist.apache.org/repos/dist/dev/ignite/${ignite_version}${rc_name} \ + https://dist.apache.org/repos/dist/release/ignite/${ignite_version} \ +-m "Release ${ignite_version}: Binaries" +echo + + +# +# Output result and notes +# +echo "=" +echo "Artifacts should be moved to Apache Ignite's release site" +echo "Please check results at:" +echo " * binaries: https://apache.org/dist/ignite/${ignite_version}; + http://git-wip-us.apache.org/repos/asf/ignite-release/blob/b4e1f5ab/scripts/release_2[bintray]upload_packages.sh -- diff --git a/scripts/release_2[bintray]upload_packages.sh b/scripts/release_2[bintray]upload_packages.sh new file mode 100644 index 000..711f991 --- /dev/null +++ b/scripts/release_2[bintray]upload_packages.sh @@ -0,0 +1,150 @@ +#!/usr/bin/env bash +set -o nounset +set -o errexit +set -o pipefail +set -o errtrace +set -o functrace + + +chmod +x release.properties +. ./release.properties + + +AUTH=""# Curl authentication string for accessing Bintray + + +# +#
ignite git commit: IGNITE-8533 Fix timeout collision in Client Nodes test suite introduced by IGNITE-8085 - Fixes #4030.
Repository: ignite Updated Branches: refs/heads/master 9a4a145be -> 028df980a IGNITE-8533 Fix timeout collision in Client Nodes test suite introduced by IGNITE-8085 - Fixes #4030. Signed-off-by: dpavlovProject: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/028df980 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/028df980 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/028df980 Branch: refs/heads/master Commit: 028df980a1ced2c582e351dc3d87260f7afa856a Parents: 9a4a145 Author: AMedvedev Authored: Mon May 21 18:02:36 2018 +0300 Committer: dpavlov Committed: Mon May 21 18:02:36 2018 +0300 -- .../ignite/internal/util/nodestart/StartNodeCallableImpl.java| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/028df980/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java -- diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java index 976bb07..1bf23b3 100644 --- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java +++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java @@ -82,7 +82,7 @@ public class StartNodeCallableImpl implements StartNodeCallable { private static final long NODE_START_CHECK_PERIOD = 2000; /** */ -private static final long NODE_START_CHECK_LIMIT = 25; +private static final long NODE_START_CHECK_LIMIT = 15; /** Specification. */ private final IgniteRemoteStartSpecification spec; @@ -517,4 +517,4 @@ public class StartNodeCallableImpl implements StartNodeCallable { if (logger != null && logger.isInfoEnabled()) logger.info(msg); } -} \ No newline at end of file +}
ignite git commit: IGNITE-8469 Fix for non-heap memory leak for calling cluster activation multi times. - Fixes #3986.
Repository: ignite Updated Branches: refs/heads/master eb8038f65 -> 9a4a145be IGNITE-8469 Fix for non-heap memory leak for calling cluster activation multi times. - Fixes #3986. Signed-off-by: dpavlovProject: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9a4a145b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9a4a145b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9a4a145b Branch: refs/heads/master Commit: 9a4a145be514e650258715a7e682d427d5812d16 Parents: eb8038f Author: Maxim Muzafarov Authored: Mon May 21 17:28:22 2018 +0300 Committer: dpavlov Committed: Mon May 21 17:28:22 2018 +0300 -- .../mem/file/MappedFileMemoryProvider.java | 8 ++ .../mem/unsafe/UnsafeMemoryProvider.java| 8 ++ .../pagemem/impl/PageMemoryNoStoreImpl.java | 3 +- .../apache/ignite/internal/util/GridDebug.java | 56 + .../pagemem/PageMemoryNoStoreLeakTest.java | 82 .../ignite/testsuites/IgnitePdsTestSuite.java | 2 + 6 files changed, 144 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9a4a145b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java index 7186b27..54b4af4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java @@ -55,6 +55,9 @@ public class MappedFileMemoryProvider implements DirectMemoryProvider { /** */ private List mappedFiles; +/** Flag shows if current memory provider have been already initialized. */ +private boolean isInit; + /** * @param allocationPath Allocation path. */ @@ -65,6 +68,9 @@ public class MappedFileMemoryProvider implements DirectMemoryProvider { /** {@inheritDoc} */ @Override public void initialize(long[] sizes) { +if (isInit) +throw new IgniteException("Second initialization does not allowed for current provider"); + this.sizes = sizes; mappedFiles = new ArrayList<>(sizes.length); @@ -90,6 +96,8 @@ public class MappedFileMemoryProvider implements DirectMemoryProvider { "opened by another process and current user has enough rights): " + file); } } + +isInit = true; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a4a145b/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java b/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java index 276e10e..7eb58cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java @@ -41,6 +41,9 @@ public class UnsafeMemoryProvider implements DirectMemoryProvider { /** */ private IgniteLogger log; +/** Flag shows if current memory provider have been already initialized. */ +private boolean isInit; + /** * @param log Ignite logger to use. */ @@ -50,9 +53,14 @@ public class UnsafeMemoryProvider implements DirectMemoryProvider { /** {@inheritDoc} */ @Override public void initialize(long[] sizes) { +if (isInit) +throw new IgniteException("Second initialization does not allowed for current provider"); + this.sizes = sizes; regions = new ArrayList<>(); + +isInit = true; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a4a145b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java index d4b22a6..54b647a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
[2/6] ignite git commit: IGNITE-8266: stopAllGrids in afterAllTests removed. - Fixes #3844.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java index acd2b25..7e5a18d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java @@ -60,11 +60,6 @@ public class IgniteServiceDynamicCachesSelfTest extends GridCommonAbstractTest { startGrids(GRID_CNT); } -/** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); -} - /** * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java index 389cbba..02ba65e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java @@ -69,13 +69,6 @@ public class ServicePredicateAccessCacheTest extends GridCommonAbstractTest { return 60_000; } -/** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); - -super.afterTestsStopped(); -} - /** * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java index 8c4b7d9..35c3405 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java @@ -86,8 +86,6 @@ public class GridCacheMultiNodeLoadTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); - ignite1 = null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java index 063c790..58fc166 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java @@ -72,11 +72,6 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { } /** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); -} - -/** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration c = super.getConfiguration(igniteInstanceName); http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java index cb55749..79ed3ed 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java @@ -56,11 +56,6 @@ public class GridStealingLoadTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ -
[4/6] ignite git commit: IGNITE-8266: stopAllGrids in afterAllTests removed. - Fixes #3844.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java index bd8d44e..5257a4a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java @@ -94,13 +94,6 @@ public class IgniteCacheExpireAndUpdateConsistencyTest extends GridCommonAbstrac assertTrue(client.configuration().isClientMode()); } -/** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); - -super.afterTestsStopped(); -} - /** * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java index f6341ec..b3a5055 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java @@ -77,13 +77,6 @@ public class IgniteCacheIncrementTxTest extends GridCommonAbstractTest { startGrid(SRVS); } -/** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); - -super.afterTestsStopped(); -} - /** * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java index 963271f..9baa176 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java @@ -96,13 +96,6 @@ public abstract class IgniteCacheInvokeReadThroughAbstractTest extends GridCommo ignite(0).destroyCache(DEFAULT_CACHE_NAME); } -/** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); - -super.afterTestsStopped(); -} - /** * @return Store factory. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java index c135f2d..37fe5fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java @@ -51,13 +51,6 @@ public class IgniteCacheNearLockValueSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -super.afterTestsStopped(); - -stopAllGrids(); -} - -/** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java
[6/6] ignite git commit: IGNITE-8266: stopAllGrids in afterAllTests removed. - Fixes #3844.
IGNITE-8266: stopAllGrids in afterAllTests removed. - Fixes #3844. Signed-off-by: Nikolay IzhikovProject: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eb8038f6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eb8038f6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eb8038f6 Branch: refs/heads/master Commit: eb8038f65285559c5424eba2882b0de0583ea7af Parents: 4343b2f Author: Maxim Muzafarov Authored: Mon May 21 16:55:08 2018 +0300 Committer: Nikolay Izhikov Committed: Mon May 21 16:55:08 2018 +0300 -- .../optimized/OptimizedMarshallerAopTest.java | 7 --- .../internal/TaskEventSubjectIdSelfTest.java | 2 -- .../ClientAbstractMultiThreadedSelfTest.java | 5 - .../client/ClientDefaultCacheSelfTest.java | 2 -- .../ClientAbstractMultiNodeSelfTest.java | 7 --- .../client/integration/ClientAbstractSelfTest.java | 5 - .../integration/ClientPreferDirectSelfTest.java| 7 --- .../client/router/TcpRouterAbstractSelfTest.java | 2 -- .../client/router/TcpRouterMultiNodeSelfTest.java | 2 -- .../jdbc2/JdbcAbstractDmlStatementSelfTest.java| 5 - .../internal/jdbc2/JdbcBulkLoadSelfTest.java | 5 - .../internal/jdbc2/JdbcComplexQuerySelfTest.java | 5 - .../internal/jdbc2/JdbcConnectionSelfTest.java | 5 - .../jdbc2/JdbcDistributedJoinsQueryTest.java | 5 - .../internal/jdbc2/JdbcEmptyCacheSelfTest.java | 5 - .../internal/jdbc2/JdbcLocalCachesSelfTest.java| 5 - .../internal/jdbc2/JdbcMetadataSelfTest.java | 5 - .../jdbc2/JdbcNoCacheStreamingSelfTest.java| 5 - .../internal/jdbc2/JdbcNoDefaultCacheTest.java | 5 - .../jdbc2/JdbcPreparedStatementSelfTest.java | 5 - .../internal/jdbc2/JdbcResultSetSelfTest.java | 5 - .../internal/jdbc2/JdbcStatementSelfTest.java | 5 - .../internal/jdbc2/JdbcStreamingSelfTest.java | 5 - .../jdbc2/JdbcStreamingToPublicCacheTest.java | 5 - .../rest/AbstractRestProcessorSelfTest.java| 5 - .../rest/ChangeStateCommandHandlerTest.java| 6 -- .../rest/JettyRestProcessorAbstractSelfTest.java | 2 -- .../rest/RestBinaryProtocolSelfTest.java | 5 - .../rest/RestMemcacheProtocolSelfTest.java | 5 - .../rest/TaskCommandHandlerSelfTest.java | 2 -- .../tcp/redis/RedisCommonAbstractTest.java | 2 -- .../ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java | 2 -- .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 5 - .../apache/ignite/jdbc/JdbcConnectionSelfTest.java | 5 - .../apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java | 5 - .../ignite/jdbc/JdbcErrorsAbstractSelfTest.java| 7 --- .../ignite/jdbc/JdbcLocalCachesSelfTest.java | 5 - .../apache/ignite/jdbc/JdbcMetadataSelfTest.java | 5 - .../apache/ignite/jdbc/JdbcNoDefaultCacheTest.java | 5 - .../ignite/jdbc/JdbcPreparedStatementSelfTest.java | 5 - .../apache/ignite/jdbc/JdbcResultSetSelfTest.java | 5 - .../apache/ignite/jdbc/JdbcStatementSelfTest.java | 5 - .../thin/JdbcThinAbstractDmlStatementSelfTest.java | 5 - .../thin/JdbcThinAutoCloseServerCursorTest.java| 5 - .../jdbc/thin/JdbcThinComplexDmlDdlSelfTest.java | 5 - .../jdbc/thin/JdbcThinComplexQuerySelfTest.java| 5 - .../jdbc/thin/JdbcThinConnectionSelfTest.java | 5 - .../jdbc/thin/JdbcThinEmptyCacheSelfTest.java | 5 - .../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 5 - .../thin/JdbcThinMissingLongArrayResultsTest.java | 6 +- .../jdbc/thin/JdbcThinNoDefaultSchemaTest.java | 5 - .../thin/JdbcThinPreparedStatementSelfTest.java| 5 - .../jdbc/thin/JdbcThinResultSetSelfTest.java | 5 - .../ignite/jdbc/thin/JdbcThinSchemaCaseTest.java | 5 - .../jdbc/thin/JdbcThinSelectAfterAlterTable.java | 5 - .../jdbc/thin/JdbcThinStatementSelfTest.java | 5 - .../ignite/cache/IgniteWarmupClosureSelfTest.java | 5 - .../cache/affinity/AffinityClientNodeSelfTest.java | 5 - .../affinity/AffinityDistributionLoggingTest.java | 2 -- .../affinity/local/LocalAffinityFunctionTest.java | 5 - .../RendezvousAffinityFunctionSelfTest.java| 5 - .../RendezvousAffinityFunctionSimpleBenchmark.java | 5 - .../CacheStoreSessionListenerAbstractSelfTest.java | 5 - .../failure/StopNodeOrHaltFailureHandlerTest.java | 5 - .../ignite/igfs/IgfsEventsAbstractSelfTest.java| 5 - .../igfs/IgfsFragmentizerAbstractSelfTest.java | 5 - .../ignite/internal/ClusterGroupSelfTest.java | 6 -- .../ignite/internal/ClusterMetricsSelfTest.java| 5 -
[3/6] ignite git commit: IGNITE-8266: stopAllGrids in afterAllTests removed. - Fixes #3844.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java index 461a29e..e3a00c0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java @@ -101,11 +101,6 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); -} - -/** {@inheritDoc} */ @Override protected void afterTest() throws Exception { for (int i = 0; i < GRID_CNT; i++) { Ignite g = grid(i); http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java index 6f23865..ee82d5c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java @@ -152,13 +152,6 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); - -assert G.allGrids().isEmpty(); -} - -/** {@inheritDoc} */ @SuppressWarnings({"SizeReplaceableByIsEmpty"}) @Override protected void beforeTest() throws Exception { for (int i = 0; i < GRID_CNT; i++) { http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java index 77aa75e..21b90e2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java @@ -79,11 +79,4 @@ public class GridCacheNearTxForceKeyTest extends GridCommonAbstractTest { assertTrue(ignite0.affinity(DEFAULT_CACHE_NAME).isPrimary(ignite1.cluster().localNode(), key)); } - -/** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -super.afterTestsStopped(); - -stopAllGrids(); -} } http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java index b53177b..b212d63 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java @@ -94,11 +94,6 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest startGrids(GRIDS); } -/** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); -} - /** * @param ignite Grid. * @return Affinity.
[5/6] ignite git commit: IGNITE-8266: stopAllGrids in afterAllTests removed. - Fixes #3844.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java index 0d47676..c680a68 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java @@ -93,11 +93,6 @@ public class RendezvousAffinityFunctionSimpleBenchmark extends GridCommonAbstrac ignite = startGrid(); } -/** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); -} - /** * @param nodesCnt Count of nodes to generate. * @return Nodes list. http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java index 56e7dca..412a879 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java @@ -87,11 +87,6 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm } /** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); -} - -/** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { try (Connection conn = DriverManager.getConnection(URL)) { conn.createStatement().executeUpdate("DROP TABLE IF EXISTS Table1"); http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandlerTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandlerTest.java index da13b06..05e3e6e 100644 --- a/modules/core/src/test/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandlerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandlerTest.java @@ -47,11 +47,6 @@ public class StopNodeOrHaltFailureHandlerTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); -} - -/** {@inheritDoc} */ @Override protected FailureHandler getFailureHandler(String igniteInstanceName) { return igniteInstanceName.endsWith("2") ? new StopNodeOrHaltFailureHandler(false, 0) : http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java index 5593493..bb84ae3 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java @@ -179,11 +179,6 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest igfs.clear(); } -/** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopGrid(1); -} - /** * Checks events on CRUD operations on a single file in nested directories. * http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java index a409ece..0b14b1d 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java +++
[1/6] ignite git commit: IGNITE-8266: stopAllGrids in afterAllTests removed. - Fixes #3844.
Repository: ignite Updated Branches: refs/heads/master 4343b2f9a -> eb8038f65 http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java index 452ac96..2ee626f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java @@ -82,13 +82,6 @@ public abstract class DynamicIndexAbstractSelfTest extends AbstractSchemaSelfTes /** Argument for simple SQL (2). */ protected static final int SQL_ARG_2 = 80; -/** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); - -super.afterTestsStopped(); -} - /** * Create server configuration. * http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2ConnectionLeaksSelfTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2ConnectionLeaksSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2ConnectionLeaksSelfTest.java index 417c1f3..240b526 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2ConnectionLeaksSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2ConnectionLeaksSelfTest.java @@ -57,11 +57,6 @@ public class H2ConnectionLeaksSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); -} - -/** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { CacheConfigurationccfg = new CacheConfiguration ().setName(CACHE_NAME) .setIndexedTypes(Long.class, String.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java index 70f2d85..650da7d 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java @@ -74,13 +74,6 @@ public abstract class H2DynamicColumnsAbstractBasicSelfTest extends DynamicColum } /** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); - -super.afterTestsStopped(); -} - -/** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { super.beforeTest(); http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java index ba848fb..cf47774 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java @@ -54,13 +54,6 @@ public abstract class H2DynamicIndexAbstractSelfTest extends AbstractSchemaSelfT } /** {@inheritDoc} */ -@Override protected void afterTestsStopped() throws Exception { -stopAllGrids(); - -super.afterTestsStopped(); -} - -/** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { super.beforeTest();
ignite git commit: IGNITE-6977 Fix of initial BitSet size in GridPartitionStateMap - Fixes #3082.
Repository: ignite Updated Branches: refs/heads/master cb8fb7365 -> 4343b2f9a IGNITE-6977 Fix of initial BitSet size in GridPartitionStateMap - Fixes #3082. Signed-off-by: dpavlovProject: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4343b2f9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4343b2f9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4343b2f9 Branch: refs/heads/master Commit: 4343b2f9a6fe5c84d08cd7b31481836606d47a10 Parents: cb8fb73 Author: Alexander Belyak Authored: Mon May 21 16:26:04 2018 +0300 Committer: dpavlov Committed: Mon May 21 16:26:04 2018 +0300 -- .../org/apache/ignite/internal/util/GridPartitionStateMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4343b2f9/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java index 07da672..5250e15 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java @@ -136,7 +136,7 @@ public class GridPartitionStateMap extends AbstractMap
ignite git commit: IGNITE-8511: [ML] Add support for Multi-Class Logistic Regression
Repository: ignite Updated Branches: refs/heads/master 436d1230e -> cb8fb7365 IGNITE-8511: [ML] Add support for Multi-Class Logistic Regression this closes #4008 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cb8fb736 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cb8fb736 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cb8fb736 Branch: refs/heads/master Commit: cb8fb736597e9b3f25ef6d55a8dc4d8ad0d23b60 Parents: 436d123 Author: zaleslawAuthored: Mon May 21 15:31:16 2018 +0300 Committer: Yury Babak Committed: Mon May 21 15:31:16 2018 +0300 -- .../LogisticRegressionSGDTrainerSample.java | 239 --- .../LogisticRegressionSGDTrainerSample.java | 239 +++ .../logistic/binary/package-info.java | 22 ++ ...gressionMultiClassClassificationExample.java | 301 +++ .../logistic/multiclass/package-info.java | 22 ++ .../LogRegressionMultiClassModel.java | 96 ++ .../LogRegressionMultiClassTrainer.java | 222 ++ .../logistic/multiclass/package-info.java | 22 ++ .../ml/regressions/RegressionsTestSuite.java| 6 +- .../linear/LinearRegressionModelTest.java | 17 ++ .../logistic/LogRegMultiClassTrainerTest.java | 98 ++ 11 files changed, 1043 insertions(+), 241 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/cb8fb736/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/LogisticRegressionSGDTrainerSample.java -- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/LogisticRegressionSGDTrainerSample.java b/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/LogisticRegressionSGDTrainerSample.java deleted file mode 100644 index 0505ddd..000 --- a/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/LogisticRegressionSGDTrainerSample.java +++ /dev/null @@ -1,239 +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.examples.ml.regression.logistic; - -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.cache.query.QueryCursor; -import org.apache.ignite.cache.query.ScanQuery; -import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector; -import org.apache.ignite.ml.nn.UpdatesStrategy; -import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDParameterUpdate; -import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDUpdateCalculator; -import org.apache.ignite.ml.regressions.logistic.binomial.LogisticRegressionModel; -import org.apache.ignite.ml.regressions.logistic.binomial.LogisticRegressionSGDTrainer; -import org.apache.ignite.thread.IgniteThread; - -import javax.cache.Cache; -import java.util.Arrays; -import java.util.UUID; - -/** - * Run logistic regression model over distributed cache. - * - * @see LogisticRegressionSGDTrainer - */ -public class LogisticRegressionSGDTrainerSample { -/** Run example. */ -public static void main(String[] args) throws InterruptedException { -System.out.println(); -System.out.println(">>> Logistic regression model over partitioned dataset usage example started."); -// Start ignite grid. -try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) { -System.out.println(">>> Ignite grid started."); -IgniteThread igniteThread = new IgniteThread(ignite.configuration().getIgniteInstanceName(), -LogisticRegressionSGDTrainerSample.class.getSimpleName(), () -> { - -IgniteCache dataCache = getTestCache(ignite); - -
ignite git commit: IGNITE-8521 Do not attempt to unregister continuous query if query ID is null
Repository: ignite Updated Branches: refs/heads/ignite-2.5 e26c01585 -> e77722e06 IGNITE-8521 Do not attempt to unregister continuous query if query ID is null Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e77722e0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e77722e0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e77722e0 Branch: refs/heads/ignite-2.5 Commit: e77722e06bc3796a003a9edb5fad7df4860ca27f Parents: e26c015 Author: Alexey GoncharukAuthored: Mon May 21 15:13:37 2018 +0300 Committer: Alexey Goncharuk Committed: Mon May 21 15:16:49 2018 +0300 -- .../cache/query/continuous/CacheContinuousQueryManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e77722e0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java index 19225f8..55c44b4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java @@ -703,7 +703,8 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { catch (IgniteCheckedException e) { log.warning("Failed to start continuous query.", e); -cctx.kernalContext().continuous().stopRoutine(id); +if (id != null) +cctx.kernalContext().continuous().stopRoutine(id); throw new IgniteCheckedException("Failed to start continuous query.", e); }
ignite git commit: IGNITE-8521 Do not attempt to unregister continuous query if query ID is null
Repository: ignite Updated Branches: refs/heads/master d0e26bebb -> 436d1230e IGNITE-8521 Do not attempt to unregister continuous query if query ID is null Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/436d1230 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/436d1230 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/436d1230 Branch: refs/heads/master Commit: 436d1230efff5000decad30cfbc0a79b151f3e16 Parents: d0e26be Author: Alexey GoncharukAuthored: Mon May 21 15:13:37 2018 +0300 Committer: Alexey Goncharuk Committed: Mon May 21 15:13:37 2018 +0300 -- .../cache/query/continuous/CacheContinuousQueryManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/436d1230/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java index 19225f8..55c44b4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java @@ -703,7 +703,8 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { catch (IgniteCheckedException e) { log.warning("Failed to start continuous query.", e); -cctx.kernalContext().continuous().stopRoutine(id); +if (id != null) +cctx.kernalContext().continuous().stopRoutine(id); throw new IgniteCheckedException("Failed to start continuous query.", e); }
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-8446-master [deleted] d9c482137
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-8446-fix [deleted] 38be5a1da
ignite git commit: IGNITE-8446 Ability to check and completely fill transactions on creation
Repository: ignite Updated Branches: refs/heads/ignite-8446 [created] 48949b8f2 IGNITE-8446 Ability to check and completely fill transactions on creation Signed-off-by: Anton VinogradovProject: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48949b8f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48949b8f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48949b8f Branch: refs/heads/ignite-8446 Commit: 48949b8f236ec6df6f8a816ee3f9ac827f2f492d Parents: 381448e Author: Anton Vinogradov Authored: Mon May 21 13:02:41 2018 +0300 Committer: Anton Vinogradov Committed: Mon May 21 13:02:41 2018 +0300 -- .../org/apache/ignite/events/EventType.java | 23 + .../apache/ignite/events/TransactionEvent.java | 55 .../transactions/IgniteTransactionsImpl.java| 11 ++- .../cache/transactions/TxLabelTest.java | 94 +++- 4 files changed, 178 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/48949b8f/modules/core/src/main/java/org/apache/ignite/events/EventType.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventType.java b/modules/core/src/main/java/org/apache/ignite/events/EventType.java index b0b410a..113c53d 100644 --- a/modules/core/src/main/java/org/apache/ignite/events/EventType.java +++ b/modules/core/src/main/java/org/apache/ignite/events/EventType.java @@ -781,6 +781,18 @@ public interface EventType { public static final int EVT_WAL_SEGMENT_ARCHIVED = 128; /** + * Built-in event type: Transaction has been started. + * + * Fired for each started transactions except system transactions. + * + * NOTE: all types in range from 1 to 1000 are reserved for + * internal Ignite events and should not be used by user-defined events. + * + * @see WalSegmentArchivedEvent + */ +public static final int EVT_TX_STARTED = 129; + +/** * All checkpoint events. This array can be directly passed into * {@link IgniteEvents#localListen(IgnitePredicate, int...)} method to * subscribe to all checkpoint events. @@ -979,6 +991,17 @@ public interface EventType { }; /** + * All Transaction events. This array can be directly passed into + * {@link IgniteEvents#localListen(IgnitePredicate, int...)} method to + * subscribe to all transaction events. + * + * @see TransactionEvent + */ +public static final int[] EVTS_TX = { +EVT_TX_STARTED +}; + +/** * All Ignite events (including metric update event). */ public static final int[] EVTS_ALL = U.gridEvents(); http://git-wip-us.apache.org/repos/asf/ignite/blob/48949b8f/modules/core/src/main/java/org/apache/ignite/events/TransactionEvent.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/events/TransactionEvent.java b/modules/core/src/main/java/org/apache/ignite/events/TransactionEvent.java new file mode 100644 index 000..deb9019 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/events/TransactionEvent.java @@ -0,0 +1,55 @@ +/* + * 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.events; + +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; + +/** + * Event indicates there was some action with transaction, eg. creation, rollback, commit and etc. + * + * @see EventType#EVTS_TX + */ +public class TransactionEvent extends EventAdapter { +/** */ +private static final long serialVersionUID = 0L; + +/** Tx. */ +private IgniteInternalTx tx; + +/** + * @param node Node. + * @param msg Message. + * @param type Type. + * @param tx Tx. + */ +public TransactionEvent(ClusterNode node, String msg, int type,
ignite git commit: IGNITE-8054 serialize only valuable part of GridLongList - Fixes #3748.
Repository: ignite Updated Branches: refs/heads/master 381448ea7 -> d0e26bebb IGNITE-8054 serialize only valuable part of GridLongList - Fixes #3748. Signed-off-by: dpavlovProject: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d0e26beb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d0e26beb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d0e26beb Branch: refs/heads/master Commit: d0e26bebb42efb8bb49ef7c802fe086b06473c48 Parents: 381448e Author: Alexander Menshikov Authored: Mon May 21 13:01:47 2018 +0300 Committer: dpavlov Committed: Mon May 21 13:01:47 2018 +0300 -- .../main/java/org/apache/ignite/internal/util/GridLongList.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d0e26beb/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java index 09fb098..d1f20e6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java @@ -530,7 +530,7 @@ public class GridLongList implements Message, Externalizable { switch (writer.state()) { case 0: -if (!writer.writeLongArray("arr", arr)) +if (!writer.writeLongArray("arr", arr, idx)) return false; writer.incrementState();
[2/3] ignite git commit: IGNITE-8488 Web Console: Fixed scrolling issues in bs-select-menu.
http://git-wip-us.apache.org/repos/asf/ignite/blob/381448ea/modules/web-console/frontend/package-lock.json -- diff --git a/modules/web-console/frontend/package-lock.json b/modules/web-console/frontend/package-lock.json index c966cb7..31347f9 100644 --- a/modules/web-console/frontend/package-lock.json +++ b/modules/web-console/frontend/package-lock.json @@ -8,12 +8,16 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz;, "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", - "dev": true, "requires": { -"call-me-maybe": "1.0.1", -"glob-to-regexp": "0.3.0" +"call-me-maybe": "^1.0.1", +"glob-to-regexp": "^0.3.0" } }, +"@nodelib/fs.stat": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.0.2.tgz;, + "integrity": "sha512-vCpf75JDcdomXvUd7Rn6DfYAVqPAFI66FVjxiWGwh85OLdvfo3paBoPJaam5keIYRyUolnS7SleS/ZPCidCvzw==" +}, "@posthtml/esm": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@posthtml/esm/-/esm-1.0.0.tgz;, @@ -25,9 +29,9 @@ "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==" }, "@types/angular": { - "version": "1.6.43", - "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.6.43.tgz;, - "integrity": "sha512-3GrHCRZS62ruJjHMtOx3WYsS0I8i0FRcIqOwqIfWXnlR9g2FebEhUNdMk3LZIvfhZ08xe+S1x2iwP1t9vKCHag==", + "version": "1.6.45", + "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.6.45.tgz;, + "integrity": "sha512-eXm3F/z2j8lVq7yBLL2G8QAygzYAboIJbJ46g26t71hgPtlxV9ibEJIBNj4KxCIZf7DcQo/KSnqaQ/0D9Rx2GA==", "dev": true }, "@types/angular-animate": { @@ -36,7 +40,7 @@ "integrity": "sha512-kRUrLBKCBNQQUMGf4OIEe3MchzWVVyLFvRDkQ4f3aUc+FAUabRmQeATRY8CZpSD7Lcw3efKIKzWsmm7Aenfy5A==", "dev": true, "requires": { -"@types/angular": "1.6.43" +"@types/angular": "*" } }, "@types/angular-mocks": { @@ -45,7 +49,7 @@ "integrity": "sha512-C8ipXVKQvw+w64kH97Npa3a7uZB7ZL9Kr4+sOe33oYIyxeg09M8bzAWCIYCmPRRV0px6ozFTZeSVjBXDikz2zw==", "dev": true, "requires": { -"@types/angular": "1.6.43" +"@types/angular": "*" } }, "@types/angular-strap": { @@ -54,20 +58,20 @@ "integrity": "sha512-PIIQbwgbxHRHeZ5sfGwjKG9PL2P6zh7KVt+V4lkHlNZSQctxRmu2fd0wfAurnwTnC0l+6SdgL+KEIghe7GOjYw==", "dev": true, "requires": { -"@types/angular": "1.6.43" +"@types/angular": "*" } }, "@types/babel-types": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.1.tgz;, - "integrity": "sha512-EkcOk09rjhivbovP8WreGRbXW20YRfe/qdgXOGq3it3u3aAOWDRNsQhL/XPAWFF7zhZZ+uR+nT+3b+TCkIap1w==" + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.2.tgz;, + "integrity": "sha512-ylggu8DwwxT6mk3jVoJeohWAePWMNWEYm06MSoJ19kwp3hT9eY2Z4NNZn3oevzgFmClgNQ2GQF500hPDvNsGHg==" }, "@types/babylon": { "version": "6.16.2", "resolved": "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.2.tgz;, "integrity": "sha512-+Jty46mPaWe1VAyZbfvgJM4BAdklLWxrT5tc/RjvCgLrtk6gzRY6AOnoWFv4p6hVxhJshDdr2hGVn56alBp97Q==", "requires": { -"@types/babel-types": "7.0.1" +"@types/babel-types": "*" } }, "@types/chai": { @@ -77,15 +81,15 @@ "dev": true }, "@types/jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.1.tgz;, - "integrity": "sha512-N3h+rzN518yl2xKrW0o6KKdNmWZ+OwG6SoM5TBEQFF0tTv5wXPEsoOuYQ2Kt3/89XbcSZUJLdjiT/2c3BR/ApQ==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.2.tgz;, + "integrity": "sha512-ByZwKSEqteAta4VrIalqGJZmMq9lWPD3H3f5Xs6RR8B7zQRDPGUtjoKBYNtKTz/7LgBEQMdlxVbbjQfUaEIItA==", "dev": true }, "@types/lodash": { - "version": "4.14.107", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.107.tgz;, - "integrity": "sha512-afvjfP2rl3yvtv2qrCRN23zIQcDinF+munMJCoHEw2BXF22QJogTlVfNPTACQ6ieDyA6VnyKT4WLuN/wK368ng==", + "version": "4.14.109", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.109.tgz;, + "integrity": "sha512-hop8SdPUEzbcJm6aTsmuwjIYQo1tqLseKCM+s2bBqTU2gErwI4fE+aqUVOlscPSQbKHKgtMMPoC+h4AIGOJYvw==", "dev": true }, "@types/mocha": { @@ -95,15 +99,15 @@ "dev": true }, "@types/node": { - "version": "9.6.6", - "resolved":
[1/3] ignite git commit: IGNITE-8488 Web Console: Fixed scrolling issues in bs-select-menu.
Repository: ignite Updated Branches: refs/heads/master fe6e70e3c -> 381448ea7 http://git-wip-us.apache.org/repos/asf/ignite/blob/381448ea/modules/web-console/frontend/package.json -- diff --git a/modules/web-console/frontend/package.json b/modules/web-console/frontend/package.json index f9d0b48..9e591db 100644 --- a/modules/web-console/frontend/package.json +++ b/modules/web-console/frontend/package.json @@ -91,7 +91,7 @@ "jszip": "3.1.5", "lodash": "4.17.5", "natural-compare-lite": "^1.4.0", -"node-sass": "4.8.3", +"node-sass": "^4.8.3", "nvd3": "1.8.6", "outdent": "^0.5.0", "pako": "1.0.6",
[3/3] ignite git commit: IGNITE-8488 Web Console: Fixed scrolling issues in bs-select-menu.
IGNITE-8488 Web Console: Fixed scrolling issues in bs-select-menu. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/381448ea Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/381448ea Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/381448ea Branch: refs/heads/master Commit: 381448ea74dc64bf5ebcf5201ed75def058ffae9 Parents: fe6e70e Author: Ilya BorisovAuthored: Mon May 21 16:24:50 2018 +0700 Committer: Alexey Kuznetsov Committed: Mon May 21 16:24:50 2018 +0700 -- .../app/components/bs-select-menu/controller.js |5 +- .../app/components/bs-select-menu/index.js |2 + .../app/components/bs-select-menu/index.spec.js | 67 + .../app/components/bs-select-menu/style.scss| 18 +- .../app/components/bs-select-menu/template.pug |3 +- .../transcludeToBody.directive.js | 50 + .../components/cluster-selector/template.pug|4 +- modules/web-console/frontend/package-lock.json | 8166 ++ modules/web-console/frontend/package.json |2 +- 9 files changed, 4937 insertions(+), 3380 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/381448ea/modules/web-console/frontend/app/components/bs-select-menu/controller.js -- diff --git a/modules/web-console/frontend/app/components/bs-select-menu/controller.js b/modules/web-console/frontend/app/components/bs-select-menu/controller.js index f8c0171..70346ed 100644 --- a/modules/web-console/frontend/app/components/bs-select-menu/controller.js +++ b/modules/web-console/frontend/app/components/bs-select-menu/controller.js @@ -18,8 +18,11 @@ export default class { static $inject = ['$scope']; +/** + * @param {ng.IScope} $scope + */ constructor($scope) { -Object.assign(this, {$scope}); +this.$scope = $scope; } areAllSelected() { http://git-wip-us.apache.org/repos/asf/ignite/blob/381448ea/modules/web-console/frontend/app/components/bs-select-menu/index.js -- diff --git a/modules/web-console/frontend/app/components/bs-select-menu/index.js b/modules/web-console/frontend/app/components/bs-select-menu/index.js index e64e1fa..a9bafb2 100644 --- a/modules/web-console/frontend/app/components/bs-select-menu/index.js +++ b/modules/web-console/frontend/app/components/bs-select-menu/index.js @@ -18,7 +18,9 @@ import angular from 'angular'; import directive from './directive'; +import {directive as transcludeToBody} from './transcludeToBody.directive'; export default angular .module('ignite-console.bs-select-menu', []) +.directive('bssmTranscludeToBody', transcludeToBody) .directive('bsSelectMenu', directive); http://git-wip-us.apache.org/repos/asf/ignite/blob/381448ea/modules/web-console/frontend/app/components/bs-select-menu/index.spec.js -- diff --git a/modules/web-console/frontend/app/components/bs-select-menu/index.spec.js b/modules/web-console/frontend/app/components/bs-select-menu/index.spec.js new file mode 100644 index 000..9b9fa39 --- /dev/null +++ b/modules/web-console/frontend/app/components/bs-select-menu/index.spec.js @@ -0,0 +1,67 @@ +/* + * 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. + */ + +import 'mocha'; +import {assert} from 'chai'; +import angular from 'angular'; +import componentModule from './index.js'; + +suite('bs-select-menu', () => { +/** @type {ng.IScope} */ +let $scope; +/** @type {ng.ICompileService} */ +let $compile; + +setup(() => { +angular.module('test', [componentModule.name]); +angular.mock.module('test'); +angular.mock.inject((_$rootScope_, _$compile_) => { +$compile = _$compile_; +$scope = _$rootScope_.$new(); +}); +}); + +test('Create/destroy', () => { +$scope.$matches = []; +