You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/08/23 09:39:11 UTC

[02/12] ignite git commit: Merge branch 'master' of github.com:gridgain/apache-ignite

Merge branch 'master' of github.com:gridgain/apache-ignite


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

Branch: refs/heads/ignite-3716-1
Commit: f376cbbba26d75a623c6754aab7b79bad8a16fdb
Parents: 37f2289 354318a
Author: Andrey V. Mashenkov <an...@gmail.com>
Authored: Mon Aug 22 13:11:28 2016 +0300
Committer: Andrey V. Mashenkov <an...@gmail.com>
Committed: Mon Aug 22 13:11:28 2016 +0300

----------------------------------------------------------------------
 .../hibernate/HibernateL2CacheExample.java      |    2 +-
 .../internal/jdbc2/JdbcResultSetSelfTest.java   |    4 +-
 .../ignite/jdbc/JdbcResultSetSelfTest.java      |    4 +-
 .../org/apache/ignite/IgniteFileSystem.java     |   27 +-
 .../apache/ignite/IgniteSystemProperties.java   |   10 +
 .../affinity/fair/FairAffinityFunction.java     |    6 +-
 .../rendezvous/RendezvousAffinityFunction.java  |    4 +
 .../store/jdbc/CacheAbstractJdbcStore.java      |   43 +-
 .../store/jdbc/dialect/BasicJdbcDialect.java    |    7 +-
 .../cache/store/jdbc/dialect/JdbcDialect.java   |   11 +-
 .../cache/store/jdbc/dialect/MySQLDialect.java  |   18 +-
 .../igfs/secondary/IgfsSecondaryFileSystem.java |    2 +-
 .../local/LocalIgfsSecondaryFileSystem.java     |  396 +++++++
 .../igfs/secondary/local/package-info.java      |   22 +
 .../ignite/igfs/secondary/package-info.java     |    2 +-
 .../internal/GridEventConsumeHandler.java       |    5 +
 .../internal/GridMessageListenHandler.java      |    5 +
 .../internal/binary/BinaryClassDescriptor.java  |   43 +-
 .../ignite/internal/binary/BinaryContext.java   |   21 +-
 .../binary/BinaryMethodWriteReplacer.java       |   59 +
 .../ignite/internal/binary/BinaryTreeMap.java   |   96 ++
 .../binary/BinaryTreeMapWriteReplacer.java      |   34 +
 .../ignite/internal/binary/BinaryTreeSet.java   |   93 ++
 .../binary/BinaryTreeSetWriteReplacer.java      |   34 +
 .../ignite/internal/binary/BinaryUtils.java     |   37 +-
 .../internal/binary/BinaryWriteReplacer.java    |   33 +
 .../internal/binary/BinaryWriterExImpl.java     |   35 +-
 .../internal/cluster/IgniteClusterImpl.java     |    9 +-
 .../logger/platform/PlatformLogger.java         |  223 ++++
 .../discovery/GridDiscoveryManager.java         |    3 +-
 .../processors/cache/GridCacheContext.java      |    8 +
 .../processors/cache/GridCacheIoManager.java    |   24 +-
 .../processors/cache/GridCacheMessage.java      |    2 +-
 .../binary/CacheObjectBinaryProcessorImpl.java  |   19 +
 .../distributed/GridCacheTxRecoveryFuture.java  |    6 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |    4 +-
 .../distributed/dht/GridDhtLockFuture.java      |    6 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |    6 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  176 ++-
 .../colocated/GridDhtColocatedLockFuture.java   |    6 +-
 .../distributed/near/GridNearLockFuture.java    |    6 +-
 ...arOptimisticSerializableTxPrepareFuture.java |    6 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |    6 +-
 .../GridNearPessimisticTxPrepareFuture.java     |    8 +-
 .../near/GridNearTransactionalCache.java        |    2 +-
 .../near/GridNearTxFinishFuture.java            |   34 +-
 .../cache/distributed/near/GridNearTxLocal.java |   14 +-
 .../continuous/CacheContinuousQueryEntry.java   |   16 +-
 .../continuous/CacheContinuousQueryHandler.java |   85 +-
 .../cache/transactions/IgniteTxHandler.java     |    1 -
 .../continuous/GridContinuousHandler.java       |    5 +
 .../continuous/GridContinuousProcessor.java     |   11 +-
 .../continuous/GridContinuousQueryBatch.java    |   47 +
 .../internal/processors/igfs/IgfsAsyncImpl.java |    5 +
 .../ignite/internal/processors/igfs/IgfsEx.java |    7 +
 .../internal/processors/igfs/IgfsFileImpl.java  |   20 +-
 .../internal/processors/igfs/IgfsImpl.java      |    8 +-
 .../processors/igfs/IgfsMetaManager.java        |    2 +-
 .../processors/igfs/IgfsOutputStreamImpl.java   |    7 +-
 .../internal/processors/igfs/IgfsUtils.java     |   53 +
 .../local/LocalFileSystemIgfsFile.java          |  134 +++
 ...fsSecondaryFileSystemPositionedReadable.java |   65 ++
 .../platform/PlatformAbstractBootstrap.java     |   18 +-
 .../platform/PlatformAbstractTarget.java        |   17 +-
 .../platform/PlatformConfigurationEx.java       |    6 +
 .../platform/PlatformNoopProcessor.java         |   10 +
 .../processors/platform/PlatformProcessor.java  |   16 +
 .../platform/PlatformProcessorImpl.java         |   56 +
 .../platform/cache/PlatformCache.java           |  335 +++---
 .../callback/PlatformCallbackGateway.java       |   45 +
 .../callback/PlatformCallbackUtils.java         |   20 +
 .../cpp/PlatformCppConfigurationEx.java         |    6 +
 .../dotnet/PlatformDotNetBootstrap.java         |    9 +
 .../dotnet/PlatformDotNetCacheStore.java        |   12 +-
 .../PlatformDotNetConfigurationClosure.java     |   11 +-
 .../dotnet/PlatformDotNetConfigurationEx.java   |   12 +-
 .../utils/PlatformConfigurationUtils.java       |   57 +-
 .../platform/utils/PlatformFutureUtils.java     |    6 +-
 .../platform/utils/PlatformUtils.java           |   25 +
 .../handlers/query/QueryCommandHandler.java     |   16 +-
 .../rest/request/RestQueryRequest.java          |    2 +-
 .../ignite/internal/util/GridJavaProcess.java   |    5 +-
 .../util/future/GridCompoundFuture.java         |   90 +-
 .../util/nio/GridTcpNioCommunicationClient.java |    5 +-
 .../visor/cache/VisorCacheTypeMetadata.java     |   20 +-
 .../internal/visor/util/VisorTaskUtils.java     |    8 +
 .../communication/tcp/TcpCommunicationSpi.java  |   49 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java    |    8 +-
 .../AbstractAffinityFunctionSelfTest.java       |   18 +-
 .../IgniteLocalNodeMapBeforeStartTest.java      |   82 ++
 .../internal/binary/BinaryTreeSelfTest.java     |  341 ++++++
 .../CacheSerializableTransactionsTest.java      |    5 +
 .../CacheTxNotAllowReadFromBackupTest.java      |  297 +++++
 .../IgniteCacheConnectionRecoveryTest.java      |  205 ++++
 .../IgniteCacheMessageRecoveryAbstractTest.java |   14 +-
 ...gniteCacheMessageRecoveryIdleConnection.java |  154 ---
 ...eCacheMessageRecoveryIdleConnectionTest.java |  157 +++
 .../rebalancing/CacheNodeSafeAssertion.java     |  118 ++
 ...cheRebalancingPartitionDistributionTest.java |  149 +++
 .../CacheEntryProcessorNonSerializableTest.java |  410 +++++++
 ...niteCacheContinuousQueryBackupQueueTest.java |  184 ++-
 ...teCacheContinuousQueryNoUnsubscribeTest.java |  153 +++
 ...faultIgfsSecondaryFileSystemTestAdapter.java |  117 ++
 .../processors/igfs/IgfsAbstractSelfTest.java   | 1057 ++++++++++--------
 .../igfs/IgfsBackupFailoverSelfTest.java        |    2 +-
 .../igfs/IgfsDualAbstractSelfTest.java          |  252 +----
 .../igfs/IgfsExUniversalFileSystemAdapter.java  |  116 --
 ...SecondaryFileSystemDualAbstractSelfTest.java |   76 ++
 ...ondaryFileSystemDualAsyncClientSelfTest.java |   28 +
 ...calSecondaryFileSystemDualAsyncSelfTest.java |   32 +
 ...condaryFileSystemDualSyncClientSelfTest.java |   28 +
 ...ocalSecondaryFileSystemDualSyncSelfTest.java |   32 +
 ...IgfsLocalSecondaryFileSystemTestAdapter.java |  141 +++
 .../internal/processors/igfs/IgfsMock.java      |    5 +
 .../IgfsSecondaryFileSystemTestAdapter.java     |  118 ++
 .../igfs/UniversalFileSystemAdapter.java        |  109 --
 .../query/GridQueryCommandHandlerTest.java      |  191 ++++
 .../assertions/AlwaysAssertion.java             |   29 +
 .../testframework/assertions/Assertion.java     |   31 +
 .../testframework/assertions/package-info.java  |   22 +
 .../testframework/junits/GridAbstractTest.java  |   10 +-
 .../common/GridRollingRestartAbstractTest.java  |  324 ++++++
 .../junits/multijvm/IgniteProcessProxy.java     |   24 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |    3 +-
 .../IgniteBinaryObjectsTestSuite.java           |    2 +
 .../IgniteCacheFailoverTestSuite.java           |    2 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |    8 +-
 .../testsuites/IgniteCacheTestSuite4.java       |    2 +
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |    9 +
 .../testsuites/IgniteRestHandlerTestSuite.java  |    2 +
 modules/docker/1.7.0/Dockerfile                 |   44 +
 modules/docker/1.7.0/run.sh                     |   51 +
 modules/docker/Dockerfile                       |    2 +-
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |    2 +-
 .../ignite/igfs/Hadoop1DualAbstractTest.java    |    3 +-
 ...oopFileSystemUniversalFileSystemAdapter.java |  139 ---
 .../igfs/HadoopIgfsDualAbstractSelfTest.java    |    2 +-
 ...adoopIgfsSecondaryFileSystemTestAdapter.java |  149 +++
 .../query/h2/GridH2ResultSetIterator.java       |   62 +-
 .../processors/query/h2/IgniteH2Indexing.java   |    4 +-
 .../processors/query/h2/opt/GridH2Row.java      |    2 +-
 .../query/h2/opt/GridH2ValueCacheObject.java    |   11 +-
 .../query/h2/twostep/GridMapQueryExecutor.java  |   34 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |    3 +-
 .../cache/CacheSqlQueryValueCopySelfTest.java   |  226 ++++
 .../ClientReconnectAfterClusterRestartTest.java |  225 ++++
 .../IgniteCacheAbstractFieldsQuerySelfTest.java |    2 +-
 ...eLockPartitionOnAffinityRunAbstractTest.java |   17 +
 .../IgniteCacheLocalFieldsQuerySelfTest.java    |   16 +
 .../h2/GridIndexingSpiAbstractSelfTest.java     |    2 +-
 .../IgniteCacheQuerySelfTestSuite2.java         |    2 +
 .../IgniteCacheQuerySelfTestSuite3.java         |    2 +
 .../IgniteCacheWithIndexingTestSuite.java       |    5 +-
 .../include/ignite/impl/binary/binary_utils.h   |   87 ++
 .../src/impl/binary/binary_reader_impl.cpp      |   30 +-
 .../ignite/impl/interop/interop_target.h        |   15 +-
 .../cpp/core/include/ignite/impl/operations.h   |   47 +-
 .../cpp/core/src/impl/cache/cache_impl.cpp      |   14 +-
 .../core/src/impl/interop/interop_target.cpp    |   41 +-
 .../src/impl/transactions/transactions_impl.cpp |    5 +
 .../cpp/jni/include/ignite/jni/exports.h        |    2 +
 .../platforms/cpp/jni/include/ignite/jni/java.h |   13 +
 modules/platforms/cpp/jni/project/vs/module.def |    3 +-
 modules/platforms/cpp/jni/src/exports.cpp       |   12 +-
 modules/platforms/cpp/jni/src/java.cpp          |   72 +-
 .../Apache.Ignite.Benchmarks/BenchmarkRunner.cs |    5 +-
 .../Interop/PlatformBenchmarkBase.cs            |    2 +-
 .../Apache.Ignite.Core.Tests.NuGet.csproj       |    9 +-
 .../packages.config                             |    1 +
 .../Apache.Ignite.Core.Tests.csproj             |   31 +-
 .../Binary/BinaryBuilderSelfTest.cs             |   24 +-
 .../Binary/BinaryReaderWriterTest.cs            |  171 +++
 .../Binary/BinaryStringTest.cs                  |   26 +-
 .../Binary/IO/BinaryStreamsTest.cs              |  151 +++
 .../Binary/JavaTypeMappingTest.cs               |  158 +++
 .../Binary/TypeResolverTest.cs                  |  107 ++
 .../Cache/Affinity/AffinityKeyTest.cs           |   66 ++
 .../Affinity/AffinityTopologyVersionTest.cs     |   59 +
 .../Cache/CacheAbstractTest.cs                  |   64 +-
 .../Cache/CacheResultTest.cs                    |   75 ++
 .../Query/CacheQueriesCodeConfigurationTest.cs  |   12 +
 .../Cache/Query/CacheQueriesTest.cs             |   45 +-
 .../Continuous/ContinuousQueryAbstractTest.cs   |   42 +-
 .../Cache/Store/CacheParallelLoadStoreTest.cs   |    2 +-
 .../Cache/Store/CacheStoreAdapterTest.cs        |   90 ++
 .../Cache/Store/CacheStoreTest.cs               |   39 +-
 .../Cache/Store/CacheTestParallelLoadStore.cs   |    9 +
 .../Cache/Store/CacheTestStore.cs               |   50 +-
 .../Collections/MultiValueDictionaryTest.cs     |   58 +
 .../Collections/ReadOnlyCollectionTest.cs       |   59 +
 .../Collections/ReadOnlyDictionaryTest.cs       |   70 ++
 .../Common/IgniteGuidTest.cs                    |   62 +
 .../Compute/AbstractTaskTest.cs                 |   40 +-
 .../Compute/BinarizableClosureTaskTest.cs       |   18 +-
 .../Compute/BinarizableTaskTest.cs              |   18 +-
 .../Compute/CancellationTest.cs                 |   10 +
 .../Compute/ClosureTaskTest.cs                  |  192 +---
 .../Compute/ComputeApiTest.cs                   |   92 +-
 .../Compute/FailoverTaskSelfTest.cs             |    5 +-
 .../Compute/IgniteExceptionTaskSelfTest.cs      |   43 +-
 .../Compute/ResourceTaskTest.cs                 |   51 +
 .../Compute/SerializableClosureTaskTest.cs      |    5 +
 .../Compute/TaskAdapterTest.cs                  |    5 +-
 .../Compute/TaskResultTest.cs                   |   14 +-
 .../Config/Compute/compute-standalone.xml       |    1 +
 .../Config/Log/custom-log.xml                   |   50 +
 .../Config/Log/dotnet-log4j.xml                 |  143 +++
 .../Config/cache-query.xml                      |   38 +-
 .../Apache.Ignite.Core.Tests/EventsTest.cs      |  192 +++-
 .../Examples/ExamplesTest.cs                    |    2 +-
 .../Apache.Ignite.Core.Tests/ExceptionsTest.cs  |   46 +
 .../IgniteConfigurationSerializerTest.cs        |   24 +
 .../Log/CustomLoggerTest.cs                     |  449 ++++++++
 .../Log/DefaultLoggerTest.cs                    |  114 ++
 .../Apache.Ignite.Core.Tests/TestUtils.cs       |   36 +-
 .../TypeResolverTest.cs                         |  107 --
 .../Apache.Ignite.Core.Tests/packages.config    |    4 +
 .../Apache.Ignite.Core.csproj                   |    9 +-
 .../Cache/Affinity/AffinityKey.cs               |   11 +
 .../Cache/CachePartialUpdateException.cs        |    6 +-
 .../Cache/Configuration/CacheConfiguration.cs   |   19 +-
 .../Cache/Configuration/QueryEntity.cs          |   25 +-
 .../Cache/Configuration/QueryField.cs           |   19 +-
 .../Store/CacheParallelLoadStoreAdapter.cs      |    7 +
 .../Apache.Ignite.Core/Common/JavaException.cs  |    1 +
 .../dotnet/Apache.Ignite.Core/IIgnite.cs        |    8 +
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |   25 +
 .../IgniteConfigurationSection.xsd              |   12 +
 .../dotnet/Apache.Ignite.Core/Ignition.cs       |   39 +-
 .../Impl/Binary/BinaryObject.cs                 |    2 +
 .../Impl/Binary/BinaryObjectBuilder.cs          |    2 +-
 .../Impl/Binary/BinaryObjectHandle.cs           |   59 -
 .../Impl/Binary/BinaryObjectHeader.cs           |    5 +-
 .../Binary/BinarySurrogateTypeDescriptor.cs     |    2 +-
 .../Impl/Binary/BinaryWriter.cs                 |   20 -
 .../Impl/Binary/Io/BinaryStreamAdapter.cs       |    5 +
 .../Impl/Binary/Io/BinaryStreamBase.cs          |   11 +-
 .../Impl/Binary/Io/IBinaryStream.cs             |    2 +-
 .../Apache.Ignite.Core/Impl/Binary/JavaTypes.cs |   75 +-
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |  239 ++--
 .../Cache/Event/JavaCacheEntryEventFilter.cs    |    2 +
 .../Impl/Collections/MultiValueDictionary.cs    |   26 -
 .../Impl/Collections/ReadOnlyDictionary.cs      |    2 +-
 .../Apache.Ignite.Core/Impl/Common/Classpath.cs |   12 +-
 .../Impl/Common/IgniteHome.cs                   |   30 +-
 .../Apache.Ignite.Core/Impl/Common/Logger.cs    |   37 -
 .../Impl/Common/ResizeableArray.cs              |   64 --
 .../Impl/Events/EventTypeConverter.cs           |    3 +
 .../Apache.Ignite.Core/Impl/Events/Events.cs    |    3 +
 .../Apache.Ignite.Core/Impl/ExceptionUtils.cs   |   11 +-
 .../Apache.Ignite.Core/Impl/Handle/Handle.cs    |   12 +-
 .../Impl/Handle/HandleRegistry.cs               |   19 +-
 .../Apache.Ignite.Core/Impl/Handle/IHandle.cs   |    5 -
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs    |    9 +
 .../Apache.Ignite.Core/Impl/IgniteManager.cs    |    6 +-
 .../Apache.Ignite.Core/Impl/IgniteProxy.cs      |    8 +
 .../Apache.Ignite.Core/Impl/IgniteUtils.cs      |   48 +-
 .../Impl/InteropExceptionHolder.cs              |   88 --
 .../Apache.Ignite.Core/Impl/Log/JavaLogger.cs   |  110 ++
 .../Impl/Memory/PlatformMemoryUtils.cs          |   30 -
 .../Impl/Memory/PlatformRawMemory.cs            |    5 +
 .../Apache.Ignite.Core/Impl/PlatformTarget.cs   |   88 +-
 .../Impl/Unmanaged/IgniteJniNativeMethods.cs    |    7 +
 .../Impl/Unmanaged/UnmanagedCallbackHandlers.cs |    3 +
 .../Impl/Unmanaged/UnmanagedCallbacks.cs        |  108 +-
 .../Impl/Unmanaged/UnmanagedUtils.cs            |   27 +-
 .../Apache.Ignite.Core/Log/CategoryLogger.cs    |   82 ++
 .../dotnet/Apache.Ignite.Core/Log/ILogger.cs    |   51 +
 .../dotnet/Apache.Ignite.Core/Log/LogLevel.cs   |   53 +
 .../Apache.Ignite.Core/Log/LoggerExtensions.cs  |  320 ++++++
 .../Datagrid/LinqExample.cs                     |  209 +++-
 .../Datagrid/QueryExample.cs                    |  189 +++-
 .../Apache.Ignite.ExamplesDll.csproj            |    1 -
 .../Binary/Employee.cs                          |   10 +-
 .../Binary/EmployeeKey.cs                       |   88 --
 .../parser/dialect/DatabaseMetadataDialect.java |   18 +
 .../parser/dialect/JdbcMetadataDialect.java     |    5 +-
 .../parser/dialect/OracleMetadataDialect.java   |    5 +-
 .../ignite/schema/generator/CodeGenerator.java  |    7 +-
 .../schema/parser/DatabaseMetadataParser.java   |    4 +-
 .../ignite/schema/ui/SchemaImportApp.java       |    3 +-
 .../schema/test/AbstractSchemaImportTest.java   |   27 +-
 .../test/generator/CodeGeneratorTest.java       |   28 +-
 .../schema/test/generator/XmlGeneratorTest.java |   22 +-
 .../ignite/schema/test/model/CacheConfig.txt    |  409 +++++++
 .../schema/test/model/ignite-type-metadata.xml  |   50 +-
 .../test/parser/DbMetadataParserTest.java       |    6 +-
 .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java |   11 +-
 288 files changed, 12409 insertions(+), 3097 deletions(-)
----------------------------------------------------------------------