Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2C76318F4C for ; Sun, 3 Jan 2016 15:33:49 +0000 (UTC) Received: (qmail 27096 invoked by uid 500); 3 Jan 2016 15:33:49 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 26934 invoked by uid 500); 3 Jan 2016 15:33:49 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 25746 invoked by uid 99); 3 Jan 2016 15:33:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jan 2016 15:33:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C08B6E384A; Sun, 3 Jan 2016 15:33:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Sun, 03 Jan 2016 15:34:34 -0000 Message-Id: <44219b039f2641d6a00d471ef308a56d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [49/50] [abbrv] ignite git commit: Merge branch 'master' into ignite-2264 Merge branch 'master' into ignite-2264 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ce735b8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ce735b8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ce735b8 Branch: refs/heads/ignite-2264 Commit: 3ce735b8e77b5c4180adfa3a69b142e9afd2b0ab Parents: d35afa8 8057925 Author: vozerov-gridgain Authored: Sun Jan 3 16:37:11 2016 +0400 Committer: vozerov-gridgain Committed: Sun Jan 3 16:37:11 2016 +0400 ---------------------------------------------------------------------- DEVNOTES.txt | 11 + README.md | 194 ++ RELEASE_NOTES.txt | 2 + assembly/release-fabric-base.xml | 6 + assembly/release-sources.xml | 79 + 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 | 4 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../configuration/FileSystemConfiguration.java | 54 +- .../apache/ignite/internal/IgniteKernal.java | 34 +- .../ignite/internal/IgniteNodeAttributes.java | 3 + .../internal/cluster/ClusterGroupAdapter.java | 10 +- .../discovery/GridDiscoveryManager.java | 19 +- .../loadbalancer/GridLoadBalancerManager.java | 8 +- .../processors/cache/GridCacheAdapter.java | 14 +- .../processors/cache/GridCacheContext.java | 3 +- .../cache/GridCacheEvictionManager.java | 5 +- .../processors/cache/GridCacheIoManager.java | 5 +- .../processors/cache/GridCacheIterator.java | 4 +- .../processors/cache/GridCacheKeySet.java | 2 +- .../GridCachePartitionExchangeManager.java | 12 +- .../processors/cache/GridCacheProcessor.java | 9 +- .../processors/cache/GridCacheSwapManager.java | 7 +- .../processors/cache/GridCacheUtils.java | 92 + .../cache/GridCacheValueCollection.java | 5 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../dht/GridClientPartitionTopology.java | 3 +- .../dht/GridDhtPartitionTopologyImpl.java | 3 +- .../dht/GridDhtTransactionalCacheAdapter.java | 3 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 3 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 5 +- .../dht/atomic/GridDhtAtomicCache.java | 21 +- .../dht/preloader/GridDhtForceKeysFuture.java | 8 +- .../distributed/near/GridNearCacheAdapter.java | 11 +- .../local/atomic/GridLocalAtomicCache.java | 17 +- .../version/GridCachePlainVersionedEntry.java | 2 +- .../GridCacheAtomicStampedImpl.java | 5 +- .../internal/processors/igfs/IgfsImpl.java | 12 +- .../internal/processors/igfs/IgfsProcessor.java | 8 +- .../platform/PlatformAbstractTarget.java | 17 +- .../processors/platform/PlatformTarget.java | 22 + .../platform/compute/PlatformCompute.java | 34 +- .../dotnet/PlatformDotNetCacheStore.java | 4 +- .../platform/utils/PlatformFutureUtils.java | 119 +- .../platform/utils/PlatformListenable.java | 47 + .../processors/rest/GridRestProcessor.java | 4 + .../rest/client/message/GridClientNodeBean.java | 4 +- .../top/GridTopologyCommandHandler.java | 3 +- .../org/apache/ignite/internal/util/F0.java | 325 +--- .../internal/util/GridExecutionStatistics.java | 4 +- .../ignite/internal/util/IgniteUtils.java | 44 +- .../ignite/internal/util/lang/GridFunc.java | 1779 ++++-------------- .../ignite/internal/util/lang/GridTuple3.java | 1 - .../ignite/internal/util/lang/GridTuple4.java | 1 - .../ignite/internal/util/lang/GridTuple5.java | 1 - .../ignite/internal/util/lang/GridTuple6.java | 1 - .../ignite/internal/util/lang/GridTupleV.java | 1 - .../ignite/internal/util/nio/GridNioServer.java | 16 +- .../java/org/apache/ignite/lang/IgniteUuid.java | 2 +- .../plugin/security/AuthenticationContext.java | 33 +- .../memory/MemoryEventStorageSpi.java | 1 + .../core/src/main/resources/ignite.properties | 2 +- .../cache/GridCacheLuceneQueryIndexTest.java | 4 +- .../cache/IgniteCacheStoreCollectionTest.java | 163 ++ ...eAbstractDataStructuresFailoverSelfTest.java | 311 +-- .../distributed/GridCacheEventAbstractTest.java | 2 +- .../IpcSharedMemoryCrashDetectionSelfTest.java | 16 +- .../ignite/lang/GridBasicPerformanceTest.java | 10 +- .../ignite/lang/GridFuncPerformanceTest.java | 102 - .../ignite/loadtest/GridLoadTestStatistics.java | 2 +- 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 +- .../query/h2/opt/GridH2TreeIndex.java | 4 +- ...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 +- modules/platforms/dotnet/Apache.Ignite.sln | 5 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 8 +- modules/platforms/dotnet/DEVNOTES.txt | 18 + .../Properties/AssemblyInfo.cs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- modules/rest-http/pom.xml | 2 +- .../rest/protocols/http/jetty/rest.html | 2 +- modules/scalar-2.10/pom.xml | 4 +- modules/scalar/pom.xml | 4 +- 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 | 4 +- pom.xml | 25 +- 188 files changed, 3016 insertions(+), 2579 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3ce735b8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ----------------------------------------------------------------------