Merge master into ignite-3477-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/db10c451 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/db10c451 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/db10c451 Branch: refs/heads/ignite-3477-master Commit: db10c451e105dac961cea8a7290feddfc5c100d4 Parents: d0665c1 b43dd2b Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Fri Mar 31 19:22:22 2017 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Fri Mar 31 19:22:22 2017 +0300 ---------------------------------------------------------------------- .../spi/checkpoint/s3/S3CheckpointSpi.java | 72 +- .../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java | 27 +- .../cloud/TcpDiscoveryCloudIpFinder.java | 51 +- .../ignite/binary/BinaryBasicIdMapper.java | 5 +- .../ignite/binary/BinaryBasicNameMapper.java | 5 +- .../ignite/binary/BinaryTypeConfiguration.java | 30 +- .../ignite/cache/CacheKeyConfiguration.java | 10 +- .../org/apache/ignite/cache/QueryEntity.java | 35 +- .../affinity/fair/FairAffinityFunction.java | 21 +- .../rendezvous/RendezvousAffinityFunction.java | 27 +- .../cache/eviction/AbstractEvictionPolicy.java | 15 +- .../cache/eviction/fifo/FifoEvictionPolicy.java | 74 +- .../eviction/fifo/FifoEvictionPolicyMBean.java | 2 + .../igfs/IgfsPerBlockLruEvictionPolicy.java | 131 +++- .../cache/eviction/lru/LruEvictionPolicy.java | 74 +- .../eviction/sorted/SortedEvictionPolicy.java | 74 +- .../configuration/AtomicConfiguration.java | 15 +- .../configuration/BinaryConfiguration.java | 30 +- .../configuration/CacheConfiguration.java | 71 +- .../configuration/CollectionConfiguration.java | 35 +- .../configuration/ConnectorConfiguration.java | 100 ++- .../configuration/FileSystemConfiguration.java | 151 +++- .../configuration/HadoopConfiguration.java | 31 +- .../configuration/NearCacheConfiguration.java | 50 ++ .../configuration/TransactionConfiguration.java | 45 +- .../igfs/IgfsGroupDataBlocksKeyMapper.java | 5 +- .../igfs/IgfsIpcEndpointConfiguration.java | 30 +- .../ignite/internal/MarshallerPlatformIds.java | 3 + .../ignite/internal/binary/BinaryUtils.java | 4 + .../client/GridClientConfiguration.java | 100 ++- .../client/GridClientDataConfiguration.java | 15 +- .../client/GridClientPartitionAffinity.java | 15 +- .../balancer/GridClientBalancerAdapter.java | 5 +- .../router/GridTcpRouterConfiguration.java | 50 +- .../internal/jdbc2/JdbcSqlFieldsQuery.java | 57 ++ .../processors/cache/GridCacheProcessor.java | 39 +- .../platform/PlatformContextImpl.java | 10 +- .../binary/PlatformBinaryProcessor.java | 40 +- .../dotnet/PlatformDotNetConfigurationEx.java | 21 +- .../utils/PlatformConfigurationUtils.java | 3 +- .../optimized/OptimizedMarshaller.java | 15 +- .../apache/ignite/mxbean/IgniteMBeanAware.java | 28 + .../dotnet/PlatformDotNetAffinityFunction.java | 10 +- .../PlatformDotNetBinaryConfiguration.java | 31 +- .../PlatformDotNetBinaryTypeConfiguration.java | 35 +- .../dotnet/PlatformDotNetConfiguration.java | 10 +- .../ignite/services/ServiceConfiguration.java | 35 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 50 +- .../ignite/spi/IgniteSpiMBeanAdapter.java | 78 ++ .../checkpoint/cache/CacheCheckpointSpi.java | 40 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 219 +++++- .../spi/checkpoint/noop/NoopCheckpointSpi.java | 7 + .../sharedfs/SharedFsCheckpointSpi.java | 54 +- .../fifoqueue/FifoQueueCollisionSpi.java | 134 +++- .../fifoqueue/FifoQueueCollisionSpiMBean.java | 2 +- .../jobstealing/JobStealingCollisionSpi.java | 281 ++++++- .../JobStealingCollisionSpiMBean.java | 6 +- .../spi/collision/noop/NoopCollisionSpi.java | 7 + .../PriorityQueueCollisionSpi.java | 278 +++++-- .../PriorityQueueCollisionSpiMBean.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 536 +++++++++++-- .../deployment/local/LocalDeploymentSpi.java | 24 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 438 +++++++++-- .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 5 +- .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 17 +- .../TcpDiscoveryMulticastIpFinder.java | 47 +- .../sharedfs/TcpDiscoverySharedFsIpFinder.java | 12 +- .../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java | 14 +- .../memory/MemoryEventStorageSpi.java | 98 ++- .../spi/failover/always/AlwaysFailoverSpi.java | 53 +- .../jobstealing/JobStealingFailoverSpi.java | 68 +- .../spi/failover/never/NeverFailoverSpi.java | 30 +- .../spi/indexing/noop/NoopIndexingSpi.java | 7 + .../adaptive/AdaptiveLoadBalancingSpi.java | 43 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 44 +- .../WeightedRandomLoadBalancingSpi.java | 61 +- .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 33 +- .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 10 +- .../IgniteHadoopWeightedMapReducePlanner.java | 26 +- .../ignite/impl/binary/binary_type_impl.h | 2 +- .../common/include/ignite/common/concurrent.h | 30 + .../cpp/common/include/ignite/reference.h | 14 +- .../cpp/core-test/config/cache-test.xml | 2 +- .../project/vs/core-test.vcxproj.filters | 3 + .../cpp/core-test/src/cache_invoke_test.cpp | 6 +- .../platforms/cpp/core-test/src/cache_test.cpp | 23 +- .../cpp/core-test/src/continuous_query_test.cpp | 204 ++++- .../cpp/core-test/src/reference_test.cpp | 12 +- modules/platforms/cpp/core/Makefile.am | 1 + modules/platforms/cpp/core/include/Makefile.am | 70 +- .../cpp/core/include/ignite/cache/cache.h | 22 +- .../ignite/cache/cache_entry_processor.h | 42 +- .../cache/event/cache_entry_event_filter.h | 109 +++ .../cache/query/continuous/continuous_query.h | 35 +- .../cpp/core/include/ignite/ignite_binding.h | 39 +- .../include/ignite/ignite_binding_context.h | 2 +- .../cpp/core/include/ignite/impl/bindings.h | 95 +++ .../impl/cache/cache_entry_processor_holder.h | 15 - .../core/include/ignite/impl/cache/cache_impl.h | 81 +- .../cache/event/cache_entry_event_filter_base.h | 66 ++ .../event/cache_entry_event_filter_holder.h | 185 +++++ .../continuous/continuous_query_handle_impl.h | 10 - .../query/continuous/continuous_query_impl.h | 60 +- .../include/ignite/impl/ignite_binding_impl.h | 101 +-- .../include/ignite/impl/ignite_environment.h | 37 +- .../cpp/core/include/ignite/impl/ignite_impl.h | 10 +- .../cpp/core/include/ignite/impl/operations.h | 2 +- .../platforms/cpp/core/project/vs/core.vcxproj | 5 + .../cpp/core/project/vs/core.vcxproj.filters | 18 + .../cpp/core/src/impl/cache/cache_impl.cpp | 90 ++- .../continuous/continuous_query_handle_impl.cpp | 5 - .../cpp/core/src/impl/ignite_binding_impl.cpp | 88 +++ .../cpp/core/src/impl/ignite_environment.cpp | 124 ++- .../platforms/cpp/core/src/impl/ignite_impl.cpp | 2 +- .../Apache.Ignite.Core.Tests.csproj | 11 +- .../Binary/BinaryBuilderSelfTest.cs | 112 +-- .../BinaryBuilderSelfTestDynamicRegistration.cs | 40 + .../Binary/BinaryCompactFooterInteropTest.cs | 2 +- .../Binary/BinaryDynamicRegistrationTest.cs | 441 +++++++++++ .../Binary/BinarySelfTest.cs | 197 +++-- .../Binary/BinarySelfTestFullFooter.cs | 5 +- .../Binary/JavaBinaryInteropTest.cs | 182 +++++ .../Serializable/AdvancedSerializationTest.cs | 228 ++++++ .../BasicSerializableObjectsTest.cs | 124 +++ .../Binary/Serializable/CallbacksTest.cs | 369 +++++++++ .../Binary/Serializable/DelegatesTest.cs | 161 ++++ .../Binary/Serializable/ObjectReferenceTests.cs | 131 ++++ .../Binary/Serializable/PrimitivesTest.cs | 754 +++++++++++++++++++ .../Binary/Serializable/SqlDmlTest.cs | 277 +++++++ .../Cache/Affinity/AffinityFunctionTest.cs | 21 - .../Cache/CacheAbstractTest.cs | 56 +- .../Cache/Query/CacheLinqTest.cs | 2 +- .../Cache/Query/CacheQueriesTest.cs | 15 +- .../Continuous/ContinuousQueryAbstractTest.cs | 29 +- .../Cache/Store/CacheStoreTest.cs | 5 +- .../Compute/ComputeApiTest.cs | 28 +- .../Compute/IgniteExceptionTaskSelfTest.cs | 40 +- .../Compute/ResourceTaskTest.cs | 13 +- .../Apache.Ignite.Core.Tests/DeploymentTest.cs | 15 +- .../Examples/ExamplesTest.cs | 2 +- .../Apache.Ignite.Core.Tests/ExecutableTest.cs | 28 +- .../SerializationTest.cs | 240 ------ .../Services/ServiceProxyTest.cs | 40 +- .../Apache.Ignite.Core.Tests/TestUtils.cs | 11 + .../Apache.Ignite.Core.csproj | 7 +- .../Cache/Configuration/CacheConfiguration.cs | 8 +- .../Cache/Query/Continuous/ContinuousQuery.cs | 59 +- .../Apache.Ignite.Core/Cache/Query/QueryBase.cs | 4 +- .../Cache/Query/SqlFieldsQuery.cs | 6 +- .../Apache.Ignite.Core/IgniteConfiguration.cs | 25 +- .../dotnet/Apache.Ignite.Core/Ignition.cs | 4 +- .../Impl/Binary/BinarizableSerializer.cs | 5 +- .../Impl/Binary/BinaryFullTypeDescriptor.cs | 49 +- .../Impl/Binary/BinaryObjectBuilder.cs | 27 +- .../Impl/Binary/BinaryObjectHeader.cs | 13 +- .../Impl/Binary/BinaryObjectSchemaSerializer.cs | 2 + .../Impl/Binary/BinaryProcessor.cs | 38 +- .../Impl/Binary/BinaryReader.cs | 39 +- .../Impl/Binary/BinaryReflectiveActions.cs | 2 +- .../BinaryReflectiveSerializerInternal.cs | 84 ++- .../Binary/BinarySurrogateTypeDescriptor.cs | 13 +- .../Impl/Binary/BinarySystemHandlers.cs | 96 +-- .../Impl/Binary/BinarySystemTypeSerializer.cs | 2 +- .../Impl/Binary/BinaryUtils.cs | 54 +- .../Impl/Binary/BinaryWriter.cs | 242 +++--- .../Impl/Binary/DateTimeHolder.cs | 101 --- .../Impl/Binary/DateTimeSerializer.cs | 48 -- .../Binary/DeserializationCallbackProcessor.cs | 102 +++ .../Impl/Binary/IBinarySerializerInternal.cs | 4 +- .../Impl/Binary/IBinaryTypeDescriptor.cs | 8 + .../Impl/Binary/Io/BinaryStreamAdapter.cs | 119 --- .../Impl/Binary/Marshaller.cs | 248 ++++-- .../Impl/Binary/ReflectionUtils.cs | 50 ++ .../Impl/Binary/SerializableObjectHolder.cs | 96 --- .../Impl/Binary/SerializableSerializer.cs | 656 +++++++++++++++- .../Impl/Binary/TypeResolver.cs | 7 + .../Impl/Binary/UserSerializerProxy.cs | 5 +- .../Affinity/AffinityFunctionSerializer.cs | 3 - .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 3 +- .../Common/CopyOnWriteConcurrentDictionary.cs | 35 + .../Impl/Common/DelegateConverter.cs | 90 ++- .../Impl/Common/DelegateTypeDescriptor.cs | 3 +- .../Impl/Common/SerializableTypeDescriptor.cs | 222 ++++++ .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 13 +- .../Impl/Services/ServiceProxySerializer.cs | 4 +- .../Impl/Unmanaged/UnmanagedCallbacks.cs | 8 +- .../NuGet/LINQPad/ComputeExample.linq | 1 - .../NuGet/LINQPad/PutGetExample.linq | 5 +- .../NuGet/LINQPad/QueryExample.linq | 5 +- .../NuGet/LINQPad/QueryExample.linq | 5 +- .../dotnet/Apache.Ignite.Linq/QueryOptions.cs | 2 +- .../examples/Apache.Ignite.Examples/App.config | 16 +- .../Apache.Ignite.ExamplesDll/Binary/Address.cs | 2 - .../Compute/CharacterCountClosure.cs | 1 - .../Datagrid/ContinuousQueryFilter.cs | 2 - .../Datagrid/EmployeeStorePredicate.cs | 2 - .../Messaging/RemoteOrderedListener.cs | 1 - .../Messaging/RemoteUnorderedListener.cs | 1 - .../Services/MapService.cs | 1 - .../spi/deployment/uri/UriDeploymentSpi.java | 80 +- .../commands/cache/VisorCacheCommand.scala | 2 +- .../helpers/jade/form/form-field-checkbox.pug | 14 +- .../helpers/jade/form/form-field-datalist.pug | 2 +- .../helpers/jade/form/form-field-dropdown.pug | 3 +- .../app/helpers/jade/form/form-field-number.pug | 3 +- .../helpers/jade/form/form-field-password.pug | 2 +- .../app/helpers/jade/form/form-field-text.pug | 3 +- .../frontend/app/helpers/jade/mixins.pug | 1 + .../frontend/app/primitives/tooltip/index.pug | 25 + .../views/configuration/domains-import.tpl.pug | 6 + .../zk/TcpDiscoveryZookeeperIpFinder.java | 37 +- 212 files changed, 10186 insertions(+), 2301 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java index 4aa60a1,7b79c58..db1eadf --- a/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java @@@ -106,8 -120,12 +116,10 @@@ public class CollectionConfiguration im /** * @param memoryMode Memory mode. + * @return {@code this} for chaining. */ - public void setMemoryMode(CacheMemoryMode memoryMode) { + public CollectionConfiguration setMemoryMode(CacheMemoryMode memoryMode) { - this.memoryMode = memoryMode; - + return this; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index d4f6d87,966fa8e..3ddd7ac mode 100644,100755..100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index e08e29a,19244dd..25804c7 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@@ -405,16 -402,14 +406,20 @@@ public class TcpDiscoverySpi extends Ig private boolean clientReconnectDisabled; /** */ + private Serializable consistentId; + + /** Local node addresses. */ + private IgniteBiTuple<Collection<String>, Collection<String>> addrs; + + /** */ protected IgniteSpiContext spiCtx; - /** {@inheritDoc} */ - @Override public String getSpiState() { + /** + * Gets current SPI state. + * + * @return Current SPI state. + */ + public String getSpiState() { return impl.getSpiState(); } @@@ -973,47 -1014,15 +1024,56 @@@ locNodeVer = ver; } + /** + * Gets ID of the local node. + * + * @return ID of the local node. + */ + public UUID getLocalNodeId() { + return ignite.cluster().localNode().id(); + } + + /** {@inheritDoc} */ + @Nullable @Override public Serializable consistentId() throws IgniteSpiException { + if (consistentId == null) { + initializeImpl(); + + initAddresses(); + + Serializable cfgId = ignite.configuration().getConsistentId(); + + if (cfgId == null) { + List<String> sortedAddrs = new ArrayList<>(addrs.get1()); + + Collections.sort(sortedAddrs); + + if (getBoolean(IGNITE_CONSISTENT_ID_BY_HOST_WITHOUT_PORT)) + consistentId = U.consistentId(sortedAddrs); + else + consistentId = U.consistentId(sortedAddrs, impl.boundPort()); + } + else + consistentId = cfgId; + } + + return consistentId; + } + + /** + * + */ + private void initAddresses() { + if (addrs == null) { + try { + addrs = U.resolveLocalAddresses(locHost); + } + catch (IOException | IgniteCheckedException e) { + throw new IgniteSpiException("Failed to resolve local host to set of external addresses: " + locHost, + e); + } + } + } + /** * @param srvPort Server port. * @param addExtAddrAttr If {@code true} adds {@link #ATTR_EXT_ADDRS} attribute. @@@ -1771,19 -1853,6 +1902,20 @@@ /** {@inheritDoc} */ @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException { + initializeImpl(); + - registerMBean(igniteInstanceName, this, TcpDiscoverySpiMBean.class); ++ registerMBean(igniteInstanceName, new TcpDiscoverySpiMBeanImpl(this), TcpDiscoverySpiMBean.class); + + impl.spiStart(igniteInstanceName); + } + + /** + * + */ + private void initializeImpl() { + if (impl != null) + return; ++ initFailureDetectionTimeout(); if (!forceSrvMode && (Boolean.TRUE.equals(ignite.configuration().isClientMode()))) { http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/platforms/cpp/core-test/config/cache-test.xml ---------------------------------------------------------------------- diff --cc modules/platforms/cpp/core-test/config/cache-test.xml index 43ed8d2,10300ba..7fe7ac6 --- a/modules/platforms/cpp/core-test/config/cache-test.xml +++ b/modules/platforms/cpp/core-test/config/cache-test.xml @@@ -28,7 -28,109 +28,7 @@@ http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="localHost" value="127.0.0.1"/> - <property name="connectorConfiguration"><null/></property> + <import resource="cache-test-default.xml"/> - <bean parent="grid.cfg"/> - <property name="includeEventTypes"> - <util:constant static-field="org.apache.ignite.events.EventType.EVTS_CACHE"/> - </property> - - <property name="cacheConfiguration"> - <list> - <bean parent="cache-template"> - <property name="name" value="local"/> - <property name="cacheMode" value="LOCAL"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - </bean> - - <bean parent="cache-template"> - <property name="name" value="local_atomic"/> - <property name="cacheMode" value="LOCAL"/> - <property name="atomicityMode" value="ATOMIC"/> - </bean> - - <bean parent="cache-template"> - <property name="name" value="partitioned"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - </bean> - - <bean parent="cache-template"> - <property name="name" value="partitioned2"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - </bean> - - <bean parent="cache-template"> - <property name="name" value="partitioned_atomic"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="ATOMIC"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> - </bean> - - <bean parent="cache-template"> - <property name="name" value="partitioned_near"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="nearConfiguration"> - <bean class="org.apache.ignite.configuration.NearCacheConfiguration" /> - </property> - </bean> - - <bean parent="cache-template"> - <property name="name" value="partitioned_atomic_near"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="ATOMIC"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> - <property name="nearConfiguration"> - <bean class="org.apache.ignite.configuration.NearCacheConfiguration" /> - </property> - </bean> - - <bean parent="cache-template"> - <property name="name" value="replicated"/> - <property name="cacheMode" value="REPLICATED"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - </bean> - - <bean parent="cache-template"> - <property name="name" value="replicated_atomic"/> - <property name="cacheMode" value="REPLICATED"/> - <property name="atomicityMode" value="ATOMIC"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> - </bean> - </list> - </property> - - <property name="discoverySpi"> - <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> - <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> - <property name="addresses"> - <list> - <!-- In distributed environment, replace with actual host IP address. --> - <value>127.0.0.1:47500..47501</value> - </list> - </property> - </bean> - </property> - <property name="socketTimeout" value="300" /> - </bean> - </property> - - <property name="transactionConfiguration"> - <bean class="org.apache.ignite.configuration.TransactionConfiguration"> - <property name="txSerializableEnabled" value="true"/> - </bean> - </property> - </bean> - - <bean id="cache-template" abstract="true" class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="rebalanceMode" value="SYNC"/> - <property name="writeSynchronizationMode" value="FULL_SYNC"/> - <property name="swapEnabled" value="true"/> - <property name="backups" value="1"/> - <property name="eagerTtl" value="true"/> - </bean> ++ <bean parent="grid.cfg"/> </beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/platforms/cpp/core-test/src/cache_test.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/platforms/cpp/core-test/src/continuous_query_test.cpp ---------------------------------------------------------------------- diff --cc modules/platforms/cpp/core-test/src/continuous_query_test.cpp index d730ae9,f81eb5d..c52baaf --- a/modules/platforms/cpp/core-test/src/continuous_query_test.cpp +++ b/modules/platforms/cpp/core-test/src/continuous_query_test.cpp @@@ -245,12 -343,8 +343,12 @@@ struct ContinuousQueryTestSuiteFixtur * Constructor. */ ContinuousQueryTestSuiteFixture() : +#ifdef IGNITE_TESTS_32 - grid(ignite_test::StartNode("cache-query-continuous-32.xml", "node-01")), ++ node(ignite_test::StartNode("cache-query-continuous-32.xml", "node-01")), +#else - grid(ignite_test::StartNode("cache-query-continuous.xml", "node-01")), + node(ignite_test::StartNode("cache-query-continuous.xml", "node-01")), +#endif - cache(grid.GetCache<int, TestEntry>("transactional_no_backup")) + cache(node.GetCache<int, TestEntry>("transactional_no_backup")) { // No-op. } http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreTest.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db10c451/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala ----------------------------------------------------------------------