[ignite] 01/02: Merge remote-tracking branch 'remotes/origin/master' into ignite-11704
This is an automated email from the ASF dual-hosted git repository. sboikov pushed a commit to branch ignite-11704 in repository https://gitbox.apache.org/repos/asf/ignite.git commit 323ef8e12684b0fc73452c152242fe4dc123e244 Merge: 1da9dc3 7e73098 Author: sboikov AuthorDate: Mon Aug 26 20:11:40 2019 +0300 Merge remote-tracking branch 'remotes/origin/master' into ignite-11704 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java RELEASE_NOTES.txt | 13 + .../examples/ml/knn/ANNClassificationExample.java |3 +- .../examples/ml/knn/IrisClassificationExample.java | 17 +- .../examples/ml/knn/KNNClassificationExample.java | 13 +- .../examples/ml/knn/KNNRegressionExample.java | 13 +- .../selection/scoring/RegressionMetricExample.java | 12 +- .../ignite/examples/ml/tutorial/Step_6_KNN.java| 11 +- .../internal/jdbc2/JdbcStreamingSelfTest.java | 56 ++ .../ignite/jdbc/JdbcErrorsAbstractSelfTest.java| 55 ++ .../thin/JdbcThinStreamingAbstractSelfTest.java|8 + .../DiskPageCompressionIntegrationTest.java|8 +- .../main/java/org/apache/ignite/IgniteCluster.java | 15 + .../org/apache/ignite/IgniteSystemProperties.java | 16 +- .../org/apache/ignite/internal/IgniteFeatures.java |9 + .../org/apache/ignite/internal/IgniteKernal.java | 219 +++-- .../org/apache/ignite/internal/IgnitionEx.java | 14 +- .../internal/TransactionMetricsMxBeanImpl.java |4 + .../internal/client/GridClientClusterState.java| 14 + .../client/impl/GridClientClusterStateImpl.java| 22 +- .../impl/connection/GridClientConnection.java | 22 + .../connection/GridClientNioTcpConnection.java | 18 + .../ClusterReadOnlyModeCheckedException.java | 78 ++ .../internal/cluster/DetachedClusterNode.java |4 +- .../internal/cluster/IgniteClusterAsyncImpl.java | 10 + .../ignite/internal/cluster/IgniteClusterImpl.java | 58 +- .../internal/commandline/BaselineCommand.java |2 +- ...java => ClusterReadOnlyModeDisableCommand.java} | 47 +- java => ClusterReadOnlyModeEnableCommand.java} | 47 +- .../ignite/internal/commandline/CommandList.java |8 +- .../ignite/internal/commandline/StateCommand.java | 13 +- .../ignite/internal/commandline/TxCommands.java|2 +- .../ignite/internal/jdbc2/JdbcBatchUpdateTask.java |9 +- .../communication/AbstractTransmission.java| 111 +++ .../managers/communication/ChunkReceiver.java | 115 +++ .../managers/communication/FileReceiver.java | 129 +++ .../managers/communication/FileSender.java | 172 .../managers/communication/GridIoManager.java | 1019 +++- .../communication/GridIoMessageFactory.java|5 + .../communication/SessionChannelMessage.java | 136 +++ .../communication/TransmissionHandler.java | 76 ++ .../managers/communication/TransmissionMeta.java | 197 .../managers/communication/TransmissionPolicy.java | 43 + .../communication/TransmissionReceiver.java| 71 ++ .../managers/discovery/ClusterMetricsImpl.java | 57 +- .../internal/metric/IoStatisticsHolderCache.java |4 +- .../internal/metric/IoStatisticsHolderIndex.java |4 +- .../internal/pagemem/wal/record/PageSnapshot.java |5 - .../affinity/GridAffinityAssignmentV2.java | 15 +- .../affinity/HistoryAffinityAssignmentImpl.java|7 +- .../processors/cache/CacheGroupMetricsImpl.java|4 +- .../cache/CacheJoinNodeDiscoveryData.java |7 + .../processors/cache/CacheMetricsImpl.java | 138 +-- .../internal/processors/cache/CachesRegistry.java | 33 +- .../processors/cache/ClusterCachesInfo.java| 70 +- .../cache/DynamicCacheChangeRequest.java | 15 +- .../processors/cache/GridCacheMapEntry.java| 16 +- .../internal/processors/cache/GridCacheMvcc.java | 43 +- .../processors/cache/GridCacheMvccCandidate.java | 41 +- .../processors/cache/GridCacheMvccManager.java |4 +- .../processors/cache/GridCacheProcessor.java | 1017 ++- .../processors/cache/GridCacheSharedManager.java |8 + .../cache/GridCacheSharedManagerAdapter.java | 15 + .../internal/processors/cache/GridCacheUtils.java |7 + .../processors/cache/GridLocalConfigManager.java | 333 +++ .../cache/IgniteCacheOffheapManagerImpl.java | 35 +- .../processors/cache/StateChangeRequest.java |7 + .../cache/ValidationOnNodeJoinUtils.java | 754 +++ .../cache/distributed/GridCacheTxFinishSync.java | 366 --- .../distributed/GridDistributedCacheEntry.java | 18 +- .../dht/GridDhtTopologyFutureAdapter.java |6 +- .../dht/GridDhtTxAbstractEnlistFuture.java |1 - .../distributed/dht/GridDhtTxPrepa
[ignite] 02/02: Added tests
This is an automated email from the ASF dual-hosted git repository. sboikov pushed a commit to branch ignite-11704 in repository https://gitbox.apache.org/repos/asf/ignite.git commit 8fd5815ff20c7fc22cae3b0230b787184e1863c4 Author: sboikov AuthorDate: Mon Aug 26 21:07:54 2019 +0300 Added tests --- .../org/apache/ignite/IgniteSystemProperties.java | 3 +++ .../processors/cache/CacheGroupContext.java| 10 .../processors/cache/GridCacheMapEntry.java| 5 ++-- .../cache/IgniteCacheOffheapManagerImpl.java | 15 +++ .../CacheRemoveWithTombstonesLoadTest.java | 4 +-- .../distributed/CacheRemoveWithTombstonesTest.java | 18 ++--- ...onedNearDisabledFullApiForceTombstonesTest.java | 30 ++ ...CachePartitionedFullApiForceTombstonesTest.java | 30 ++ .../IgniteCacheFullApiSelfTestSuite.java | 6 + 9 files changed, 95 insertions(+), 26 deletions(-) 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 746c7a2..084a83d 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java @@ -1071,6 +1071,9 @@ public final class IgniteSystemProperties { /** For test purposes only. Force Mvcc mode. */ public static final String IGNITE_FORCE_MVCC_MODE_IN_TESTS = "IGNITE_FORCE_MVCC_MODE_IN_TESTS"; +/** For test purposes only. Forces tombstones creation for all removes. */ +public static final String IGNITE_FORCE_TOMBSTONES_TESTS = "IGNITE_FORCE_TOMBSTONES_IN_TESTS"; + /** * Allows to log additional information about all restored partitions after binary and logical recovery phases. * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java index c2cba6b..8ea23e0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java @@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReadWriteLock; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; +import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.cache.affinity.AffinityFunction; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; @@ -190,6 +191,9 @@ public class CacheGroupContext { /** Cache group metrics. */ private final CacheGroupMetricsImpl metrics; +/** */ +private final boolean forceTombstones = IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_FORCE_TOMBSTONES_TESTS, false); + /** * @param ctx Context. * @param grpId Group ID. @@ -1296,6 +1300,9 @@ public class CacheGroupContext { * @return {@code True} if need create temporary tombstones entries for removed data. */ public boolean supportsTombstone() { +if (forceTombstones) +return true; + return !mvccEnabled && !isLocal(); } @@ -1304,6 +1311,9 @@ public class CacheGroupContext { * @return {@code True} if need create tombstone for remove in given partition. */ public boolean createTombstone(@Nullable GridDhtLocalPartition part) { +if (forceTombstones && part != null) +return true; + return part != null && supportsTombstone() && part.state() == GridDhtPartitionState.MOVING; } 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 e372003..ae63434 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 @@ -1712,9 +1712,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme interceptRes = cctx.config().getInterceptor().onBeforeRemove(entry0); -if (cctx.cancelRemove(interceptRes)) { +if (cctx.cancelRemove(interceptRes)) return new GridCacheUpdateTxResult(false, logPtr); -} } if (cctx.group().createTombstone(localPartition())) { @@ -5856,7 +5855,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme * @param val New value. * @param ver New version. * @param expireTime New expire time. - * @param predicate Optional predicate.
[ignite] branch ignite-11704 updated (1da9dc3 -> 8fd5815)
This is an automated email from the ASF dual-hosted git repository. sboikov pushed a change to branch ignite-11704 in repository https://gitbox.apache.org/repos/asf/ignite.git. from 1da9dc3 ignite-11704 add 82a6e27 Added the crypto notice to apache ignite add c41466f IGNITE-10654 Print warn message in case of index creating with already existing fields. add 0bb7c17 IGNITE-11924: Migrate TransactionMetricsMxBean (#6733) add 736c133 IGNITE-12028 [IEP-35] HitRateMetric should provide rateTimeInterval value to metrics exporter (#6739) add b6dbc9e IGNITE-5227 StackOverflowError in GridCacheMapEntry#checkOwnerChanged() - Fixes #6736. add 4efe78b IGNITE-11922: Migration of ClusterMetricsMXBeanImpl to the new metric framework (#6648) add 32bc31e IGNITE-12037 Ignore tests in MVCC PDS 3 suite canonically - Fixes #6741. add d458f91 IGNITE-12026: DOC: JavaDoc correction for MemoryEventStorageSpi. - Fixes #6740. add 2413c94 IGNITE-12023: Spatial indices for KNN. add 31e6c48 IGNITE-12023: Fix code style. add c48d78f Merge pull request #6732 from gridgain/ignite-12023 add b3e04fd IGNITE-11985 .NET: Fix LINQ nulls handling add 963eb37 IGNITE-12045: JmxExporterSpi -> JmxMetricExporterSpi. (#6754) add 5dcac0b Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite add 85af9c7 Updated an incorrect WARN message add 1f8cf04 IGNITE-12048 Bugs & tests fixes - Fixes #6756. add 2d4fe21 IGNITE-12050 Ignore and scale various MVCC tests - Fixes #6758. add 27e9f70 IGNITE-9562 Destroyed cache that resurrected on an old offline node breaks PME - Fixes #6748. add 0765910 IGNITE-12043: JMX exporter reports incorrect description. (#6762) add 1392332 IGNITE-12052 GridDhtTxPrepareFuture should print transaction in case of assertion error - Fixes #6761. add e7864f1 IGNITE-12036 Changing baseline via set command may cause NPEs if configured NodeFilter takes node attributes into account - Fixes #6743. add 4eda065 IGNITE-6957 Reduce excessive int boxing when accessing cache by ID - Fixes #6536. add a97dbe6 IGNITE-11256 Implement read-only mode for grid - Fixes #6423. add e6615a7 IGNITE-11982 revert part of batch fixes commit, will be merged in another issue. add d54a0ba IGNITE-12060 Fixed incorrect row size calculation, lead to tree corruption. add 498712b IGNITE-5714 Implementation of suspend/resume for pessimistic transactions - Fixes #6483. add e9b3c4c IGNITE-12047 Fixed senderNodeId is absent in StatusCheckMessage - Fixes #6753. add f3084d3 IGNITE-12051 Update javadoc for the IgniteKernal class - Fixes #6760. add d9fde7e IGNITE-12046 Redundant LongMetric interface methods are removed add 7d1b87a IGNITE-10619: Transfer of files between nodes via CommumicationSpi. add 5a250d2 IGNITE-10619: fix javadoc link on private class (#6776) add 089d3c2 IGNITE-11848 Monitoring & Profiling: remove IMetricExporterSpi from .NET add d13e442 IGNITE-12059 DiskPageCompressionConfigValidationTest.testIncorrectStaticCacheConfiguration fails - Fixes #6765. add 4131935 IGNITE-12068 Fix wrong single row result when a part of complex PK is looked up - Fixes #6778. add e95c7b1 IGNITE-12057 Fixed persistence files are stored to temp dir add fb2e1e2 IGNITE-10697: [ML] Add Frequency Encoding (#6784) add 2ec1bb8 IGNITE-12073 Improve javadoc for the IGNITE_UPDATE_NOTIFIER system property add dd3e219 Ignite 2.7.6-rc0: Release notes - Fixes #6788. add dde8174 IGNITE-12061 Fix inline size change. This closes #6770. add ad89c8e IGNITE-12082 Update versions for pre-build DEB/RPM packages add 02a9e82 Fix of release notes for Ignite 2.7.6. add 284e5e8 IGNITE-12082 Update versions for pre-build DEB/RPM packages, fixed date for RPM add 7484b3f IGNITE-12082 Update versions for pre-build DEB/RPM packages, fixed date and version with -1 suffix for RPM add 27a837b IGNITE-12082 Update versions for pre-build DEB/RPM packages, fixed date and version with -1 suffix for RPM and for DEB add 82afed5 IGNITE-12095 .NET: Disable API parity tests add 7e73098 IGNITE-10808 Fixed Discovery message queue may build up with TcpDiscoveryMetricsUpdateMessage - Fixes #5771 new 323ef8e Merge remote-tracking branch 'remotes/origin/master' into ignite-11704 new 8fd5815 Added tests The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: RELEASE_NOTES.txt | 13 + .../examples/ml/knn/ANNClassificationExample.java |3 +- .../examples/ml/knn/IrisClassificationExample.java | 17 +- .../examples/ml/knn/KNNClassificationExample.java | 13 +-
[ignite-teamcity-bot] branch master updated: Bot switched to Ignite 2.7.6-RC1
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git The following commit(s) were added to refs/heads/master by this push: new dddfbb1 Bot switched to Ignite 2.7.6-RC1 dddfbb1 is described below commit dddfbb12f6c81ae11c9f11d1d7aa7e819b2a0c6a Author: Dmitriy Pavlov AuthorDate: Mon Aug 26 20:02:14 2019 +0300 Bot switched to Ignite 2.7.6-RC1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c47e10c..7c1c4b7 100644 --- a/build.gradle +++ b/build.gradle @@ -67,7 +67,7 @@ allprojects { repositories { //uncomment for RC testing maven { -url "https://repository.apache.org/content/repositories/orgapacheignite-1464/"; +url "https://repository.apache.org/content/repositories/orgapacheignite-1466/"; } mavenCentral()