merge 1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b9140b33 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b9140b33 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b9140b33 Branch: refs/heads/ignite-1537 Commit: b9140b332c33dc6f9ca6047022ce3c563ff706a6 Parents: 6f38064 3ba7e54 Author: sboikov <sboi...@gridgain.com> Authored: Wed Dec 9 15:11:55 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Dec 9 15:11:55 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 5 +- bin/include/parseargs.bat | 2 +- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- .../java/org/apache/ignite/schema/Demo.java | 6 +- .../store/auto/CacheAutoStoreExample.java | 49 +- .../messaging/MessagingPingPongExample.java | 4 - .../examples/MessagingExamplesSelfTest.java | 2 - 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 | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- .../ignite/codegen/MessageCodeGenerator.java | 6 +- modules/core/pom.xml | 2 +- .../main/java/org/apache/ignite/Ignition.java | 16 + .../store/jdbc/CacheAbstractJdbcStore.java | 5 +- .../configuration/CacheConfiguration.java | 39 +- .../configuration/IgniteConfiguration.java | 2 - .../configuration/TransactionConfiguration.java | 47 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 39 +- .../ignite/internal/MarshallerContextImpl.java | 23 +- .../managers/communication/GridIoManager.java | 3 +- .../communication/GridIoMessageFactory.java | 8 +- .../internal/portable/BinaryFieldAccessor.java | 9 +- .../internal/portable/BinaryReaderExImpl.java | 19 +- .../internal/portable/BinaryWriterExImpl.java | 19 +- .../portable/PortableClassDescriptor.java | 46 +- .../internal/portable/PortableContext.java | 12 +- .../CacheDefaultBinaryAffinityKeyMapper.java | 2 +- .../processors/cache/GridCacheAdapter.java | 65 +- .../cache/GridCacheConcurrentMap.java | 734 +++++------------ .../processors/cache/GridCacheMapEntry.java | 44 +- .../cache/GridCacheMapEntryFactory.java | 13 +- .../processors/cache/GridCacheProcessor.java | 2 +- .../distributed/GridDistributedCacheEntry.java | 14 +- .../dht/GridDhtAffinityAssignmentResponse.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java | 13 +- .../distributed/dht/GridDhtCacheEntry.java | 14 +- .../dht/GridDhtOffHeapCacheEntry.java | 15 +- .../distributed/dht/GridNoStorageCacheMap.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 23 +- .../dht/atomic/GridDhtAtomicCacheEntry.java | 16 +- .../atomic/GridDhtAtomicOffHeapCacheEntry.java | 15 +- .../dht/colocated/GridDhtColocatedCache.java | 13 +- .../colocated/GridDhtColocatedCacheEntry.java | 14 +- .../GridDhtColocatedOffHeapCacheEntry.java | 15 +- .../colocated/GridDhtDetachedCacheEntry.java | 4 +- .../distributed/near/GridNearCacheAdapter.java | 8 +- .../distributed/near/GridNearCacheEntry.java | 16 +- .../near/GridNearOffHeapCacheEntry.java | 15 +- .../cache/jta/CacheJtaManagerAdapter.java | 4 +- .../processors/cache/local/GridLocalCache.java | 8 +- .../cache/local/GridLocalCacheEntry.java | 15 +- .../local/atomic/GridLocalAtomicCache.java | 8 +- .../CacheObjectBinaryProcessorImpl.java | 41 +- .../cache/query/GridCacheQueryManager.java | 46 +- .../internal/util/GridMessageCollection.java | 160 ++++ .../ignite/internal/util/IgniteUtils.java | 18 +- .../internal/util/UUIDCollectionMessage.java | 42 +- .../util/nio/GridNioBackPressureControl.java | 14 +- .../optimized/OptimizedMarshallerUtils.java | 16 +- .../org/apache/ignite/spi/IgniteSpiThread.java | 10 +- .../communication/tcp/TcpCommunicationSpi.java | 6 +- .../org/apache/ignite/thread/IgniteThread.java | 43 +- .../ignite/thread/IgniteThreadPoolExecutor.java | 37 +- .../core/src/main/resources/ignite.properties | 2 +- .../portable/BinaryMarshallerSelfTest.java | 16 +- ...cheAbstractFullApiMultithreadedSelfTest.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 4 +- .../cache/GridCacheAlwaysEvictionPolicy.java | 2 +- ...eAtomicEntryProcessorDeploymentSelfTest.java | 6 +- .../cache/GridCacheConcurrentMapSelfTest.java | 11 - .../GridCacheConditionalDeploymentSelfTest.java | 20 +- .../cache/GridCacheDeploymentSelfTest.java | 11 +- ...eAbstractDataStructuresFailoverSelfTest.java | 2 - .../DataStreamProcessorSelfTest.java | 25 +- .../loadtests/hashmap/GridHashMapLoadTest.java | 4 +- .../marshaller/GridMarshallerAbstractTest.java | 32 +- .../config/GridTestProperties.java | 3 + .../testframework/junits/GridAbstractTest.java | 9 +- .../junits/IgniteTestResources.java | 2 +- .../IgniteBinaryObjectsCacheTestSuite3.java | 2 + .../ignite/testsuites/IgniteCacheTestSuite.java | 4 +- .../IgnitePortableCacheTestSuite.java | 3 +- .../testsuites/IgniteUtilSelfTestSuite.java | 2 + .../ignite/util/GridMessageCollectionTest.java | 105 +++ 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 +- .../HibernateTransactionalDataRegion.java | 18 +- .../HibernateL2CacheTransactionalSelfTest.java | 23 +- modules/indexing/pom.xml | 2 +- ...cheDuplicateEntityConfigurationSelfTest.java | 126 +++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 5 + .../IgniteCacheQuerySelfTestSuite.java | 4 + modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 11 +- .../cache/jta/jndi/CacheJndiTmFactory.java | 132 ++++ .../processors/cache/jta/CacheJtaManager.java | 41 +- .../cache/AbstarctCacheJtaSelfTest.java | 183 +++++ .../cache/CacheJndiTmFactorySelfTest.java | 166 ++++ ...CacheJtaConfigurationValidationSelfTest.java | 4 +- ...CacheJtaFactoryConfigValidationSelfTest.java | 142 ++++ .../processors/cache/GridCacheJtaSelfTest.java | 221 ------ .../cache/GridCacheReplicatedJtaSelfTest.java | 32 - .../cache/GridJtaLifecycleAwareSelfTest.java | 191 +++++ .../GridPartitionedCacheJtaFactorySelfTest.java | 41 + ...titionedCacheJtaLookupClassNameSelfTest.java | 83 ++ .../GridReplicatedCacheJtaFactorySelfTest.java | 32 + ...plicatedCacheJtaLookupClassNameSelfTest.java | 32 + .../GridTmLookupLifecycleAwareSelfTest.java | 122 --- .../ignite/testsuites/IgniteJtaTestSuite.java | 26 +- 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 | 5 +- modules/osgi-paxlogging/pom.xml | 6 +- modules/osgi/pom.xml | 5 +- .../ignite/osgi/AbstractIgniteKarafTest.java | 2 - .../ignite/osgi/IgniteOsgiServiceTest.java | 2 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Binary/BinarySelfTest.cs | 67 ++ .../Apache.Ignite.Core.Tests/EventsTest.cs | 3 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite.Core.csproj | 1 + .../Impl/Binary/BinaryReflectiveActions.cs | 4 +- .../Impl/Common/DelegateConverter.cs | 15 +- .../Apache.Ignite.Core/Impl/NativeMethods.cs | 10 - .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 358 +++++++++ .../Impl/Unmanaged/UnmanagedUtils.cs | 788 +++---------------- .../Properties/AssemblyInfo.cs | 4 +- modules/platforms/dotnet/Apache.Ignite.FxCop | 322 +++++++- .../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- .../ignite/internal/GridFactorySelfTest.java | 29 + .../GridSpringBeanSerializationSelfTest.java | 2 + 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 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- .../config/benchmark-failover.properties | 2 +- modules/yardstick/pom.xml | 2 +- .../yardstick/cache/IgnitePutTxBenchmark.java | 26 +- ...IgniteTransactionalWriteInvokeBenchmark.java | 42 +- modules/yarn/pom.xml | 2 +- .../apache/ignite/yarn/utils/package-info.java | 22 + modules/zookeeper/pom.xml | 2 +- pom.xml | 6 +- 180 files changed, 3394 insertions(+), 2247 deletions(-) ----------------------------------------------------------------------
