ignite-4535 : Merge with 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/096d2c06 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/096d2c06 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/096d2c06 Branch: refs/heads/ignite-3477-master Commit: 096d2c063ec6aab35537d835451e9f3fcdcbc2aa Parents: bc571fc a7afb7f Author: Ilya Lantukh <[email protected]> Authored: Mon Apr 10 14:34:35 2017 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Mon Apr 10 14:34:35 2017 +0300 ---------------------------------------------------------------------- assembly/release-fabric-base.xml | 6 + .../benchmarks/jmh/tree/BPlusTreeBenchmark.java | 2 + .../internal/jdbc2/JdbcConnectionSelfTest.java | 34 + .../src/test/resources/spring-server-node.xml | 71 +- .../test/resources/spring-server-ssl-node.xml | 69 +- .../src/main/java/org/apache/ignite/Ignite.java | 8 + .../java/org/apache/ignite/IgniteBinary.java | 35 +- .../org/apache/ignite/IgniteJdbcDriver.java | 11 +- .../java/org/apache/ignite/MemoryMetrics.java | 95 ++ .../binary/BinaryAbstractIdentityResolver.java | 53 - .../binary/BinaryArrayIdentityResolver.java | 224 ----- .../binary/BinaryFieldIdentityResolver.java | 307 ------ .../ignite/binary/BinaryIdentityResolver.java | 42 - .../ignite/binary/BinaryTypeConfiguration.java | 25 - .../org/apache/ignite/cache/CacheMetrics.java | 70 -- .../ignite/cache/CacheTypeFieldMetadata.java | 149 --- .../apache/ignite/cache/CacheTypeMetadata.java | 379 ------- .../org/apache/ignite/cache/QueryEntity.java | 3 + .../store/jdbc/CacheAbstractJdbcStore.java | 55 -- .../configuration/CacheConfiguration.java | 35 +- .../configuration/IgniteConfiguration.java | 30 + .../configuration/MemoryConfiguration.java | 22 +- .../MemoryPolicyConfiguration.java | 12 +- .../ignite/internal/GridKernalContext.java | 7 + .../ignite/internal/GridKernalContextImpl.java | 11 + .../apache/ignite/internal/IgniteKernal.java | 12 +- .../org/apache/ignite/internal/IgnitionEx.java | 18 +- .../ignite/internal/MarshallerContextImpl.java | 20 +- .../binary/BinaryAbstractIdentityResolver.java | 56 ++ .../binary/BinaryArrayIdentityResolver.java | 222 +++++ .../ignite/internal/binary/BinaryContext.java | 4 +- .../internal/binary/BinaryIdentityResolver.java | 43 + .../internal/binary/BinaryObjectExImpl.java | 1 - .../internal/binary/BinaryWriterExImpl.java | 1 - .../ignite/internal/jdbc2/JdbcConnection.java | 50 +- .../managers/communication/GridIoManager.java | 2 + .../managers/communication/GridIoPolicy.java | 5 +- .../apache/ignite/internal/pagemem/Page.java | 84 -- .../ignite/internal/pagemem/PageMemory.java | 20 +- .../ignite/internal/pagemem/PageSupport.java | 104 ++ .../pagemem/impl/PageMemoryNoStoreImpl.java | 174 ++-- .../internal/pagemem/impl/PageNoStoreImpl.java | 141 --- .../cache/CacheClusterMetricsMXBeanImpl.java | 50 - .../cache/CacheLocalMetricsMXBeanImpl.java | 50 - .../processors/cache/CacheMetricsImpl.java | 125 +-- .../processors/cache/CacheMetricsSnapshot.java | 120 --- .../cache/CacheOffheapEvictionManager.java | 3 +- .../processors/cache/GridCacheProcessor.java | 28 + .../cache/IgniteCacheOffheapManagerImpl.java | 24 +- .../cache/database/CacheDataRowAdapter.java | 26 +- .../cache/database/DataStructure.java | 243 ++++- .../IgniteCacheDatabaseSharedManager.java | 104 +- .../cache/database/IgniteMemoryPoolMetrics.java | 33 - .../cache/database/MemoryMetricsImpl.java | 314 ++++++ .../processors/cache/database/MemoryPolicy.java | 18 +- .../processors/cache/database/RowStore.java | 10 - .../cache/database/freelist/FreeListImpl.java | 180 ++-- .../cache/database/freelist/PagesList.java | 637 ++++++------ .../cache/database/tree/BPlusTree.java | 979 +++++++++++-------- .../cache/database/tree/io/PageIO.java | 3 +- .../database/tree/reuse/ReuseListImpl.java | 2 +- .../cache/database/tree/util/PageHandler.java | 381 ++++++-- .../database/tree/util/PageLockListener.java | 42 +- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../dht/preloader/GridDhtPartitionMap.java | 13 +- .../cache/version/GridCacheVersionManager.java | 3 + .../clock/GridClockDeltaSnapshot.java | 2 +- .../continuous/GridContinuousProcessor.java | 3 +- .../platform/cache/PlatformCache.java | 10 - .../utils/PlatformConfigurationUtils.java | 64 +- .../internal/processors/pool/PoolProcessor.java | 10 +- .../processors/query/GridQueryProcessor.java | 10 - .../internal/processors/query/QueryUtils.java | 328 +------ .../processors/service/GridServiceProxy.java | 10 + .../task/GridTaskThreadContextKey.java | 7 +- .../processors/task/GridTaskWorker.java | 16 +- .../apache/ignite/internal/util/IgniteTree.java | 14 + .../visor/cache/VisorCacheConfiguration.java | 2 +- .../cache/VisorCacheTypeFieldMetadata.java | 14 +- .../visor/cache/VisorCacheTypeMetadata.java | 91 +- .../visor/node/VisorMemoryConfiguration.java | 1 - .../ignite/mxbean/CacheMetricsMXBean.java | 40 - .../ignite/mxbean/MemoryMetricsMXBean.java | 89 ++ .../ignite/spi/collision/CollisionSpi.java | 11 +- .../communication/tcp/TcpCommunicationSpi.java | 4 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 3 +- .../resources/META-INF/classnames.properties | 1 - .../test/config/store/jdbc/ignite-jdbc-type.xml | 279 ++++++ .../config/store/jdbc/ignite-type-metadata.xml | 276 ------ .../config/websession/example-cache-client.xml | 4 + ...eJdbcStoreAbstractMultithreadedSelfTest.java | 71 +- .../ignite/custom/DummyEventFilterFactory.java | 47 + .../BinaryArrayIdentityResolverSelfTest.java | 4 - .../BinaryFieldIdentityResolverSelfTest.java | 333 ------- ...ryIdentityResolverConfigurationSelfTest.java | 138 --- .../BinaryObjectBuilderAdditionalSelfTest.java | 1 - ...naryObjectBuilderDefaultMappersSelfTest.java | 1 - .../pagemem/impl/PageMemoryNoLoadSelfTest.java | 119 ++- .../cache/CacheClientStoreSelfTest.java | 4 + .../cache/CacheConfigurationLeakTest.java | 3 +- .../cache/CacheStopAndDestroySelfTest.java | 48 +- .../cache/ClusterStateAbstractTest.java | 5 +- .../GridCacheConditionalDeploymentSelfTest.java | 19 +- .../processors/cache/H2CacheStoreStrategy.java | 2 +- .../GridCacheBinaryObjectsAbstractSelfTest.java | 58 +- ...heExpiredEntriesPreloadAbstractSelfTest.java | 122 --- ...acheAtomicExpiredEntriesPreloadSelfTest.java | 46 - ...idCacheDhtExpiredEntriesPreloadSelfTest.java | 39 - ...dCacheNearExpiredEntriesPreloadSelfTest.java | 33 - ...eCacheExpiryPolicyWithStoreAbstractTest.java | 3 - .../ContinuousQueryPeerClassLoadingTest.java | 142 +++ .../IgniteCacheContinuousQueryClientTest.java | 23 +- .../database/BPlusTreeReuseSelfTest.java | 29 +- .../processors/database/BPlusTreeSelfTest.java | 123 ++- .../database/FreeListImplSelfTest.java | 5 +- .../database/MemoryMetricsSelfTest.java | 313 ++++++ .../database/MetadataStorageSelfTest.java | 3 +- .../processors/igfs/IgfsIgniteMock.java | 8 + .../marshaller/MarshallerContextSelfTest.java | 80 +- .../platform/PlatformCacheWriteMetricsTask.java | 126 +-- .../ignite/platform/PlatformStopIgniteTask.java | 11 +- .../services/ServiceThreadPoolSelfTest.java | 133 +++ .../junits/GridTestKernalContext.java | 1 + .../ignite/testframework/junits/IgniteMock.java | 6 + .../junits/multijvm/IgniteProcessProxy.java | 6 + .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../IgniteBinaryObjectsTestSuite.java | 4 - ...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 2 + .../testsuites/IgniteCacheTestSuite2.java | 9 +- .../testsuites/IgniteKernalSelfTestSuite.java | 2 + .../hadoop/impl/v2/HadoopV2Context.java | 6 +- .../HibernateAccessStrategyAdapter.java | 8 +- .../cache/hibernate/HibernateCacheProxy.java | 811 +++++++++++++++ .../hibernate/HibernateCollectionRegion.java | 3 +- .../cache/hibernate/HibernateEntityRegion.java | 3 +- .../hibernate/HibernateGeneralDataRegion.java | 3 +- .../hibernate/HibernateKeyTransformer.java | 28 + .../cache/hibernate/HibernateKeyWrapper.java | 62 ++ .../hibernate/HibernateNaturalIdRegion.java | 3 +- .../HibernateNonStrictAccessStrategy.java | 5 +- .../hibernate/HibernateQueryResultsRegion.java | 3 +- .../HibernateReadOnlyAccessStrategy.java | 3 +- .../HibernateReadWriteAccessStrategy.java | 3 +- .../ignite/cache/hibernate/HibernateRegion.java | 6 +- .../cache/hibernate/HibernateRegionFactory.java | 29 +- .../hibernate/HibernateTimestampsRegion.java | 3 +- .../HibernateTransactionalAccessStrategy.java | 2 +- .../HibernateTransactionalDataRegion.java | 3 +- .../IgniteBinaryHibernateTestSuite.java | 37 + .../processors/query/h2/database/H2Tree.java | 14 +- .../query/h2/database/H2TreeIndex.java | 16 +- .../query/h2/opt/GridH2TreeIndex.java | 29 +- .../query/h2/sql/GridSqlOperationType.java | 23 +- .../query/h2/sql/GridSqlQueryParser.java | 19 +- .../cache/BinarySerializationQuerySelfTest.java | 30 +- ...ryDuplicateIndexObjectsAbstractSelfTest.java | 159 +++ ...niteCacheAbstractInsertSqlQuerySelfTest.java | 129 --- .../IgniteCacheInsertSqlQuerySelfTest.java | 40 - .../cache/IgniteCacheMergeSqlQuerySelfTest.java | 38 - .../IgniteCacheObjectKeyIndexingSelfTest.java | 124 +++ .../cache/IncorrectCacheTypeMetadataTest.java | 76 -- .../cache/IncorrectQueryEntityTest.java | 3 + ...ateIndexObjectPartitionedAtomicSelfTest.java | 38 + ...xObjectPartitionedTransactionalSelfTest.java | 41 + .../query/IgniteSqlSplitterSelfTest.java | 43 + .../query/h2/IgniteSqlQueryMinMaxTest.java | 376 +++++++ .../h2/database/InlineIndexHelperTest.java | 48 +- .../query/h2/opt/GridH2TableSelfTest.java | 50 + .../query/h2/sql/GridQueryParsingTest.java | 27 +- .../IgniteBinaryCacheQueryTestSuite.java | 5 + .../IgniteCacheQuerySelfTestSuite.java | 4 +- .../IgniteCacheQuerySelfTestSuite2.java | 2 + .../IgniteCacheQuerySelfTestSuite3.java | 2 + modules/platforms/cpp/binary/Makefile.am | 1 - .../platforms/cpp/binary/include/Makefile.am | 3 - .../binary/binary_array_identity_resolver.h | 64 -- .../include/ignite/binary/binary_containers.h | 2 +- .../ignite/binary/binary_identity_resolver.h | 61 -- .../include/ignite/binary/binary_object.h | 12 +- .../include/ignite/binary/binary_raw_writer.h | 4 +- .../binary/include/ignite/binary/binary_type.h | 10 - .../include/ignite/binary/binary_writer.h | 4 +- .../ignite/impl/binary/binary_reader_impl.h | 6 +- .../ignite/impl/binary/binary_type_impl.h | 149 --- .../include/ignite/impl/binary/binary_utils.h | 13 +- .../ignite/impl/binary/binary_writer_impl.h | 9 +- .../cpp/binary/project/vs/binary.vcxproj | 4 - .../binary/project/vs/binary.vcxproj.filters | 12 - .../binary/binary_array_identity_resolver.cpp | 42 - .../core-test/config/cache-query-default.xml | 70 +- .../cpp/core-test/config/cache-test.xml | 2 +- .../core-test/include/ignite/binary_test_defs.h | 25 - .../cpp/core-test/include/ignite/complex_type.h | 2 - .../cpp/core-test/include/ignite/test_type.h | 1 - .../cpp/core-test/include/ignite/test_utils.h | 11 + .../src/binary_identity_resolver_test.cpp | 254 ----- .../src/binary_reader_writer_raw_test.cpp | 12 +- .../core-test/src/binary_reader_writer_test.cpp | 12 +- .../cpp/core-test/src/cache_invoke_test.cpp | 3 - .../cpp/core-test/src/cache_query_test.cpp | 227 +++-- .../platforms/cpp/core-test/src/cache_test.cpp | 207 +++- .../cpp/core-test/src/cluster_test.cpp | 4 +- .../cpp/core-test/src/continuous_query_test.cpp | 6 - .../cpp/core-test/src/ignition_test.cpp | 12 +- .../cpp/core/include/ignite/cache/cache.h | 161 +++ .../cpp/core/include/ignite/cache/cache_entry.h | 15 + .../include/ignite/cache/query/query_cursor.h | 28 +- .../platforms/cpp/core/include/ignite/ignite.h | 18 +- .../cpp/core/include/ignite/ignition.h | 14 +- .../ignite/impl/cache/query/query_impl.h | 7 + .../cpp/core/include/ignite/impl/helpers.h | 57 ++ .../cpp/core/include/ignite/impl/operations.h | 136 ++- .../platforms/cpp/core/project/vs/core.vcxproj | 1 + .../cpp/core/project/vs/core.vcxproj.filters | 3 + modules/platforms/cpp/core/src/ignition.cpp | 62 +- .../core/src/impl/cache/query/query_impl.cpp | 39 +- .../cpp/core/src/impl/ignite_environment.cpp | 2 +- .../cpp/odbc-test/include/complex_type.h | 2 - .../platforms/cpp/odbc-test/include/test_type.h | 1 - .../ExpiryCacheHolderTest.cs | 12 +- .../Binary/BinaryDynamicRegistrationTest.cs | 50 +- .../Binary/BinaryEqualityComparerTest.cs | 217 +--- .../BinaryConfigurationTest.cs | 43 + .../Cache/CacheAbstractTest.cs | 18 +- .../Cache/CacheTestAsyncWrapper.cs | 12 +- .../Cache/Query/CacheDmlQueriesTest.cs | 13 +- .../Cache/Query/CacheLinqTest.cs | 36 +- .../Cache/Store/CacheStoreTest.cs | 2 +- .../Compute/AbstractTaskTest.cs | 28 +- .../Compute/MixedClusterTest.cs | 33 +- .../Config/cache-query-continuous.xml | 118 ++- .../Apache.Ignite.Core.Tests/DeploymentTest.cs | 10 + .../Examples/ExamplesTest.cs | 22 +- .../Apache.Ignite.Core.Tests/ExecutableTest.cs | 5 +- .../IgniteConfigurationSectionTest.cs | 7 +- .../IgniteConfigurationSerializerTest.cs | 9 +- .../IgniteConfigurationTest.cs | 7 +- .../Plugin/PluginTest.cs | 16 +- .../Apache.Ignite.Core.csproj | 5 +- .../Binary/BinaryArrayEqualityComparer.cs | 160 --- .../Binary/BinaryTypeConfiguration.cs | 13 - .../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 16 +- .../Cache/ICacheEntryProcessorResult.cs | 12 +- .../Apache.Ignite.Core/IgniteConfiguration.cs | 43 - .../IgniteConfigurationSection.xsd | 14 - .../dotnet/Apache.Ignite.Core/Ignition.cs | 28 +- .../Impl/Binary/BinaryArrayEqualityComparer.cs | 159 +++ .../Binary/BinaryEqualityComparerSerializer.cs | 100 +- .../Impl/Binary/BinaryFieldEqualityComparer.cs | 138 --- .../Impl/Binary/BinaryFullTypeDescriptor.cs | 20 - .../Impl/Binary/BinaryObject.cs | 2 +- .../Impl/Binary/BinaryObjectBuilder.cs | 7 +- .../Binary/BinarySurrogateTypeDescriptor.cs | 6 - .../Impl/Binary/BinaryUtils.cs | 10 - .../Impl/Binary/BinaryWriter.cs | 6 +- .../Impl/Binary/IBinaryEqualityComparer.cs | 63 -- .../Impl/Binary/IBinaryTypeDescriptor.cs | 5 - .../Impl/Binary/Marshaller.cs | 51 +- .../Impl/Cache/CacheEntryProcessorResult.cs | 27 +- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 28 +- .../Impl/Common/IgniteHome.cs | 21 +- .../Apache.Ignite.Core/Impl/PlatformTarget.cs | 17 +- .../Impl/DbCache.cs | 2 +- .../Impl/CacheQueryExpressionVisitor.cs | 14 +- .../Apache.Ignite.Linq/Impl/CacheQueryParser.cs | 25 +- .../Apache.Ignite.Linq/Impl/MethodVisitor.cs | 72 +- .../examples/Apache.Ignite.Examples/App.config | 4 +- .../Datagrid/MultiTieredCacheExample.cs | 2 +- .../Datagrid/PutGetExample.cs | 13 +- .../Misc/ClientReconnectExample.cs | 38 +- modules/schema-import/README.txt | 4 +- modules/spring/pom.xml | 6 + .../org/apache/ignite/IgniteSpringBean.java | 7 + .../apache/ignite/cache/spring/SpringCache.java | 4 +- .../ignite/cache/spring/SpringCacheTest.java | 177 ++++ .../IgniteExcludeInConfigurationTest.java | 14 +- .../org/apache/ignite/spring/sprint-exclude.xml | 19 +- .../testsuites/IgniteSpringTestSuite.java | 3 + .../ant/beautifier/GridJavadocAntTask.java | 18 +- .../modules/configuration/Version.service.js | 2 +- .../states/configuration/clusters/general.pug | 2 +- modules/web-console/web-agent/README.txt | 2 +- .../config/benchmark-atomic.properties | 9 +- .../config/benchmark-cache-load.properties | 7 +- .../config/benchmark-compute.properties | 13 +- .../config/benchmark-failover.properties | 4 +- .../config/benchmark-multicast.properties | 4 +- .../config/benchmark-put-indexed-val.properties | 9 +- .../yardstick/config/benchmark-query.properties | 13 +- .../config/benchmark-remote-sample.properties | 5 +- .../config/benchmark-sample.properties | 5 +- .../config/benchmark-sql-dml.properties | 19 +- .../yardstick/config/benchmark-store.properties | 30 +- .../yardstick/config/benchmark-tx.properties | 11 +- modules/yardstick/config/ignite-base-config.xml | 2 - .../config/ignite-failover-base-config.xml | 2 - .../ignite-int-max-values-onheap-config.xml | 1 - .../yardstick/config/ignite-store-config.xml | 2 - .../test-max-int-values-onheap.properties | 5 +- .../IgniteCacheRandomOperationBenchmark.java | 25 +- 300 files changed, 8546 insertions(+), 7335 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 0a5cd3d,a9cb38e..cfdfed8 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@@ -48,9 -48,9 +48,8 @@@ import org.apache.ignite.cache.CacheAto import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryProcessor; import org.apache.ignite.cache.CacheInterceptor; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheRebalanceMode; - import org.apache.ignite.cache.CacheTypeMetadata; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cache.PartitionLossPolicy; import org.apache.ignite.cache.QueryEntity; http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOffheapEvictionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java index e3ed666,0f5cd46..e087881 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java @@@ -127,9 -127,10 +127,9 @@@ public class VisorCacheConfiguration im writeSynchronizationMode = ccfg.getWriteSynchronizationMode(); invalidate = ccfg.isInvalidate(); startSize = ccfg.getStartSize(); - offHeapMaxMemory = ccfg.getOffHeapMaxMemory(); maxConcurrentAsyncOps = ccfg.getMaxConcurrentAsyncOperations(); interceptor = compactClass(ccfg.getInterceptor()); - typeMeta = VisorCacheTypeMetadata.list(ccfg.getQueryEntities(), ccfg.getCacheStoreFactory(), ccfg.getTypeMetadata()); + typeMeta = VisorCacheTypeMetadata.list(ccfg.getQueryEntities(), ccfg.getCacheStoreFactory()); statisticsEnabled = ccfg.isStatisticsEnabled(); mgmtEnabled = ccfg.isManagementEnabled(); ldrFactory = compactClass(ccfg.getCacheLoaderFactory()); http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationLeakTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java index c2fd382,a9df142..1c50908 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java @@@ -50,8 -50,8 +50,7 @@@ import org.apache.ignite.internal.proce import org.apache.ignite.internal.processors.cache.distributed.GridCacheTransformEventSelfTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodeChangingTopologyTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodePartitionsExchangeTest; -import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheNearOffheapGetSelfTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheServerNodeConcurrentStart; - import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicExpiredEntriesPreloadSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedOptimisticTransactionSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedPreloadRestartSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedPrimarySyncSelfTest; @@@ -74,11 -73,8 +72,10 @@@ import org.apache.ignite.internal.proce import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedTopologyChangeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedUnloadEventsSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePartitionedBackupNodeFailureRecoveryTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearEvictionEventSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearMultiNodeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearReadersSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearEvictionEventSelfTest; - import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearExpiredEntriesPreloadSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearJobExecutionSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearMultiGetSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearMultiNodeSelfTest; @@@ -232,11 -233,8 +229,7 @@@ public class IgniteCacheTestSuite2 exte suite.addTest(new TestSuite(GridCacheColocatedOptimisticTransactionSelfTest.class)); suite.addTestSuite(GridCacheAtomicMessageCountSelfTest.class); suite.addTest(new TestSuite(GridCacheNearPartitionedClearSelfTest.class)); - suite.addTest(new TestSuite(IgniteCacheNearOffheapGetSelfTest.class)); - suite.addTest(new TestSuite(GridCacheDhtExpiredEntriesPreloadSelfTest.class)); - suite.addTest(new TestSuite(GridCacheNearExpiredEntriesPreloadSelfTest.class)); - suite.addTest(new TestSuite(GridCacheAtomicExpiredEntriesPreloadSelfTest.class)); - suite.addTest(new TestSuite(GridCacheOffheapUpdateSelfTest.class)); suite.addTest(new TestSuite(GridCacheNearPrimarySyncSelfTest.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java ---------------------------------------------------------------------- diff --cc modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java index 0e68385,5b05aba..416f150 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java @@@ -20,9 -20,14 +20,10 @@@ package org.apache.ignite.testsuites import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.CacheScanPartitionQueryFallbackSelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheCrossCacheJoinRandomTest; + import org.apache.ignite.internal.processors.cache.IgniteCacheObjectKeyIndexingSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapTieredMultithreadedSelfTest; import org.apache.ignite.internal.processors.cache.IgniteCachePartitionedQueryMultiThreadedSelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheQueryEvictsMultiThreadedSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheQueryMultiThreadedOffHeapTieredSelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheQueryMultiThreadedSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapMultiThreadedSelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheSqlQueryMultiThreadedSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheClientQueryReplicatedNodeRestartSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest; http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java ---------------------------------------------------------------------- diff --cc modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java index fd57f86,e4ca29f..8dd273a --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java @@@ -34,8 -34,11 +34,9 @@@ import org.apache.ignite.internal.proce import org.apache.ignite.internal.processors.cache.query.continuous.CacheKeepBinaryIterationTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheKeepBinaryIterationStoreEnabledTest; import org.apache.ignite.internal.processors.cache.query.continuous.ClientReconnectContinuousQueryTest; + import org.apache.ignite.internal.processors.cache.query.continuous.ContinuousQueryPeerClassLoadingTest; import org.apache.ignite.internal.processors.cache.query.continuous.ContinuousQueryRemoteFilterMissingInClassPathSelfTest; import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicNearEnabledSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicOffheapTieredTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicOffheapValuesTest; import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicP2PDisabledSelfTest; import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicSelfTest; import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryConcurrentTest; http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/yardstick/config/benchmark-atomic.properties ---------------------------------------------------------------------- diff --cc modules/yardstick/config/benchmark-atomic.properties index aab4a6b,f296041..8e2413b --- a/modules/yardstick/config/benchmark-atomic.properties +++ b/modules/yardstick/config/benchmark-atomic.properties @@@ -71,7 -74,13 +74,7 @@@ sm=PRIMARY_SYN # Run configuration. # Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute). CONFIGS="\ - -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetBenchmark -sn IgniteNode -ds atomic-get-${b}-backup,\ - -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds atomic-put-get-${b}-backup,\ - -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-${b}-backup,\ + -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetBenchmark -sn IgniteNode -ds ${ver}atomic-get-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-get-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-get-offheap-val-${b}-backup,\ + -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-${b}-backup,\ + -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds ${ver}atomic-put-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-${b}-backup\ " http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/yardstick/config/benchmark-multicast.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/yardstick/config/benchmark-query.properties ---------------------------------------------------------------------- diff --cc modules/yardstick/config/benchmark-query.properties index 447798c,c364cfd..2612ec9 --- a/modules/yardstick/config/benchmark-query.properties +++ b/modules/yardstick/config/benchmark-query.properties @@@ -71,9 -74,12 +74,9 @@@ sm=PRIMARY_SYN # Run configuration. # Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute). CONFIGS="\ - -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds sql-query-${b}-backup,\ - -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds sql-query-join-${b}-backup,\ - -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds sql-query-put-${b}-backup,\ - -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -jdbc jdbc:ignite://127.0.0.1/query -t ${t} -sm ${sm} -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds sql-query-jdbc-${b}-backup,\ - -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -jdbc jdbc:ignite:cfg://cache=query@config/ignite-jdbc-config.xml -t ${t} -sm ${sm} -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds sql-query-jdbc-${b}-backup\ + -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-${b}-backup,\ + -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds ${ver}sql-query-join-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-${b}-backup,\ + -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds ${ver}sql-query-put-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-${b}-backup,\ + -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -jdbc jdbc:ignite://127.0.0.1/query -t ${t} -sm ${sm} -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-jdbc-${b}-backup,\ + -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -jdbc jdbc:ignite:cfg://cache=query@config/ignite-jdbc-config.xml -t ${t} -sm ${sm} -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-jdbc-${b}-backup\ " http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/yardstick/config/benchmark-tx.properties ---------------------------------------------------------------------- diff --cc modules/yardstick/config/benchmark-tx.properties index e579f76,8a75bf5..8926578 --- a/modules/yardstick/config/benchmark-tx.properties +++ b/modules/yardstick/config/benchmark-tx.properties @@@ -71,8 -74,12 +74,8 @@@ sm=PRIMARY_SYN # Run configuration. # Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute). CONFIGS="\ - -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxBenchmark -sn IgniteNode -ds tx-put-${b}-backup,\ - -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds tx-getAndPut-${b}-backup,\ - -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds tx-invoke-${b}-backup,\ - -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds tx-put-get-${b}-backup,\ + -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxBenchmark -sn IgniteNode -ds ${ver}tx-put-${b}-backup,\ + -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds ${ver}tx-getAndPut-${b}-backup,\ + -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds ${ver}tx-invoke-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-val-${b}-backup,\ + -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-put-get-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-get-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-put-get-offheap-val-${b}-backup\ " http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/yardstick/config/ignite-base-config.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/yardstick/config/ignite-failover-base-config.xml ---------------------------------------------------------------------- diff --cc modules/yardstick/config/ignite-failover-base-config.xml index 3e40765,0a3bd88..8de4142 --- a/modules/yardstick/config/ignite-failover-base-config.xml +++ b/modules/yardstick/config/ignite-failover-base-config.xml @@@ -70,10 -90,18 +70,8 @@@ <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="ATOMIC"/> - - <property name="swapEnabled" value="false"/> </bean> - <bean id="atomic-offheap" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true"> - <property name="name" value="atomic-offheap"/> - - <property name="cacheMode" value="PARTITIONED"/> - - <property name="atomicityMode" value="ATOMIC"/> - - <property name="memoryMode" value="OFFHEAP_TIERED"/> - </bean> - <bean id="tx" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true"> <property name="cacheMode" value="PARTITIONED"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java ---------------------------------------------------------------------- diff --cc modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java index 07b65d9,437d309..4010f5e --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java @@@ -47,8 -47,8 +47,7 @@@ import org.apache.ignite.IgniteDataStre import org.apache.ignite.IgniteException; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; - import org.apache.ignite.cache.CacheTypeMetadata; import org.apache.ignite.cache.QueryEntity; import org.apache.ignite.cache.QueryIndex; import org.apache.ignite.cache.affinity.Affinity;
