Merge branch 'ignite-1.5' into ignite-gg-10837
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/22045428 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/22045428 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/22045428 Branch: refs/heads/ignite-gg-10837 Commit: 220454282292215df2123f9603c43ed0398e3a4d Parents: 8804357 1039bf6 Author: nikolay_tikhonov <[email protected]> Authored: Tue Dec 22 13:23:29 2015 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Tue Dec 22 13:23:29 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 1 + bin/ignitevisorcmd.bat | 1 + examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- .../hibernate/CacheHibernateStoreExample.java | 8 + .../datagrid/store/hibernate/Person.hbm.xml | 6 +- .../datagrid/store/hibernate/hibernate.cfg.xml | 7 +- ...ComputeClientBinaryTaskExecutionExample.java | 4 +- .../CacheClientBinaryPutGetExample.java | 6 +- .../datagrid/CacheClientBinaryQueryExample.java | 10 +- .../store/auto/CacheBinaryAutoStoreExample.java | 9 +- .../datagrid/CacheEntryProcessorExample.java | 157 ++ .../examples/datagrid/CacheQueryExample.java | 15 +- .../store/dummy/CacheDummyPersonStore.java | 113 -- .../store/dummy/CacheDummyStoreExample.java | 133 -- .../datagrid/store/dummy/package-info.java | 22 - .../store/jdbc/CacheJdbcPersonStore.java | 43 +- .../store/jdbc/CacheJdbcStoreExample.java | 24 +- .../store/spring/CacheSpringPersonStore.java | 29 +- .../store/spring/CacheSpringStoreExample.java | 12 +- .../datagrid/store/spring/package-info.java | 2 +- .../apache/ignite/examples/model/Address.java | 72 + .../apache/ignite/examples/model/Employee.java | 93 + .../ignite/examples/model/EmployeeKey.java | 93 + .../ignite/examples/model/Organization.java | 85 +- .../ignite/examples/model/OrganizationType.java | 32 + .../apache/ignite/examples/model/Person.java | 2 +- .../ignite/examples/model/binary/Address.java | 72 - .../ignite/examples/model/binary/Employee.java | 93 - .../examples/model/binary/EmployeeKey.java | 93 - .../examples/model/binary/Organization.java | 93 - .../examples/model/binary/OrganizationType.java | 32 - .../ignite/examples/model/package-info.java | 23 + .../streaming/StreamVisitorExample.java | 40 +- .../datagrid/CacheEntryProcessorExample.java | 147 ++ .../ScalarCacheEntryProcessorExample.scala | 125 ++ .../examples/ScalarSnowflakeSchemaExample.scala | 31 +- .../ignite/examples/CacheExamplesSelfTest.java | 18 +- .../java8/examples/CacheExamplesSelfTest.java | 8 + .../tests/examples/ScalarExamplesSelfTest.scala | 5 + modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 4 +- .../ClientAbstractConnectivitySelfTest.java | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 7 +- .../src/main/java/org/apache/ignite/Ignite.java | 19 + .../java/org/apache/ignite/IgniteCache.java | 8 +- .../org/apache/ignite/binary/BinaryObject.java | 15 + .../binary/BinaryReflectiveSerializer.java | 33 + .../ignite/binary/BinaryTypeConfiguration.java | 20 +- .../org/apache/ignite/cache/CacheManager.java | 4 +- .../ignite/cache/affinity/AffinityKey.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../configuration/CacheConfiguration.java | 63 +- .../apache/ignite/internal/IgniteKernal.java | 38 +- .../org/apache/ignite/internal/IgnitionEx.java | 51 +- .../internal/binary/BinaryClassDescriptor.java | 181 +- .../ignite/internal/binary/BinaryContext.java | 123 +- .../internal/binary/BinaryEnumObjectImpl.java | 7 + .../internal/binary/BinaryFieldAccessor.java | 3 - .../internal/binary/BinaryObjectExImpl.java | 7 + .../internal/binary/BinaryObjectImpl.java | 20 +- .../binary/BinaryObjectOffheapImpl.java | 7 + .../ignite/internal/binary/BinaryUtils.java | 60 +- .../ignite/internal/binary/BinaryWriteMode.java | 4 +- .../internal/cluster/ClusterGroupAdapter.java | 10 +- .../discovery/GridDiscoveryManager.java | 4 +- .../processors/cache/CacheEntryImpl.java | 6 +- .../processors/cache/CacheEntryImplEx.java | 17 +- .../processors/cache/CacheObjectAdapter.java | 3 + .../processors/cache/GridCacheProcessor.java | 12 +- .../cache/GridCacheSharedContext.java | 20 + .../processors/cache/GridCacheUtils.java | 18 +- .../processors/cache/IgniteCacheProxy.java | 8 +- .../cache/binary/BinaryMetadataKey.java | 2 +- .../binary/CacheObjectBinaryProcessorImpl.java | 2 +- .../CacheDataStructuresManager.java | 5 +- .../dht/CacheDistributedGetFutureAdapter.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java | 7 +- .../dht/GridPartitionedGetFuture.java | 15 +- .../dht/GridPartitionedSingleGetFuture.java | 15 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 10 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 46 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 25 + .../colocated/GridDhtColocatedLockFuture.java | 2 +- .../dht/preloader/GridDhtPreloader.java | 31 +- .../distributed/near/GridNearAtomicCache.java | 3 + .../distributed/near/GridNearGetFuture.java | 17 +- .../distributed/near/GridNearLockFuture.java | 30 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +- .../cache/query/GridCacheQueryManager.java | 8 +- .../cache/query/GridCacheQueryRequest.java | 12 +- .../cache/store/CacheOsStoreManager.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 23 +- .../cache/transactions/IgniteTxManager.java | 6 +- .../datastreamer/DataStreamerUpdateJob.java | 2 +- .../PlatformDotNetConfigurationClosure.java | 4 +- .../processors/query/GridQueryProcessor.java | 214 ++- .../service/GridServiceProcessor.java | 30 +- .../processors/task/GridTaskWorker.java | 8 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../internal/util/lang/GridNodePredicate.java | 13 +- .../ignite/internal/util/nio/GridNioServer.java | 11 +- .../util/nio/GridSelectorNioSessionImpl.java | 7 + .../cache/VisorCacheQueryConfiguration.java | 11 + .../cache/VisorCacheStoreConfiguration.java | 13 +- .../internal/visor/query/VisorQueryJob.java | 10 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 50 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 4 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 42 +- .../TcpDiscoveryMulticastIpFinder.java | 12 +- .../core/src/main/resources/ignite.properties | 3 +- .../ignite/internal/ClusterGroupSelfTest.java | 32 +- .../IgniteClientReconnectCacheTest.java | 33 +- .../ignite/internal/TaskNodeRestartTest.java | 230 +++ .../binary/BinaryFieldsAbstractSelfTest.java | 4 +- .../BinaryFooterOffsetsAbstractSelfTest.java | 3 +- .../binary/BinaryMarshallerSelfTest.java | 144 +- ...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +- .../binary/GridBinaryWildcardsSelfTest.java | 3 +- .../CacheSerializableTransactionsTest.java | 16 + .../cache/CacheStopAndDestroySelfTest.java | 2 + .../cache/GridCacheAbstractFullApiSelfTest.java | 8 + .../GridCacheOnCopyFlagAbstractSelfTest.java | 33 +- ...IgniteCacheAtomicPutAllFailoverSelfTest.java | 1 + ...IgniteCacheBinaryEntryProcessorSelfTest.java | 255 +++ .../IgniteCacheBinaryObjectsScanSelfTest.java | 137 ++ .../cache/IgniteCacheNearLockValueSelfTest.java | 11 +- .../cache/IgniteCachePutAllRestartTest.java | 2 +- .../cache/IgniteCacheSerializationSelfTest.java | 112 ++ .../IgniteCacheStoreValueAbstractTest.java | 2 +- .../IgniteStartCacheInTransactionSelfTest.java | 39 +- .../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +- .../GridCacheBinaryStoreAbstractSelfTest.java | 2 +- ...ntNodeBinaryObjectMetadataMultinodeTest.java | 8 +- .../CacheGetInsideLockChangingTopologyTest.java | 477 +++++ .../IgniteCacheSizeFailoverTest.java | 4 +- ...gniteAtomicLongChangingTopologySelfTest.java | 8 +- ...omicMultiNodeP2PDisabledFullApiSelfTest.java | 5 - ...ledFairAffinityMultiNodeFullApiSelfTest.java | 5 - .../near/NearCacheSyncUpdateTest.java | 167 ++ .../GridCacheRebalancingSyncSelfTest.java | 12 +- .../random/RandomEvictionPolicySelfTest.java | 4 +- .../BinaryTxCacheLocalEntriesSelfTest.java | 2 +- .../GridServiceProcessorProxySelfTest.java | 3 +- .../GridServiceProcessorStopSelfTest.java | 18 +- .../ServicePredicateAccessCacheTest.java | 155 ++ .../IgniteMessagingWithClientTest.java | 2 - .../GridSessionCheckpointAbstractSelfTest.java | 3 +- .../session/GridSessionCheckpointSelfTest.java | 3 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 30 +- ...CommunicationRecoveryAckClosureSelfTest.java | 39 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 18 +- .../ignite/testframework/junits/IgniteMock.java | 3 +- .../junits/IgniteTestResources.java | 4 +- .../IgniteCacheFailoverTestSuite3.java | 2 + .../testsuites/IgniteCacheTestSuite2.java | 2 + .../testsuites/IgniteComputeGridTestSuite.java | 2 + .../testsuites/IgniteKernalSelfTestSuite.java | 2 + .../IgniteSpiDiscoverySelfTestSuite.java | 6 + modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 118 +- .../processors/query/h2/sql/GridSqlQuery.java | 3 + .../query/h2/sql/GridSqlQuerySplitter.java | 113 +- .../cache/BinarySerializationQuerySelfTest.java | 416 ++++ ...onQueryWithReflectiveSerializerSelfTest.java | 28 + .../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 68 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 300 ++- ...teCacheFullTextQueryNodeJoiningSelfTest.java | 145 ++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +- .../IgniteCacheReplicatedQuerySelfTest.java | 10 +- .../local/IgniteCacheLocalQuerySelfTest.java | 2 +- .../query/IgniteSqlSchemaIndexingTest.java | 240 +++ .../query/IgniteSqlSplitterSelfTest.java | 55 +- .../query/h2/sql/GridQueryParsingTest.java | 9 +- .../IgniteBinaryCacheQueryTestSuite.java | 124 +- .../IgniteCacheQuerySelfTestSuite.java | 2 + modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 2 +- modules/platforms/cpp/common/configure.ac | 2 +- .../common/include/ignite/common/concurrent.h | 2 +- .../cpp/common/include/ignite/common/utils.h | 1 - .../cpp/common/os/win/src/concurrent_os.cpp | 26 +- modules/platforms/cpp/common/src/java.cpp | 20 +- modules/platforms/cpp/core-test/configure.ac | 2 +- .../platforms/cpp/core-test/src/cache_test.cpp | 4 +- modules/platforms/cpp/core/configure.ac | 2 +- .../cpp/core/include/ignite/binary/binary.h | 5 + .../core/include/ignite/binary/binary_consts.h | 5 + .../include/ignite/binary/binary_containers.h | 5 + .../include/ignite/binary/binary_raw_reader.h | 5 + .../include/ignite/binary/binary_raw_writer.h | 5 + .../core/include/ignite/binary/binary_reader.h | 5 + .../core/include/ignite/binary/binary_type.h | 21 +- .../core/include/ignite/binary/binary_writer.h | 5 + .../cpp/core/include/ignite/cache/cache.h | 17 +- .../cpp/core/include/ignite/cache/cache_entry.h | 5 + .../core/include/ignite/cache/cache_peek_mode.h | 5 + .../cpp/core/include/ignite/cache/query/query.h | 5 + .../include/ignite/cache/query/query_argument.h | 6 + .../include/ignite/cache/query/query_cursor.h | 5 + .../ignite/cache/query/query_fields_cursor.h | 5 + .../ignite/cache/query/query_fields_row.h | 5 + .../include/ignite/cache/query/query_scan.h | 33 +- .../core/include/ignite/cache/query/query_sql.h | 5 + .../ignite/cache/query/query_sql_fields.h | 5 + .../include/ignite/cache/query/query_text.h | 43 +- .../platforms/cpp/core/include/ignite/guid.h | 5 + .../platforms/cpp/core/include/ignite/ignite.h | 5 + .../core/include/ignite/ignite_configuration.h | 5 + .../cpp/core/include/ignite/ignite_error.h | 5 + .../cpp/core/include/ignite/ignition.h | 9 +- .../core/include/ignite/impl/cache/cache_impl.h | 6 +- .../cpp/core/include/ignite/impl/operations.h | 8 +- modules/platforms/cpp/core/namespaces.dox | 53 + modules/platforms/cpp/cpp.dxg | 4 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 5 +- .../Properties/AssemblyInfo.cs | 5 +- .../native-client-test-cache-parallel-store.xml | 2 +- .../Config/native-client-test-cache-store.xml | 6 +- .../Examples/ExamplesTest.cs | 4 +- .../Properties/AssemblyInfo.cs | 5 +- .../Services/ServicesTest.cs | 23 +- .../Apache.Ignite.Core.csproj | 19 + .../Binary/IBinaryRawReader.cs | 4 +- .../Apache.Ignite.Core/Binary/IBinaryReader.cs | 25 +- .../Apache.Ignite.Core/Binary/Package-Info.cs | 26 + .../Cache/Event/Package-Info.cs | 26 + .../Cache/Expiry/Package-Info.cs | 26 + .../Apache.Ignite.Core/Cache/Package-Info.cs | 26 + .../Cache/Query/Continuous/Package-Info.cs | 26 + .../Cache/Query/Package-Info.cs | 26 + .../Cache/Store/Package-Info.cs | 26 + .../Apache.Ignite.Core/Cluster/Package-Info.cs | 26 + .../Apache.Ignite.Core/Common/Package-Info.cs | 26 + .../Apache.Ignite.Core/Compute/IComputeTask.cs | 11 +- .../Apache.Ignite.Core/Compute/Package-Info.cs | 26 + .../DataStructures/Package-Info.cs | 26 + .../Datastream/Package-Info.cs | 26 + .../Apache.Ignite.Core/Events/Package-Info.cs | 26 + .../Impl/Binary/BinaryReader.cs | 13 +- .../Impl/Binary/BinaryUtils.cs | 4 +- .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 8 - .../Lifecycle/Package-Info.cs | 26 + .../Messaging/Package-Info.cs | 26 + .../dotnet/Apache.Ignite.Core/Package-Info.cs | 36 + .../Properties/AssemblyInfo.cs | 5 +- .../Apache.Ignite.Core/Resource/Package-Info.cs | 26 + .../Apache.Ignite.Core/Services/Package-Info.cs | 26 + .../Transactions/Package-Info.cs | 26 + modules/platforms/dotnet/Apache.Ignite.dxg | 4 +- modules/platforms/dotnet/Apache.Ignite.sln | 1 + .../Apache.Ignite/Properties/AssemblyInfo.cs | 5 +- modules/platforms/dotnet/dotnet.dxg | 1795 ------------------ .../Apache.Ignite.Examples.csproj | 1 - .../Datagrid/CrossPlatformExample.cs | 205 -- .../Messaging/MessagingExample.cs | 6 +- .../Properties/AssemblyInfo.cs | 5 +- .../Properties/AssemblyInfo.cs | 5 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- .../scala/org/apache/ignite/scalar/scalar.scala | 11 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- .../ignite/schema/generator/CodeGenerator.java | 7 +- .../schema/test/AbstractSchemaImportTest.java | 18 + .../org/apache/ignite/schema/test/model/Tst.txt | 506 +++++ .../apache/ignite/schema/test/model/TstKey.txt | 96 + .../schema/test/model/ignite-type-metadata.xml | 180 ++ .../test/parser/DbMetadataParserTest.java | 17 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- .../java/org/apache/ignite/IgniteSpring.java | 4 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- .../commands/cache/VisorCacheCommand.scala | 14 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- .../config/benchmark-multicast.properties | 2 +- modules/yardstick/pom.xml | 2 +- .../cache/IgnitePutGetBatchBenchmark.java | 15 +- .../cache/IgnitePutGetTxBatchBenchmark.java | 15 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- parent/pom.xml | 1 + pom.xml | 44 +- 317 files changed, 7249 insertions(+), 3800 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/22045428/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/22045428/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/22045428/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/22045428/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ----------------------------------------------------------------------
