Merge branch 'master' into ignite-2218
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7f8ca71c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7f8ca71c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7f8ca71c Branch: refs/heads/ignite-2218 Commit: 7f8ca71c40ab3b47ad1811e62effaf3d55fffba3 Parents: b21fe58 ddbe2d5 Author: vozerov-gridgain <[email protected]> Authored: Mon Jan 4 10:28:30 2016 +0400 Committer: vozerov-gridgain <[email protected]> Committed: Mon Jan 4 10:28:30 2016 +0400 ---------------------------------------------------------------------- DEVNOTES.txt | 3 + README.md | 194 ++++++++++++ RELEASE_NOTES.txt | 2 + assembly/release-fabric-base.xml | 6 + doap_Ignite.rdf | 67 ++++ examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- .../hibernate/HibernateL2CacheExample.java | 26 +- .../hibernate/CacheHibernateStoreExample.java | 5 + .../store/auto/CacheBinaryAutoStoreExample.java | 1 + .../examples/datagrid/CacheAffinityExample.java | 5 + .../examples/datagrid/CacheApiExample.java | 5 + .../examples/datagrid/CacheAsyncApiExample.java | 5 + .../datagrid/CacheContinuousQueryExample.java | 5 + .../datagrid/CacheDataStreamerExample.java | 5 + .../datagrid/CacheEntryProcessorExample.java | 5 + .../examples/datagrid/CacheEventsExample.java | 5 + .../examples/datagrid/CacheQueryExample.java | 6 + .../datagrid/CacheTransactionExample.java | 6 +- .../starschema/CacheStarSchemaExample.java | 10 +- .../store/auto/CacheAutoStoreExample.java | 5 + .../store/jdbc/CacheJdbcStoreExample.java | 5 + .../store/spring/CacheSpringStoreExample.java | 5 + .../streaming/StreamTransformerExample.java | 4 + .../streaming/StreamVisitorExample.java | 13 +- .../streaming/wordcount/QueryWords.java | 51 +-- .../socket/WordsSocketStreamerServer.java | 86 ++--- .../java8/datagrid/CacheAffinityExample.java | 5 + .../java8/datagrid/CacheApiExample.java | 5 + .../java8/datagrid/CacheAsyncApiExample.java | 5 + .../datagrid/CacheEntryProcessorExample.java | 5 + .../streaming/StreamTransformerExample.java | 9 +- .../java8/streaming/StreamVisitorExample.java | 5 + modules/aop/pom.xml | 4 +- 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 +- modules/core/pom.xml | 2 +- .../configuration/FileSystemConfiguration.java | 54 +++- .../GridDistributedTxRemoteAdapter.java | 12 +- .../dht/CacheDistributedGetFutureAdapter.java | 10 +- .../distributed/dht/GridDhtTxFinishFuture.java | 15 +- .../cache/distributed/dht/GridDhtTxLocal.java | 31 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 48 ++- .../dht/GridPartitionedGetFuture.java | 2 +- .../distributed/near/GridNearGetFuture.java | 2 +- ...arOptimisticSerializableTxPrepareFuture.java | 94 +++--- .../near/GridNearOptimisticTxPrepareFuture.java | 63 ++-- .../GridNearPessimisticTxPrepareFuture.java | 6 +- .../cache/distributed/near/GridNearTxLocal.java | 69 ++-- .../near/GridNearTxPrepareFutureAdapter.java | 8 +- .../cache/local/GridLocalLockFuture.java | 19 +- .../cache/transactions/IgniteTxAdapter.java | 24 +- .../cache/transactions/IgniteTxEntry.java | 12 +- .../transactions/IgniteTxLocalAdapter.java | 38 ++- .../version/GridCachePlainVersionedEntry.java | 2 +- .../internal/processors/igfs/IgfsImpl.java | 12 +- .../platform/PlatformAbstractTarget.java | 17 +- .../processors/platform/PlatformTarget.java | 22 ++ .../platform/compute/PlatformCompute.java | 34 +- .../platform/utils/PlatformFutureUtils.java | 119 +++++-- .../platform/utils/PlatformListenable.java | 47 +++ .../ignite/internal/util/IgniteUtils.java | 40 +++ .../ignite/internal/util/lang/GridFunc.java | 3 + .../ignite/internal/util/nio/GridNioServer.java | 16 +- .../core/src/main/resources/ignite.properties | 2 +- .../internal/GridUpdateNotifierSelfTest.java | 2 +- .../cache/IgniteCacheStoreCollectionTest.java | 163 ++++++++++ ...eAbstractDataStructuresFailoverSelfTest.java | 311 +++++-------------- 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 | 10 +- modules/hadoop/pom.xml | 2 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 7 + ...condaryFileSystemInitializationSelfTest.java | 214 +++++++++++++ .../testsuites/IgniteHadoopTestSuite.java | 2 + modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 10 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 + modules/jcl/pom.xml | 4 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 4 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 6 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 10 +- modules/platforms/cpp/DEVNOTES.txt | 59 ++++ modules/platforms/cpp/README.txt | 64 +--- modules/platforms/cpp/common/configure.ac | 2 +- .../cpp/common/include/ignite/common/exports.h | 7 +- .../cpp/common/include/ignite/common/java.h | 13 +- .../platforms/cpp/common/project/vs/module.def | 6 +- modules/platforms/cpp/common/src/exports.cpp | 20 +- modules/platforms/cpp/common/src/java.cpp | 70 ++++- 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 +- modules/platforms/cpp/project/vs/ignite.sln | 6 +- modules/platforms/cpp/project/vs/ignite.slnrel | 10 + .../platforms/cpp/project/vs/ignite_x86.slnrel | 10 + .../Properties/AssemblyInfo.cs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- .../Compute/ComputeApiTest.cs | 20 ++ .../Properties/AssemblyInfo.cs | 8 +- .../Apache.Ignite.Core.csproj | 2 + .../Common/IgniteFutureCancelledException.cs | 65 ++++ .../Apache.Ignite.Core/Compute/ICompute.cs | 233 ++++++++++++++ .../Impl/Common/CancelledTask.cs | 47 +++ .../Apache.Ignite.Core/Impl/Common/Future.cs | 74 ++++- .../Apache.Ignite.Core/Impl/Compute/Compute.cs | 157 +++++++++- .../Impl/Compute/ComputeImpl.cs | 15 +- .../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 4 + .../Apache.Ignite.Core/Impl/PlatformTarget.cs | 52 ++++ .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 16 +- .../Impl/Unmanaged/UnmanagedUtils.cs | 31 +- .../Properties/AssemblyInfo.cs | 8 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 4 +- 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 | 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 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 4 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 2 +- 152 files changed, 2549 insertions(+), 730 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7f8ca71c/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java ----------------------------------------------------------------------
