You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/01/18 13:44:02 UTC

[45/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-gg-11810-1

Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-gg-11810-1

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusMetaIO.java


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

Branch: refs/heads/ignite-gg-11810-2
Commit: 8f005c3084a4ee1d6e1b2a0bba275e781edfd7ab
Parents: fcfd62a 7db65dd
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jan 17 16:59:26 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jan 17 16:59:26 2017 +0300

----------------------------------------------------------------------
 modules/cloud/pom.xml                           |   6 +-
 .../java/org/apache/ignite/IgniteLogger.java    |   4 +-
 .../apache/ignite/IgniteSystemProperties.java   |  13 +
 .../ignite/cache/affinity/AffinityKey.java      |   4 +-
 .../ignite/cache/query/SqlFieldsQuery.java      |   6 +
 .../configuration/HadoopConfiguration.java      |   2 +-
 .../configuration/IgniteConfiguration.java      |  31 +
 .../org/apache/ignite/events/CacheEvent.java    |   6 +-
 .../ignite/events/CacheQueryReadEvent.java      |   8 +-
 .../apache/ignite/hadoop/HadoopInputSplit.java  |  54 ++
 .../org/apache/ignite/hadoop/HadoopJob.java     |  74 +++
 .../ignite/hadoop/HadoopMapReducePlan.java      |  80 +++
 .../ignite/hadoop/HadoopMapReducePlanner.java   |  40 ++
 .../igfs/IgfsGroupDataBlocksKeyMapper.java      |  17 +-
 .../igfs/secondary/IgfsSecondaryFileSystem.java |  28 +
 .../local/LocalIgfsSecondaryFileSystem.java     | 130 +++-
 .../ignite/internal/GridKernalContext.java      |   7 +
 .../ignite/internal/GridKernalContextImpl.java  |  12 +
 .../apache/ignite/internal/IgniteKernal.java    |   3 +
 .../org/apache/ignite/internal/IgnitionEx.java  |  19 +
 .../internal/binary/BinaryEnumObjectImpl.java   |  10 +-
 .../ignite/internal/binary/BinaryMetadata.java  |   5 +-
 .../internal/binary/BinaryObjectExImpl.java     |   8 +-
 .../igfs/common/IgfsHandshakeRequest.java       |  17 -
 .../internal/igfs/common/IgfsMarshaller.java    |   2 -
 .../managers/communication/GridIoManager.java   |   2 +
 .../managers/communication/GridIoPolicy.java    |   3 +
 .../cache/CacheInvokeDirectResult.java          |   2 +-
 .../processors/cache/CacheInvokeResult.java     |   2 +-
 .../processors/cache/CacheLazyEntry.java        |   4 +-
 .../processors/cache/CacheObjectAdapter.java    |   7 +-
 .../processors/cache/GridCacheAdapter.java      |   5 +-
 .../cache/GridCacheMvccCandidate.java           |   9 +-
 .../processors/cache/GridCacheReturn.java       |   2 +-
 .../processors/cache/IgniteCacheProxy.java      |   2 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   2 +-
 .../GridNearAtomicAbstractUpdateFuture.java     |  34 +-
 .../GridNearAtomicSingleUpdateFuture.java       |  38 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  57 +-
 .../distributed/near/GridNearLockFuture.java    |   2 +-
 .../cache/query/GridCacheQueryAdapter.java      |   4 +-
 .../cache/query/GridCacheQueryManager.java      |  13 +-
 .../cache/query/GridCacheQueryRequest.java      |   2 +
 .../cache/query/GridCacheSqlQuery.java          |   6 +-
 .../continuous/CacheContinuousQueryEvent.java   |  10 +-
 .../continuous/CacheContinuousQueryManager.java |   4 +-
 .../store/GridCacheStoreManagerAdapter.java     |  30 +-
 .../cache/store/GridCacheWriteBehindStore.java  |   2 +-
 .../transactions/IgniteTxLocalAdapter.java      |  11 +-
 .../GridCacheVersionConflictContext.java        |   2 +-
 .../IgniteCacheObjectProcessorImpl.java         |   5 +-
 .../closure/GridClosureProcessor.java           |   6 +-
 .../continuous/GridContinuousMessage.java       |   2 +-
 .../datastreamer/DataStreamProcessor.java       |  60 +-
 .../datastreamer/DataStreamerImpl.java          |  37 +-
 .../datastructures/CollocatedSetItemKey.java    |   2 +-
 .../GridCacheAtomicLongValue.java               |   2 +
 .../GridCacheAtomicSequenceImpl.java            |   2 +
 .../GridCacheAtomicSequenceValue.java           |   2 +
 .../GridCacheCountDownLatchValue.java           |   3 +
 .../datastructures/GridCacheSetItemKey.java     |   2 +-
 .../processors/hadoop/HadoopDefaultJobInfo.java |   4 +-
 .../processors/hadoop/HadoopFileBlock.java      |   1 +
 .../processors/hadoop/HadoopInputSplit.java     |  54 --
 .../internal/processors/hadoop/HadoopJob.java   | 107 ---
 .../internal/processors/hadoop/HadoopJobEx.java | 140 ++++
 .../processors/hadoop/HadoopJobInfo.java        |  54 +-
 .../processors/hadoop/HadoopJobProperty.java    |   9 +-
 .../processors/hadoop/HadoopMapReducePlan.java  |  80 ---
 .../hadoop/HadoopMapReducePlanner.java          |  40 --
 .../processors/hadoop/HadoopTaskContext.java    |   6 +-
 .../processors/hadoop/HadoopTaskInfo.java       |   1 +
 .../hadoop/counter/HadoopCounterWriter.java     |   4 +-
 .../shuffle/HadoopDirectShuffleMessage.java     |  34 +-
 .../processors/igfs/IgfsBaseBlockKey.java       |  42 ++
 .../internal/processors/igfs/IgfsBlockKey.java  |  26 +-
 .../processors/igfs/IgfsBlockLocationImpl.java  |  55 ++
 .../processors/igfs/IgfsDataManager.java        |  12 +-
 .../internal/processors/igfs/IgfsImpl.java      |  26 +-
 .../processors/igfs/IgfsIpcHandler.java         |   4 -
 .../processors/igfs/IgfsKernalContextAware.java |  32 -
 .../processors/igfs/IgfsMetaManager.java        |   2 +-
 .../igfs/IgfsSecondaryFileSystemImpl.java       |  10 +-
 .../igfs/IgfsSecondaryFileSystemV2.java         |  40 --
 .../local/LocalFileSystemBlockKey.java          | 103 +++
 .../local/LocalFileSystemIgfsFile.java          |  10 +-
 .../LocalFileSystemPositionedReadable.java      |  65 ++
 ...fsSecondaryFileSystemPositionedReadable.java |  65 --
 .../internal/processors/job/GridJobWorker.java  |   7 +-
 .../odbc/OdbcQueryExecuteRequest.java           |   6 +-
 .../platform/PlatformNativeException.java       |   3 +-
 .../utils/PlatformConfigurationUtils.java       | 131 +++-
 .../internal/processors/pool/PoolProcessor.java |   5 +
 .../processors/query/GridQueryProcessor.java    |  37 +-
 .../processors/resource/GridResourceIoc.java    |   6 +-
 .../resource/GridResourceProcessor.java         |  31 +-
 .../processors/rest/GridRestResponse.java       |   2 +-
 .../internal/util/future/GridFutureAdapter.java |   2 +-
 .../util/lang/GridMetadataAwareAdapter.java     |   2 +-
 .../ignite/internal/util/nio/GridNioServer.java | 159 ++++-
 .../util/tostring/GridToStringBuilder.java      | 656 +++++++++++++++++--
 .../util/tostring/GridToStringInclude.java      |  12 +-
 .../util/tostring/GridToStringThreadLocal.java  |  12 +-
 .../query/VisorQueryScanSubstringFilter.java    |   5 +-
 .../internal/visor/query/VisorQueryUtils.java   |  60 ++
 .../ignite/resources/FileSystemResource.java    |  62 ++
 .../communication/tcp/TcpCommunicationSpi.java  |  20 +-
 .../tcp/TcpCommunicationSpiMBean.java           |   5 +-
 .../apache/ignite/spi/indexing/IndexingSpi.java |   3 +
 .../roundrobin/RoundRobinLoadBalancingSpi.java  |  16 +-
 .../resources/META-INF/classnames.properties    |   5 +-
 .../ignite/cache/store/jdbc/model/Person.java   |   2 +-
 ...mmunicationBalancePairedConnectionsTest.java |  28 +
 .../IgniteCommunicationBalanceTest.java         |  25 +-
 .../cache/CacheEntryProcessorCopySelfTest.java  |   6 +-
 .../GridCacheBinaryObjectsAbstractSelfTest.java |   7 +-
 ...cMessageRecoveryNoPairedConnectionsTest.java |  47 --
 ...micMessageRecoveryPairedConnectionsTest.java |  47 ++
 .../AtomicPutAllChangingTopologyTest.java       | 212 ++++++
 .../cache/query/IndexingSpiQuerySelfTest.java   | 199 +++++-
 .../DataStreamProcessorSelfTest.java            | 104 +++
 .../processors/igfs/IgfsAbstractSelfTest.java   |  18 +-
 .../igfs/IgfsDualAbstractSelfTest.java          |  26 +-
 ...SecondaryFileSystemDualAbstractSelfTest.java |   5 -
 ...fsLocalSecondaryFileSystemProxySelfTest.java |  81 +++
 ...IgfsLocalSecondaryFileSystemTestAdapter.java |   7 +-
 ...gfsSecondaryFileSystemInjectionSelfTest.java | 270 ++++++++
 .../tostring/GridToStringBuilderSelfTest.java   |  33 +-
 .../junits/GridTestKernalContext.java           |  12 +-
 .../IgniteCacheFailoverTestSuite.java           |   3 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   6 +-
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |   3 +
 .../apache/ignite/stream/flume/IgniteSink.java  |   7 +-
 modules/gce/pom.xml                             |   4 +-
 .../fs/IgniteHadoopFileSystemCounterWriter.java |   6 +-
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |  23 +-
 .../mapreduce/IgniteHadoopMapReducePlanner.java | 416 ------------
 .../IgniteHadoopWeightedMapReducePlanner.java   |  15 +-
 .../planner/HadoopAbstractMapReducePlanner.java | 118 ++++
 .../planner/HadoopTestRoundRobinMrPlanner.java  |  75 +++
 .../processors/hadoop/HadoopCommonUtils.java    |   1 +
 .../processors/hadoop/HadoopContext.java        |   2 +
 .../processors/hadoop/HadoopExternalSplit.java  |   1 +
 .../processors/hadoop/HadoopProcessor.java      |   4 +-
 .../processors/hadoop/HadoopSplitWrapper.java   |   1 +
 .../HadoopFileSystemCounterWriterDelegate.java  |   4 +-
 .../HadoopIgfsSecondaryFileSystemDelegate.java  |   4 +-
 .../hadoop/igfs/HadoopIgfsEndpoint.java         |  38 +-
 ...doopFileSystemCounterWriterDelegateImpl.java |   4 +-
 ...doopIgfsSecondaryFileSystemDelegateImpl.java |  61 +-
 .../hadoop/impl/igfs/HadoopIgfsJclLogger.java   |   9 +-
 .../hadoop/impl/igfs/HadoopIgfsOutProc.java     |  24 +-
 .../hadoop/impl/igfs/HadoopIgfsWrapper.java     |  33 +-
 .../hadoop/impl/v1/HadoopV1MapTask.java         |   6 +-
 .../hadoop/impl/v1/HadoopV1ReduceTask.java      |   4 +-
 .../hadoop/impl/v1/HadoopV1Splitter.java        |   2 +-
 .../hadoop/impl/v2/HadoopV2Context.java         |   2 +-
 .../processors/hadoop/impl/v2/HadoopV2Job.java  |  15 +-
 .../hadoop/impl/v2/HadoopV2Splitter.java        |   2 +-
 .../hadoop/impl/v2/HadoopV2TaskContext.java     |  77 ++-
 .../hadoop/jobtracker/HadoopJobMetadata.java    |   4 +-
 .../hadoop/jobtracker/HadoopJobTracker.java     |  32 +-
 .../planner/HadoopAbstractMapReducePlanner.java | 116 ----
 .../planner/HadoopDefaultMapReducePlan.java     |   4 +-
 .../hadoop/shuffle/HadoopShuffle.java           |   4 +-
 .../hadoop/shuffle/HadoopShuffleJob.java        |  66 +-
 .../shuffle/direct/HadoopDirectDataInput.java   |  75 ++-
 .../shuffle/direct/HadoopDirectDataOutput.java  |  14 +
 .../direct/HadoopDirectDataOutputContext.java   |  48 +-
 .../direct/HadoopDirectDataOutputState.java     |  14 +-
 .../shuffle/streams/HadoopDataInStream.java     |  34 +-
 .../shuffle/streams/HadoopOffheapBuffer.java    |  18 +
 .../HadoopEmbeddedTaskExecutor.java             |   8 +-
 .../hadoop/taskexecutor/HadoopRunnableTask.java |   6 +-
 .../taskexecutor/HadoopTaskExecutorAdapter.java |   8 +-
 .../external/HadoopExternalTaskExecutor.java    |  16 +-
 .../child/HadoopChildProcessRunner.java         |   4 +-
 .../resources/META-INF/classnames.properties    |   8 +
 .../impl/HadoopAbstractMapReduceTest.java       |   2 +-
 .../hadoop/impl/HadoopAbstractSelfTest.java     |   3 +-
 .../hadoop/impl/HadoopCommandLineTest.java      |   4 +-
 .../HadoopDefaultMapReducePlannerSelfTest.java  | 619 -----------------
 .../hadoop/impl/HadoopJobTrackerSelfTest.java   |   1 +
 .../hadoop/impl/HadoopPlannerMockJob.java       |  10 +-
 .../impl/HadoopTaskExecutionSelfTest.java       |  19 +-
 .../hadoop/impl/HadoopTasksAllVersionsTest.java |  16 +-
 .../hadoop/impl/HadoopTasksV1Test.java          |   4 +-
 .../hadoop/impl/HadoopTasksV2Test.java          |   4 +-
 .../hadoop/impl/HadoopTeraSortTest.java         |  32 +-
 .../impl/HadoopTestRoundRobinMrPlanner.java     |  75 ---
 .../hadoop/impl/HadoopTestTaskContext.java      |   6 +-
 .../hadoop/impl/HadoopV2JobSelfTest.java        |   6 +-
 .../HadoopWeightedMapReducePlannerTest.java     |   6 +-
 .../client/HadoopClientProtocolSelfTest.java    |   2 +-
 .../impl/igfs/Hadoop1DualAbstractTest.java      |   7 +-
 .../impl/igfs/Hadoop1OverIgfsProxyTest.java     |  67 ++
 .../igfs/HadoopFIleSystemFactorySelfTest.java   |   6 +-
 ...Igfs20FileSystemLoopbackPrimarySelfTest.java |   2 +-
 ...oopIgfs20FileSystemShmemPrimarySelfTest.java |   2 +-
 .../igfs/HadoopIgfsDualAbstractSelfTest.java    |   6 +-
 ...oopSecondaryFileSystemConfigurationTest.java |   4 +-
 .../hadoop/impl/igfs/IgfsEventsTestSuite.java   |   4 +-
 .../IgniteHadoopFileSystemAbstractSelfTest.java |   4 +-
 .../IgniteHadoopFileSystemClientSelfTest.java   |   2 +-
 ...IgniteHadoopFileSystemHandshakeSelfTest.java |  32 +-
 ...niteHadoopFileSystemLoggerStateSelfTest.java |   6 +-
 ...condaryFileSystemInitializationSelfTest.java |   4 +-
 .../collections/HadoopAbstractMapTest.java      |   4 +-
 .../streams/HadoopDataStreamSelfTest.java       | 177 ++++-
 .../testsuites/IgniteHadoopTestSuite.java       |   4 +-
 ...niteCacheAbstractInsertSqlQuerySelfTest.java |  14 +-
 .../IgniteCacheAbstractSqlDmlQuerySelfTest.java |   6 +-
 .../IgniteCacheInsertSqlQuerySelfTest.java      |  18 +-
 .../cache/IgniteCacheMergeSqlQuerySelfTest.java |  14 +-
 .../IgniteCacheUpdateSqlQuerySelfTest.java      |   4 +-
 .../org/apache/ignite/logger/jcl/JclLogger.java |   9 +-
 modules/platforms/cpp/binary/Makefile.am        |   2 +-
 .../ignite/impl/binary/binary_type_manager.h    |   2 +-
 .../src/impl/binary/binary_type_manager.cpp     |   6 +-
 .../binary/src/impl/interop/interop_memory.cpp  |   2 +-
 modules/platforms/cpp/common/Makefile.am        |   2 +-
 .../include/ignite/common/dynamic_size_array.h  |   2 +-
 .../cpp/common/project/vs/common.vcxproj        |   1 +
 modules/platforms/cpp/configure.ac              |   2 +-
 modules/platforms/cpp/configure.acrel           |   2 +-
 modules/platforms/cpp/core-test/Makefile.am     |   2 +-
 .../cpp/core-test/src/cache_query_test.cpp      |   8 +-
 .../cpp/core-test/src/reference_test.cpp        |  14 +-
 modules/platforms/cpp/core/Makefile.am          |   2 +-
 .../cache/query/continuous/continuous_query.h   |   8 +-
 .../include/ignite/cache/query/query_cursor.h   |   4 +-
 .../query/continuous/continuous_query_impl.h    |   8 +-
 .../core/include/ignite/impl/handle_registry.h  |   2 +-
 .../cpp/core/include/ignite/impl/operations.h   |   4 +-
 .../cpp/core/src/impl/cache/cache_impl.cpp      |   5 +-
 .../cpp/core/src/impl/handle_registry.cpp       |   2 +-
 modules/platforms/cpp/examples/configure.ac     |   2 +-
 .../cpp/examples/odbc-example/Makefile.am       |   2 +-
 .../cpp/examples/putget-example/Makefile.am     |   2 +-
 .../cpp/examples/query-example/Makefile.am      |   2 +-
 modules/platforms/cpp/ignite/Makefile.am        |   2 +-
 modules/platforms/cpp/jni/Makefile.am           |   2 +-
 .../platforms/cpp/jni/project/vs/jni.vcxproj    |   1 +
 modules/platforms/cpp/jni/src/java.cpp          |   2 +-
 modules/platforms/cpp/odbc-test/Makefile.am     |   2 +-
 .../cpp/odbc-test/config/queries-default.xml    |   1 +
 .../odbc-test/include/sql_test_suite_fixture.h  |   3 +
 .../platforms/cpp/odbc-test/include/test_type.h |  20 +-
 .../cpp/odbc-test/src/api_robustness_test.cpp   | 113 +++-
 .../platforms/cpp/odbc-test/src/column_test.cpp | 189 ++++++
 .../odbc-test/src/sql_test_suite_fixture.cpp    |  17 +
 .../cpp/odbc-test/src/sql_types_test.cpp        | 131 ++++
 modules/platforms/cpp/odbc/Makefile.am          |   5 +-
 modules/platforms/cpp/odbc/include/Makefile.am  |   3 +-
 .../cpp/odbc/include/ignite/odbc/common_types.h |  29 +-
 .../ignite/odbc/config/connection_info.h        |   2 -
 .../cpp/odbc/include/ignite/odbc/log.h          | 123 ++++
 .../odbc/include/ignite/odbc/meta/column_meta.h |   2 -
 .../cpp/odbc/include/ignite/odbc/statement.h    | 143 +++-
 .../cpp/odbc/include/ignite/odbc/utility.h      |  26 +-
 .../cpp/odbc/install/ignite-odbc-amd64.wxs      |   2 +-
 .../cpp/odbc/install/ignite-odbc-x86.wxs        |   2 +-
 .../odbc/os/linux/src/system/socket_client.cpp  |   9 +-
 .../odbc/os/win/src/system/socket_client.cpp    |   9 +-
 .../src/system/ui/dsn_configuration_window.cpp  |  18 +-
 .../cpp/odbc/os/win/src/system_dsn.cpp          |  17 +-
 .../platforms/cpp/odbc/project/vs/odbc.vcxproj  |   2 +
 .../cpp/odbc/project/vs/odbc.vcxproj.filters    |   6 +
 modules/platforms/cpp/odbc/src/column.cpp       |  28 +-
 .../cpp/odbc/src/config/connection_info.cpp     |   9 +-
 modules/platforms/cpp/odbc/src/connection.cpp   |  21 +-
 .../odbc/src/diagnostic/diagnosable_adapter.cpp |   3 +-
 .../odbc/src/diagnostic/diagnostic_record.cpp   |  38 ++
 modules/platforms/cpp/odbc/src/entry_points.cpp |  52 +-
 modules/platforms/cpp/odbc/src/log.cpp          |  83 +++
 .../platforms/cpp/odbc/src/meta/column_meta.cpp |   4 -
 modules/platforms/cpp/odbc/src/odbc.cpp         | 286 ++++----
 .../odbc/src/query/column_metadata_query.cpp    |  13 +-
 .../platforms/cpp/odbc/src/query/data_query.cpp |  23 +-
 .../cpp/odbc/src/query/table_metadata_query.cpp |  12 +-
 modules/platforms/cpp/odbc/src/statement.cpp    | 187 +++++-
 modules/platforms/cpp/odbc/src/utility.cpp      |  29 +-
 .../Apache.Ignite.AspNet.Tests.csproj           |   7 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Apache.Ignite.AspNet.csproj                 |   5 +
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Apache.Ignite.Benchmarks.csproj             |   5 +
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Apache.Ignite.Core.Tests.TestDll.csproj     |   5 +
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Apache.Ignite.Core.Tests.csproj             |  10 +
 .../Binary/BinaryBuilderSelfTest.cs             | 159 +++--
 .../BinaryBuilderSelfTestArrayIdentity.cs       |  34 +
 .../Binary/BinaryEqualityComparerTest.cs        | 279 ++++++++
 .../Binary/IO/BinaryStreamsTest.cs              |  19 +
 .../Cache/CacheAbstractTest.cs                  | 627 +-----------------
 .../Cache/CacheAbstractTransactionalTest.cs     | 565 ++++++++++++++++
 .../Cache/CacheConfigurationTest.cs             |   5 +-
 .../Cache/CacheLocalAtomicTest.cs               |   5 -
 .../Cache/CacheLocalTest.cs                     |   6 +-
 .../CachePartitionedAtomicNearEnabledTest.cs    |   5 -
 .../Cache/CachePartitionedAtomicTest.cs         |   5 -
 .../Cache/CachePartitionedNearEnabledTest.cs    |   7 +-
 .../Cache/CachePartitionedTest.cs               |   7 +-
 .../Cache/CacheReplicatedAtomicTest.cs          |   5 -
 .../Cache/CacheReplicatedTest.cs                |   7 +-
 .../Cache/Query/CacheDmlQueriesTest.cs          | 296 +++++++++
 .../Query/CacheQueriesCodeConfigurationTest.cs  |   4 +-
 .../IgniteConfigurationSerializerTest.cs        |  46 +-
 .../IgniteConfigurationTest.cs                  |  28 +
 .../Log/ConcurrentMemoryTarget.cs               |  73 +++
 .../Log/NLogLoggerTest.cs                       |   5 +-
 .../Apache.Ignite.Core.Tests/MessagingTest.cs   |   6 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Apache.Ignite.Core.Tests/ReconnectTest.cs   |   5 +
 .../Apache.Ignite.Core.Tests/TestUtils.cs       |   1 -
 .../Apache.Ignite.Core.csproj                   |  21 +-
 .../Binary/BinaryArrayEqualityComparer.cs       | 149 +++++
 .../Binary/BinaryConfiguration.cs               |  24 +
 .../Binary/BinaryTypeConfiguration.cs           |  14 +
 .../Cache/Configuration/QueryEntity.cs          |  33 +-
 .../Cache/Configuration/QueryField.cs           |   6 +
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |  85 ++-
 .../IgniteConfigurationSection.xsd              |  19 +
 .../Apache.Ignite.Core/Impl/Binary/Binary.cs    |  28 +-
 .../Binary/BinaryEqualityComparerSerializer.cs  |  99 +++
 .../Impl/Binary/BinaryFieldEqualityComparer.cs  | 138 ++++
 .../Impl/Binary/BinaryFullTypeDescriptor.cs     |  21 +-
 .../Impl/Binary/BinaryObject.cs                 |  31 +-
 .../Impl/Binary/BinaryObjectBuilder.cs          |  62 +-
 .../Impl/Binary/BinaryObjectHeader.cs           |  21 +-
 .../Impl/Binary/BinaryObjectSchemaHolder.cs     |  22 +
 .../Impl/Binary/BinaryReader.cs                 |  16 +-
 .../Binary/BinarySurrogateTypeDescriptor.cs     |   6 +
 .../Impl/Binary/BinarySystemHandlers.cs         |   6 +-
 .../Impl/Binary/BinaryWriter.cs                 |  11 +-
 .../Impl/Binary/DateTimeHolder.cs               |  35 +-
 .../Impl/Binary/IBinaryEqualityComparer.cs      |  53 ++
 .../Impl/Binary/IBinaryTypeDescriptor.cs        |   5 +
 .../Impl/Binary/Io/BinaryHeapStream.cs          |   9 +
 .../Impl/Binary/Io/BinaryStreamBase.cs          |  13 +
 .../Impl/Binary/Io/IBinaryStream.cs             |  11 +-
 .../Impl/Binary/Io/IBinaryStreamProcessor.cs    |  36 +
 .../Impl/Binary/Marshaller.cs                   |  22 +-
 .../Impl/Binary/SerializableObjectHolder.cs     |  16 +
 .../Common/IgniteConfigurationXmlSerializer.cs  |   5 +-
 .../Impl/Memory/PlatformMemoryStream.cs         |  16 +
 .../Impl/Transactions/TransactionsImpl.cs       |  18 +
 .../Impl/Unmanaged/UnmanagedUtils.cs            |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Transactions/ITransactions.cs               |  19 +-
 .../Apache.Ignite.EntityFramework.Tests.csproj  |   5 +
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Apache.Ignite.EntityFramework.csproj        |   9 +-
 .../Impl/ArrayDbDataReader.cs                   |   5 +
 .../Impl/DataReaderResult.cs                    |   2 +
 .../Impl/DbCommandInfo.cs                       |  11 +
 .../Impl/DbCommandProxy.cs                      |   1 +
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Apache.Ignite.Linq.csproj                   |   5 +
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Apache.Ignite.Log4Net.csproj                |   5 +
 .../IgniteLog4NetLogger.cs                      |  16 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Apache.Ignite.NLog.csproj                   |   5 +
 .../Properties/AssemblyInfo.cs                  |   4 +-
 modules/platforms/dotnet/Apache.Ignite.sln      |   3 +
 .../dotnet/Apache.Ignite/Apache.Ignite.csproj   |   5 +
 .../Apache.Ignite/Properties/AssemblyInfo.cs    |   4 +-
 modules/platforms/dotnet/README.md              |   6 +-
 modules/platforms/dotnet/build.ps1              |   2 +-
 .../Apache.Ignite.Examples.csproj               |   3 +
 .../examples/Apache.Ignite.Examples/App.config  |   2 +
 .../DataStructures/AtomicSequenceExample.cs     |  26 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Apache.Ignite.ExamplesDll.csproj            |   4 +
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Services/MapService.cs                      |   2 -
 .../apache/ignite/logger/slf4j/Slf4jLogger.java |  11 +-
 modules/web-console/backend/app/mongo.js        |  19 +
 .../generator/AbstractTransformer.js            |   5 +
 .../modules/configuration/generator/Beans.js    |   4 +
 .../generator/ConfigurationGenerator.js         |  36 +
 .../states/configuration/caches/affinity.jade   |  82 +++
 .../states/configuration/caches/memory.jade     |   4 +-
 .../frontend/views/configuration/caches.jade    |   1 +
 .../yardstick/cache/IgniteIoTestBenchmark.java  |  73 ---
 parent/pom.xml                                  |   2 +-
 389 files changed, 8640 insertions(+), 3856 deletions(-)
----------------------------------------------------------------------