You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/10/28 09:42:51 UTC

[16/17] ignite git commit: Merge branch 'ignite-1282' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-950-new

Merge branch 'ignite-1282' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-950-new


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/383b08ac
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/383b08ac
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/383b08ac

Branch: refs/heads/ignite-950-new
Commit: 383b08ac4cdb857f7dc346f30ecb7be7817d8380
Parents: 52ac93b 54c44b8
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Wed Oct 28 10:10:18 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Oct 28 10:10:18 2015 +0300

----------------------------------------------------------------------
 .../portable/GridPortableMarshaller.java        |   6 +
 .../portable/PortableClassDescriptor.java       |  69 ++-
 .../internal/portable/PortableContext.java      |  59 +-
 .../portable/PortableMetaDataCollector.java     |   5 +
 .../internal/portable/PortableReaderExImpl.java | 157 ++++--
 .../ignite/internal/portable/PortableUtils.java |  28 +-
 .../internal/portable/PortableWriterExImpl.java |  93 +++-
 .../portable/builder/PortableBuilderReader.java |  52 +-
 .../CacheObjectPortableProcessorImpl.java       |   4 +
 .../platform/PlatformContextImpl.java           |   9 +-
 .../cache/affinity/PlatformAffinity.java        |   5 +-
 .../transactions/PlatformTransactions.java      |   5 +-
 .../marshaller/portable/PortableMarshaller.java |  22 -
 .../ignite/portable/PortableRawReader.java      |   6 +
 .../ignite/portable/PortableRawWriter.java      |   6 +
 .../apache/ignite/portable/PortableReader.java  |   7 +
 .../portable/PortableTypeConfiguration.java     |  19 -
 .../apache/ignite/portable/PortableWriter.java  |   7 +
 .../GridPortableBuilderAdditionalSelfTest.java  |  65 ++-
 .../portable/GridPortableBuilderSelfTest.java   |  50 +-
 .../GridPortableMarshallerSelfTest.java         |  47 +-
 .../mutabletest/GridPortableTestClasses.java    |   9 +
 .../platforms/cpp/common/include/Makefile.am    |   3 +-
 .../cpp/common/include/ignite/common/utils.h    |  81 +++
 .../cpp/common/project/vs/common.vcxproj        |   1 +
 .../common/project/vs/common.vcxproj.filters    |   3 +
 .../cpp/core-test/src/cache_query_test.cpp      |  21 +-
 .../platforms/cpp/core-test/src/cache_test.cpp  |  19 +-
 .../cpp/core-test/src/ignition_test.cpp         |  19 +-
 .../platforms/cpp/core/include/ignite/ignite.h  |   1 +
 .../core/include/ignite/ignite_configuration.h  |  81 +--
 .../cpp/core/include/ignite/impl/ignite_impl.h  |  27 +-
 modules/platforms/cpp/core/src/ignition.cpp     |  18 +-
 .../platforms/cpp/core/src/impl/ignite_impl.cpp |   5 +
 modules/platforms/cpp/ignite/Makefile.am        |  39 ++
 modules/platforms/cpp/ignite/configure.ac       |  62 +++
 modules/platforms/cpp/ignite/project/README.TXT |   1 +
 .../platforms/cpp/ignite/project/vs/README.TXT  |   1 +
 .../cpp/ignite/project/vs/ignite.vcxproj        | 167 ++++++
 .../ignite/project/vs/ignite.vcxproj.filters    |  25 +
 modules/platforms/cpp/ignite/src/ignite.cpp     | 225 ++++++++
 modules/platforms/cpp/project/vs/ignite.sln     |  10 +
 .../Apache.Ignite.Benchmarks.csproj             |   7 +
 .../Apache.Ignite.Benchmarks.snk                | Bin 0 -> 596 bytes
 .../Interop/GetAsyncBenchmark.cs                |   6 +-
 .../Interop/PutAsyncBenchmark.cs                |   6 +-
 .../Interop/TaskBenchmark.cs                    |   2 +-
 .../Apache.Ignite.Benchmarks/Model/TestModel.cs |   8 +-
 .../Apache.Ignite.Core.Tests.TestDll.csproj     |   9 +
 .../Apache.Ignite.Core.Tests.TestDll.snk        | Bin 0 -> 596 bytes
 .../Apache.Ignite.Core.Tests.csproj             |   9 +
 .../Apache.Ignite.Core.Tests.snk                | Bin 0 -> 596 bytes
 .../Cache/CacheAbstractTest.cs                  | 212 ++++---
 .../Cache/CacheTestAsyncWrapper.cs              | 294 +++++++---
 .../Cache/Query/CacheQueriesTest.cs             |   8 -
 .../Continuous/ContinuousQueryAbstractTest.cs   |   2 +-
 .../Cache/Store/CacheStoreTest.cs               |  17 +-
 .../Compute/ComputeApiTest.cs                   |  34 +-
 .../Compute/ComputeMultithreadedTest.cs         |   4 +-
 .../Compute/FailoverTaskSelfTest.cs             |   2 +-
 .../Compute/IgniteExceptionTaskSelfTest.cs      |  11 +-
 .../Compute/PortableTaskTest.cs                 |  60 +-
 .../Compute/ResourceTaskTest.cs                 |   8 +-
 .../Compute/TaskAdapterTest.cs                  |   4 +-
 .../Compute/TaskResultTest.cs                   |   6 +-
 .../Dataload/DataStreamerTest.cs                |  40 +-
 .../Apache.Ignite.Core.Tests/EventsTest.cs      |  39 +-
 .../Examples/PathUtil.cs                        |   1 -
 .../Apache.Ignite.Core.Tests/ExceptionsTest.cs  |  37 +-
 .../Apache.Ignite.Core.Tests/FutureTest.cs      | 104 +---
 .../IgniteManagerTest.cs                        |   1 -
 .../Apache.Ignite.Core.Tests/LifecycleTest.cs   |   3 +-
 .../Apache.Ignite.Core.Tests/MessagingTest.cs   |  42 +-
 .../Portable/PortableApiSelfTest.cs             | 190 +++----
 .../Portable/PortableSelfTest.cs                | 333 ++++++-----
 .../Process/IgniteProcess.cs                    |   1 -
 .../SerializationTest.cs                        |   4 +-
 .../Services/ServicesAsyncWrapper.cs            |  90 +--
 .../Apache.Ignite.Core.csproj                   |  24 +-
 .../Apache.Ignite.Core/Apache.Ignite.Core.snk   | Bin 0 -> 596 bytes
 .../dotnet/Apache.Ignite.Core/Cache/ICache.cs   | 370 +++++++++++--
 .../Apache.Ignite.Core/Cache/ICacheAffinity.cs  |   4 +-
 .../Common/AsyncSupportedAttribute.cs           |  33 --
 .../Apache.Ignite.Core/Common/IAsyncSupport.cs  |  52 --
 .../dotnet/Apache.Ignite.Core/Common/IFuture.cs | 115 ----
 .../Compute/ComputeJobAdapter.cs                |   2 +-
 .../Compute/ComputeJobResultPolicy.cs           |   2 +-
 .../Compute/ComputeTaskAdapter.cs               |   6 +-
 .../ComputeTaskNoResultCacheAttribute.cs        |   2 +-
 .../Apache.Ignite.Core/Compute/ICompute.cs      | 210 ++++++-
 .../Apache.Ignite.Core/Compute/IComputeJob.cs   |   4 +-
 .../Compute/IComputeJobResult.cs                |  25 +-
 .../Apache.Ignite.Core/Compute/IComputeTask.cs  |   4 +-
 .../Datastream/IDataStreamer.cs                 |  22 +-
 .../Datastream/StreamTransformer.cs             |   2 +-
 .../Apache.Ignite.Core/Events/EventBase.cs      |   2 +-
 .../dotnet/Apache.Ignite.Core/Events/IEvents.cs |  68 ++-
 .../dotnet/Apache.Ignite.Core/Ignition.cs       |   4 +-
 .../Impl/Cache/CacheAffinityImpl.cs             |  10 +-
 .../Impl/Cache/CacheEntryFilterHolder.cs        |   4 +-
 .../Impl/Cache/CacheEntryProcessorHolder.cs     |   8 +-
 .../Cache/CacheEntryProcessorResultHolder.cs    |   3 +-
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  | 416 +++++++++-----
 .../Impl/Cache/CacheProxyImpl.cs                | 519 ------------------
 .../Continuous/ContinuousQueryFilterHolder.cs   |   7 +-
 .../Impl/Cache/Store/CacheStore.cs              |   5 +-
 .../Impl/Cluster/ClusterGroupImpl.cs            |   7 +-
 .../Impl/Cluster/ClusterMetricsImpl.cs          |   6 +-
 .../Impl/Cluster/ClusterNodeImpl.cs             |   7 +-
 .../Impl/Common/AsyncResult.cs                  |  71 ---
 .../Impl/Common/CompletedAsyncResult.cs         |  59 --
 .../Impl/Common/DelegateConverter.cs            |  30 +-
 .../Apache.Ignite.Core/Impl/Common/Future.cs    | 203 +------
 .../Impl/Common/PortableResultWrapper.cs        |  67 ---
 .../Closure/ComputeAbstractClosureTask.cs       |   4 +-
 .../Impl/Compute/Closure/ComputeActionJob.cs    |   4 +-
 .../Impl/Compute/Closure/ComputeFuncJob.cs      |  10 +-
 .../Compute/Closure/ComputeMultiClosureTask.cs  |   2 +-
 .../Impl/Compute/Closure/ComputeOutFuncJob.cs   |   4 +-
 .../Closure/ComputeReducingClosureTask.cs       |   2 +-
 .../Compute/Closure/ComputeSingleClosureTask.cs |   2 +-
 .../Apache.Ignite.Core/Impl/Compute/Compute.cs  | 135 ++++-
 .../Impl/Compute/ComputeAsync.cs                | 264 ---------
 .../Impl/Compute/ComputeFunc.cs                 |   4 +-
 .../Impl/Compute/ComputeImpl.cs                 |  40 +-
 .../Impl/Compute/ComputeJob.cs                  |   4 +-
 .../Impl/Compute/ComputeJobHolder.cs            |   6 +-
 .../Compute/ComputeJobResultGenericWrapper.cs   |  15 +-
 .../Impl/Compute/ComputeJobResultImpl.cs        |  15 +-
 .../Impl/Compute/ComputeOutFunc.cs              |   4 +-
 .../Impl/Compute/ComputeTaskHolder.cs           |  22 +-
 .../Impl/Datastream/DataStreamerBatch.cs        |  12 +-
 .../Impl/Datastream/DataStreamerImpl.cs         |  18 +-
 .../Impl/Datastream/StreamReceiverHolder.cs     |   6 +-
 .../Apache.Ignite.Core/Impl/Events/Events.cs    | 133 +++--
 .../Impl/Events/EventsAsync.cs                  | 159 ------
 .../Impl/Events/RemoteListenEventFilter.cs      |   3 +-
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs    |   4 +-
 .../Apache.Ignite.Core/Impl/IgniteManager.cs    |   4 +-
 .../Apache.Ignite.Core/Impl/IgniteUtils.cs      |   9 -
 .../Impl/Messaging/MessageListenerHolder.cs     |   4 +-
 .../Impl/Messaging/Messaging.cs                 |  97 ++--
 .../Impl/Messaging/MessagingAsync.cs            |  68 ---
 .../Apache.Ignite.Core/Impl/PlatformTarget.cs   |  21 +-
 .../Impl/Portable/DateTimeHolder.cs             |  68 +++
 .../Portable/Metadata/PortableMetadataImpl.cs   |  10 +-
 .../Impl/Portable/PortableBuilderField.cs       |  56 +-
 .../Impl/Portable/PortableBuilderImpl.cs        | 429 +++++++++++----
 .../Impl/Portable/PortableCollectionInfo.cs     | 251 ---------
 .../Impl/Portable/PortableMarshaller.cs         |   4 +-
 .../PortableOrSerializableObjectHolder.cs       |  64 ---
 .../Impl/Portable/PortableReaderExtensions.cs   |  52 ++
 .../Impl/Portable/PortableReaderImpl.cs         | 240 ++++----
 .../Impl/Portable/PortableReflectiveRoutines.cs |  51 +-
 .../Portable/PortableReflectiveSerializer.cs    |   2 +-
 .../Impl/Portable/PortableSystemHandlers.cs     | 413 +++++---------
 .../Impl/Portable/PortableUserObject.cs         |  73 +--
 .../Impl/Portable/PortableUtils.cs              | 546 ++++---------------
 .../Impl/Portable/PortableWriterImpl.cs         | 150 ++---
 .../Impl/Portable/SerializableObjectHolder.cs   |  13 +-
 .../Impl/Services/Services.cs                   | 128 +++--
 .../Impl/Services/ServicesAsync.cs              |  89 ---
 .../Impl/Transactions/AsyncTransaction.cs       |  78 ---
 .../Impl/Transactions/Transaction.cs            |  78 ++-
 .../Impl/Transactions/TransactionImpl.cs        |  47 +-
 .../Impl/Transactions/TransactionMetricsImpl.cs |   4 +-
 .../Impl/Transactions/TransactionsImpl.cs       |  10 +-
 .../Impl/Unmanaged/UnmanagedCallbacks.cs        |   6 +-
 .../Unmanaged/UnmanagedNonReleaseableTarget.cs  |   9 +-
 .../Apache.Ignite.Core/Messaging/IMessaging.cs  |  28 +-
 .../Portable/IPortableBuilder.cs                | 235 +++++++-
 .../Portable/IPortableRawReader.cs              |  57 +-
 .../Portable/IPortableRawWriter.cs              |  35 +-
 .../Portable/IPortableReader.cs                 |  73 +--
 .../Portable/IPortableWriter.cs                 |  37 +-
 .../Portable/PortableTypeNames.cs               |  10 +-
 .../Properties/AssemblyInfo.cs                  |   5 +-
 .../Apache.Ignite.Core/Services/IServices.cs    |  98 +++-
 .../Transactions/ITransaction.cs                |  16 +-
 .../dotnet/Apache.Ignite/Apache.Ignite.csproj   |   7 +
 .../dotnet/Apache.Ignite/Apache.Ignite.snk      | Bin 0 -> 596 bytes
 .../Apache.Ignite.Examples.csproj               |   7 +
 .../Apache.Ignite.Examples.snk                  | Bin 0 -> 596 bytes
 .../Datagrid/CrossPlatformExample.cs            |  14 +-
 .../Apache.Ignite.ExamplesDll.csproj            |   9 +
 .../Apache.Ignite.ExamplesDll.snk               | Bin 0 -> 596 bytes
 .../Compute/AverageSalaryTask.cs                |   2 +-
 187 files changed, 4838 insertions(+), 5247 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/383b08ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java
----------------------------------------------------------------------