ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [24/24] ignite git commit: Merge branch 'master' into ignite-2.0
Date Thu, 02 Feb 2017 08:49:22 GMT
Merge branch 'master' into ignite-2.0

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
#	modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Context.java


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

Branch: refs/heads/ignite-2.0
Commit: 739c606aab828a123f47a7ff2b7e2115fb6e31c4
Parents: f299d9a cfaa5cb
Author: devozerov <vozerov@gridgain.com>
Authored: Thu Feb 2 11:41:29 2017 +0300
Committer: devozerov <vozerov@gridgain.com>
Committed: Thu Feb 2 11:41:29 2017 +0300

----------------------------------------------------------------------
 .../stream/camel/IgniteCamelStreamerTest.java   |   4 +-
 .../cassandra/persistence/PojoKeyField.java     |   2 +-
 .../ClientAbstractMultiNodeSelfTest.java        |   8 +-
 ...BinaryMarshallerInsertStatementSelfTest.java |   2 -
 ...cBinaryMarshallerMergeStatementSelfTest.java |   2 -
 .../internal/jdbc2/JdbcMetadataSelfTest.java    |   2 +-
 .../ignite/jdbc/JdbcMetadataSelfTest.java       |   4 +-
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |   3 +-
 .../ignite/codegen/MessageCodeGenerator.java    |   2 +-
 .../org/apache/ignite/cache/QueryEntity.java    |   1 -
 .../store/jdbc/CacheAbstractJdbcStore.java      |   3 +-
 .../store/jdbc/CacheJdbcBlobStoreFactory.java   |   2 +-
 .../configuration/CacheConfiguration.java       |   4 +-
 .../apache/ignite/internal/IgniteKernal.java    |   3 -
 .../internal/binary/BinaryEnumObjectImpl.java   |   4 +-
 .../internal/binary/BinaryMarshaller.java       |   1 -
 .../impl/GridRouterCommandLineStartup.java      |   4 +-
 .../cluster/ClusterNodeLocalMapImpl.java        |   1 -
 .../internal/jdbc2/JdbcSqlFieldsQuery.java      |   1 -
 .../ignite/internal/jdbc2/JdbcStatement.java    |   2 -
 .../discovery/GridDiscoveryManager.java         |   2 +-
 .../internal/mxbean/IgniteStandardMXBean.java   |  12 +-
 .../cache/CacheEvictableEntryImpl.java          |   4 +-
 .../processors/cache/CacheMetricsImpl.java      |  10 +-
 .../processors/cache/GridCacheAdapter.java      |  10 +-
 .../cache/GridCacheAffinityManager.java         |  60 +--
 .../processors/cache/GridCacheAtomicFuture.java |   3 +-
 .../processors/cache/GridCacheContext.java      |  17 -
 .../cache/GridCacheDeploymentManager.java       |   4 +-
 .../cache/GridCacheEvictionManager.java         |   6 +-
 .../GridCachePartitionExchangeManager.java      |   2 +-
 .../processors/cache/GridCacheProcessor.java    |  13 +-
 .../processors/cache/GridCacheSwapManager.java  |   2 +-
 .../processors/cache/GridCacheTtlManager.java   |   4 +-
 .../processors/cache/GridCacheUtils.java        |  22 -
 .../processors/cache/QueryCursorImpl.java       |   6 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |  16 +-
 .../binary/CacheObjectBinaryProcessorImpl.java  |   2 +-
 .../CacheDataStructuresManager.java             |   2 +-
 .../GridDistributedCacheAdapter.java            |   3 +-
 .../distributed/GridDistributedCacheEntry.java  |   3 -
 .../GridDistributedLockResponse.java            |   1 -
 .../dht/GridClientPartitionTopology.java        |   1 -
 .../dht/GridDhtAssignmentFetchFuture.java       |   3 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   8 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   2 +-
 .../distributed/dht/GridDhtGetSingleFuture.java |   2 +-
 .../distributed/dht/GridDhtLocalPartition.java  |   6 +-
 .../distributed/dht/GridDhtLockFuture.java      |   7 +-
 .../dht/GridDhtPartitionTopology.java           |   1 -
 .../dht/GridDhtPartitionTopologyImpl.java       |   6 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |  14 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |   8 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   1 -
 .../distributed/dht/GridDhtTxLocalAdapter.java  |   3 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  13 +-
 .../cache/distributed/dht/GridDhtTxRemote.java  |   2 +-
 .../distributed/dht/GridDhtUnlockRequest.java   |   3 +-
 .../dht/GridPartitionedGetFuture.java           |   2 +-
 .../dht/GridPartitionedSingleGetFuture.java     |   2 +-
 .../GridDhtAtomicAbstractUpdateFuture.java      |   2 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  21 +-
 .../atomic/GridNearAtomicFullUpdateRequest.java |   1 -
 .../GridNearAtomicSingleUpdateFuture.java       |   2 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   4 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   6 +-
 .../colocated/GridDhtColocatedLockFuture.java   |   4 +-
 .../dht/preloader/GridDhtForceKeysFuture.java   |   8 +-
 .../dht/preloader/GridDhtPartitionDemander.java |  16 +-
 .../dht/preloader/GridDhtPartitionMap2.java     |   3 +-
 .../dht/preloader/GridDhtPartitionSupplier.java |  12 +-
 .../GridDhtPartitionsExchangeFuture.java        |  13 +-
 .../dht/preloader/GridDhtPreloader.java         |   4 +-
 .../distributed/near/GridNearAtomicCache.java   |   2 +-
 .../distributed/near/GridNearCacheEntry.java    |   6 +-
 .../distributed/near/GridNearGetFuture.java     |  11 +-
 .../distributed/near/GridNearLockFuture.java    |   2 +-
 ...arOptimisticSerializableTxPrepareFuture.java |   4 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |  13 +-
 .../GridNearPessimisticTxPrepareFuture.java     |   2 +-
 .../near/GridNearTransactionalCache.java        |   6 +-
 .../near/GridNearTxFinishFuture.java            |  15 +-
 .../cache/distributed/near/GridNearTxLocal.java |   2 +-
 .../processors/cache/query/CacheQuery.java      |   1 -
 .../cache/query/GridCacheQueryManager.java      |   9 +-
 .../cache/query/GridCacheSqlQuery.java          |   2 -
 .../continuous/CacheContinuousQueryHandler.java |   4 +-
 .../continuous/CacheContinuousQueryManager.java |   2 +-
 .../cache/transactions/IgniteTxAdapter.java     |   4 +-
 .../cache/transactions/IgniteTxEntry.java       |   2 +-
 .../cache/transactions/IgniteTxHandler.java     |   6 +-
 .../transactions/IgniteTxLocalAdapter.java      |   6 +-
 .../cache/transactions/IgniteTxManager.java     |   3 +-
 .../cache/transactions/IgniteTxStateImpl.java   |   1 -
 .../cache/transactions/TxDeadlockDetection.java |   2 +-
 .../cache/transactions/TxEntryValueHolder.java  |   6 +-
 .../IgniteCacheObjectProcessorImpl.java         |   2 +-
 .../processors/clock/GridClockServer.java       |   4 +-
 .../datastreamer/DataStreamProcessor.java       |   2 +-
 .../datastreamer/DataStreamerImpl.java          |   6 +-
 .../datastructures/GridCacheSetImpl.java        |   2 +-
 .../datastructures/GridSetQueryPredicate.java   |   2 +-
 .../processors/hadoop/HadoopClasspathUtils.java |   4 +-
 .../internal/processors/igfs/IgfsProcessor.java |   3 +-
 .../igfs/client/IgfsClientSizeCallable.java     |   1 -
 .../processors/job/GridJobProcessor.java        |   2 +-
 .../platform/PlatformAbstractBootstrap.java     |   3 +-
 .../platform/PlatformConfigurationEx.java       |   3 +-
 .../platform/cache/PlatformCache.java           |  12 +-
 .../transactions/PlatformTransactions.java      |   9 +
 .../platform/utils/PlatformUtils.java           |   2 +-
 .../processors/query/GridQueryProcessor.java    |   2 +-
 .../resource/GridResourceProcessor.java         |   1 +
 .../handlers/cache/GridCacheCommandHandler.java |   2 -
 .../string/GridRedisSetCommandHandler.java      |   2 +-
 .../processors/task/GridTaskWorker.java         |   2 +-
 .../internal/util/GridStripedSpinBusyLock.java  |   2 +-
 .../ignite/internal/util/HostAndPortRange.java  |   2 +-
 .../ignite/internal/util/IgniteUtils.java       |   3 +-
 .../ignite/internal/util/StripedExecutor.java   |   2 +-
 .../visor/node/VisorIgfsConfiguration.java      |   1 -
 .../ignite/marshaller/jdk/JdkMarshaller.java    |   1 -
 .../optimized/OptimizedClassDescriptor.java     |   2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   2 +-
 .../tcp/TcpCommunicationSpiMBean.java           |   1 -
 .../ignite/spi/discovery/tcp/ClientImpl.java    |   4 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |   7 +-
 .../tcp/internal/TcpDiscoveryStatistics.java    |   8 +-
 .../CacheJdbcPojoStoreAbstractSelfTest.java     |   2 -
 .../store/jdbc/CacheJdbcPojoStoreTest.java      |   3 -
 .../internal/ClusterGroupHostsSelfTest.java     |   6 +-
 .../ComputeJobCancelWithServiceSelfTest.java    |   2 +-
 .../internal/GridContinuousTaskSelfTest.java    |   4 +-
 .../GridEventStorageCheckAllEventsSelfTest.java |   2 +-
 .../IgniteClientReconnectApiExceptionTest.java  |   6 +-
 ...niteClientReconnectFailoverAbstractTest.java |   4 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |   3 +-
 .../GridDiscoveryManagerAttributesSelfTest.java |   4 +-
 .../BinaryObjectOffHeapUnswapTemporaryTest.java |   1 -
 .../cache/CacheAffinityCallSelfTest.java        |   8 +-
 .../cache/CacheGetEntryAbstractTest.java        |   2 +-
 .../CacheSerializableTransactionsTest.java      |   6 +-
 .../CacheStartupInDeploymentModesTest.java      |   7 +-
 .../cache/CacheStopAndDestroySelfTest.java      |   6 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |   6 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |  48 +-
 .../processors/cache/GridCacheMvccSelfTest.java | 208 ++++----
 .../processors/cache/GridCacheStopSelfTest.java |   4 +-
 .../processors/cache/GridCacheTestEntryEx.java  |   3 +-
 .../cache/GridCacheUtilsSelfTest.java           |   2 +-
 ...ProjectionForCachesOnDaemonNodeSelfTest.java |   8 +-
 .../IgniteCacheConfigVariationsFullApiTest.java |   8 +-
 .../cache/IgniteCachePeekModesAbstractTest.java |   8 +-
 .../cache/IgniteCacheStoreCollectionTest.java   |   1 -
 ...gniteTopologyValidatorAbstractCacheTest.java |   6 +-
 .../processors/cache/IgniteTxAbstractTest.java  |   3 +-
 .../cache/IgniteTxConfigCacheSelfTest.java      |   2 +-
 .../IgniteTxExceptionAbstractSelfTest.java      |   3 +-
 .../IgniteTxMultiThreadedAbstractTest.java      |   4 +-
 .../CacheKeepBinaryWithInterceptorTest.java     |   1 -
 ...yAtomicEntryProcessorDeploymentSelfTest.java |   4 +-
 ...IgniteCacheAbstractExecutionContextTest.java |   2 -
 ...eAbstractDataStructuresFailoverSelfTest.java |  16 +-
 ...actQueueFailoverDataConsistencySelfTest.java |   2 +-
 .../IgniteLockAbstractSelfTest.java             |  24 +-
 .../CacheGetFutureHangsSelfTest.java            |   6 +-
 .../CacheLateAffinityAssignmentTest.java        |   2 +-
 ...ridCachePartitionNotLoadedEventSelfTest.java |   4 +-
 ...niteCacheClientNodeChangingTopologyTest.java |  20 +-
 ...teSynchronizationModesMultithreadedTest.java |   8 +-
 .../IgniteCacheCrossCacheTxFailoverTest.java    |   6 +-
 ...ePrimaryNodeFailureRecoveryAbstractTest.java |   4 +-
 ...gniteCachePutRetryTransactionalSelfTest.java |   4 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |   4 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |   4 +-
 .../GridCacheReplicatedNodeRestartSelfTest.java |   3 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |   1 -
 .../IgniteCacheExpiryPolicyAbstractTest.java    |   4 +-
 ...ContinuousQueryFailoverAbstractSelfTest.java |   6 +-
 ...dCacheContinuousQueryNodesFilteringTest.java |   2 +-
 ...IgniteCacheContinuousQueryReconnectTest.java |  12 +-
 .../TxDeadlockDetectionNoHangsTest.java         |   2 +-
 .../transactions/TxDeadlockDetectionTest.java   |   2 +-
 .../TxOptimisticDeadlockDetectionTest.java      |   2 +-
 .../TxPessimisticDeadlockDetectionTest.java     |   2 +-
 ...ComputeJobExecutionErrorToLogManualTest.java |   4 +-
 .../datastreamer/DataStreamerImplSelfTest.java  |   8 +-
 .../datastreamer/DataStreamerTimeoutTest.java   |   6 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |  32 +-
 .../processors/igfs/IgfsFileInfoSelfTest.java   |   4 +-
 .../igfs/IgfsMetaManagerSelfTest.java           |   3 +-
 .../igfs/IgfsModeResolverSelfTest.java          |  10 +-
 .../igfs/benchmark/IgfsBenchmark.java           |   4 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |   1 -
 ...rviceDeploymentExceptionPropagationTest.java |   2 +-
 .../GridServiceProcessorStopSelfTest.java       |   2 +-
 .../service/IgniteServiceReassignmentTest.java  |   2 +-
 .../internal/util/IgniteUtilsSelfTest.java      |   5 +-
 .../unsafe/GridOffheapSnapTreeSelfTest.java     |   7 +-
 .../lang/GridMetadataAwareAdapterSelfTest.java  |   4 +-
 .../p2p/GridP2PSameClassLoaderSelfTest.java     |  14 +-
 .../platform/PlatformEventsWriteEventTask.java  |   9 -
 .../local/GridLocalDeploymentSpiSelfTest.java   |   6 +-
 ...lientDiscoverySpiFailureTimeoutSelfTest.java |   4 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |   8 +-
 .../TcpDiscoverySpiFailureTimeoutSelfTest.java  |  14 +-
 .../GridSwapSpaceSpiAbstractSelfTest.java       |   3 +-
 .../testframework/GridSpiTestContext.java       |   5 +-
 .../ignite/testframework/IgniteTestSuite.java   |   2 +-
 .../IgniteCacheDataStructuresSelfTestSuite.java |   2 -
 ...essagingConfigVariationFullApiTestSuite.java |   4 +-
 .../ignite/util/mbeans/GridMBeanSelfTest.java   |  10 +-
 .../CacheNoValueClassOnServerTestClient.java    |   3 +-
 .../CacheConfigurationP2PTestClient.java        |   3 +-
 .../gce/TcpDiscoveryGoogleStorageIpFinder.java  |   4 +-
 .../hadoop/igfs/HadoopIgfsEndpoint.java         |   4 +-
 .../HadoopBasicFileSystemFactoryDelegate.java   |   2 +-
 .../hadoop/impl/igfs/HadoopIgfsInProc.java      |  40 +-
 .../hadoop/impl/v2/HadoopV2Context.java         |   2 +-
 .../taskexecutor/HadoopExecutorService.java     |   6 +-
 .../child/HadoopChildProcessRunner.java         |  10 +-
 .../hadoop/impl/HadoopErrorSimulator.java       |  12 +-
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |   3 +-
 .../IgniteHadoopFileSystemClientSelfTest.java   |   6 +-
 .../query/h2/GridH2ResultSetIterator.java       |   3 +-
 .../processors/query/h2/IgniteH2Indexing.java   |   6 +-
 .../query/h2/opt/GridH2IndexBase.java           |   6 +-
 .../processors/query/h2/sql/DmlAstUtils.java    |   2 +-
 .../query/h2/twostep/msg/GridH2Geometry.java    |   2 +-
 .../cache/BinarySerializationQuerySelfTest.java |   2 -
 .../CacheRandomOperationsMultithreadedTest.java |   4 +-
 .../ClientReconnectAfterClusterRestartTest.java |   4 +-
 .../GridCacheQueryIndexDisabledSelfTest.java    |  20 +-
 .../cache/IgniteCacheAbstractQuerySelfTest.java |   3 +-
 ...eLockPartitionOnAffinityRunAbstractTest.java |   1 -
 ...PartitionOnAffinityRunAtomicCacheOpTest.java |  11 +-
 ...niteCacheLockPartitionOnAffinityRunTest.java |  51 +-
 ...titionOnAffinityRunWithCollisionSpiTest.java |  10 +-
 .../cache/IgniteCacheMergeSqlQuerySelfTest.java |   1 -
 .../cache/IgniteCacheOffheapEvictQueryTest.java |   4 +-
 ...niteCacheP2pUnmarshallingQueryErrorTest.java |   4 +-
 .../IgniteCacheUpdateSqlQuerySelfTest.java      |   2 +-
 ...niteCacheDistributedQueryCancelSelfTest.java |   4 +-
 .../IgniteCacheQueryNodeRestartSelfTest2.java   |   4 +-
 .../query/IgniteSqlSchemaIndexingTest.java      |  15 +-
 .../query/IgniteSqlSplitterSelfTest.java        |   4 +-
 .../h2/GridIndexingSpiAbstractSelfTest.java     |   4 +-
 .../query/h2/sql/GridQueryParsingTest.java      |   4 -
 .../apache/ignite/stream/jms11/JmsStreamer.java |   4 +-
 .../ignite/stream/kafka/KafkaStreamer.java      |   6 +-
 .../ignite/stream/kafka/TestKafkaBroker.java    |   2 +-
 .../connect/IgniteSourceConnectorTest.java      |   2 +-
 .../stream/mqtt/IgniteMqttStreamerTest.java     |   4 +-
 .../BundleDelegatingClassLoader.java            |   4 +-
 .../classloaders/ContainerSweepClassLoader.java |   4 +-
 modules/platforms/cpp/binary/Makefile.am        |   1 +
 .../platforms/cpp/binary/include/Makefile.am    |   3 +
 .../binary/binary_array_identity_resolver.h     |  64 +++
 .../ignite/binary/binary_identity_resolver.h    |  61 +++
 .../include/ignite/binary/binary_object.h       |   5 +-
 .../binary/include/ignite/binary/binary_type.h  |  16 -
 .../ignite/impl/binary/binary_object_impl.h     |   9 +-
 .../ignite/impl/binary/binary_type_impl.h       | 149 ++++++
 .../ignite/impl/binary/binary_type_snapshot.h   |  18 +-
 .../include/ignite/impl/binary/binary_utils.h   | 175 +------
 .../ignite/impl/binary/binary_writer_impl.h     |  11 +-
 .../ignite/impl/interop/interop_output_stream.h |  10 +-
 .../cpp/binary/project/vs/binary.vcxproj        |   4 +
 .../binary/project/vs/binary.vcxproj.filters    |  12 +
 .../binary/binary_array_identity_resolver.cpp   |  42 ++
 .../cpp/binary/src/binary/binary_type.cpp       |   4 +-
 .../src/impl/binary/binary_object_impl.cpp      |  10 +-
 .../src/impl/binary/binary_type_manager.cpp     |  12 +-
 .../cpp/binary/src/impl/binary/binary_utils.cpp |  80 +--
 .../src/impl/binary/binary_writer_impl.cpp      |   2 -
 .../src/impl/interop/interop_output_stream.cpp  |   5 +
 modules/platforms/cpp/common/Makefile.am        |   5 +-
 .../platforms/cpp/common/include/Makefile.am    |   1 +
 .../include/ignite/common/platform_utils.h      |  79 +++
 .../cpp/common/include/ignite/common/utils.h    | 251 +++++++--
 .../os/linux/src/common/platform_utils.cpp      |  81 +++
 .../cpp/common/os/linux/src/common/utils.cpp    | 148 ------
 .../common/os/win/src/common/platform_utils.cpp |  88 ++++
 .../cpp/common/os/win/src/common/utils.cpp      | 154 ------
 .../cpp/common/project/vs/common.vcxproj        |   4 +-
 .../common/project/vs/common.vcxproj.filters    |  12 +-
 .../platforms/cpp/common/src/common/utils.cpp   | 153 ++++++
 modules/platforms/cpp/core-test/Makefile.am     |   4 +-
 .../cpp/core-test/config/cache-identity.xml     | 121 +++++
 .../cpp/core-test/config/cache-query.xml        |  10 -
 .../cpp/core-test/include/ignite/test_utils.h   |  63 +++
 .../cpp/core-test/project/vs/core-test.vcxproj  |   4 +
 .../project/vs/core-test.vcxproj.filters        |  15 +
 .../src/binary_identity_resolver_test.cpp       | 522 +++++++++++++++++++
 .../cpp/core-test/src/binary_object_test.cpp    |  20 +-
 .../cpp/core-test/src/binary_session_test.cpp   |   4 +-
 .../cpp/core-test/src/cache_query_test.cpp      | 149 +++---
 .../platforms/cpp/core-test/src/cache_test.cpp  |  43 +-
 .../cpp/core-test/src/continuous_query_test.cpp |  31 +-
 .../cpp/core-test/src/ignition_test.cpp         |  19 +-
 .../cpp/core-test/src/interop_test.cpp          |  42 +-
 .../platforms/cpp/core-test/src/test_utils.cpp  |  79 +++
 .../cpp/core-test/src/transactions_test.cpp     |  23 +-
 .../platforms/cpp/core/src/impl/ignite_impl.cpp |   4 +-
 .../cpp/odbc-test/include/test_utils.h          |  51 +-
 .../cpp/odbc-test/src/api_robustness_test.cpp   |  35 +-
 .../src/application_data_buffer_test.cpp        |  24 +-
 .../cpp/odbc-test/src/queries_test.cpp          |  71 +--
 .../src/sql_aggregate_functions_test.cpp        |   1 +
 .../src/sql_date_time_functions_test.cpp        |  26 +-
 .../src/sql_esc_convert_function_test.cpp       |   4 +-
 .../src/sql_numeric_functions_test.cpp          |   1 +
 .../cpp/odbc-test/src/sql_outer_join_test.cpp   |   1 +
 .../odbc-test/src/sql_string_functions_test.cpp |   1 +
 .../odbc-test/src/sql_test_suite_fixture.cpp    |  40 +-
 .../cpp/odbc-test/src/sql_types_test.cpp        |  10 +-
 .../platforms/cpp/odbc-test/src/test_utils.cpp  |  60 ++-
 .../odbc/src/app/application_data_buffer.cpp    |   8 +-
 .../Apache.Ignite.Core.Tests.csproj             |   1 +
 .../Cache/CacheAbstractTest.cs                  |  21 +
 .../Cache/CacheAbstractTransactionalTest.cs     | 334 ++++++++++++
 .../Apache.Ignite.Core.csproj                   |   2 +
 .../dotnet/Apache.Ignite.Core/Cache/ICache.cs   |   4 +-
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |  93 +++-
 .../Transactions/CacheTransactionManager.cs     | 161 ++++++
 .../Impl/Transactions/Transaction.cs            |   8 +
 .../Impl/Transactions/TransactionImpl.cs        |  13 +
 .../Impl/Transactions/TransactionsImpl.cs       |  10 +
 .../spark/JavaStandaloneIgniteRDDSelfTest.java  |   3 +-
 .../util/spring/IgniteSpringHelperImpl.java     |   8 +-
 .../ignite/internal/GridFactorySelfTest.java    |   2 +-
 .../internal/IgniteDynamicCacheConfigTest.java  |   4 +-
 .../GridSpringTransactionManagerSelfTest.java   |   2 +-
 .../ignite/tools/classgen/ClassesGenerator.java |   2 +-
 .../twitter/IgniteTwitterStreamerTest.java      |   4 +-
 .../GridUriDeploymentFileProcessorSelfTest.java |   3 +-
 .../generator/ConfigurationGenerator.js         |   9 +-
 .../ignite/cache/websession/WebSessionV2.java   |   2 +-
 .../internal/websession/WebSessionSelfTest.java |   6 +-
 .../apache/ignite/yarn/ApplicationMaster.java   |   4 +-
 .../org/apache/ignite/yarn/IgniteProvider.java  |   4 +-
 .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java  |   2 +-
 342 files changed, 3481 insertions(+), 2021 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
index bdfbe50,6ebff42..c31587a
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
@@@ -20,8 -20,8 +20,9 @@@ package org.apache.ignite.internal.proc
  import java.lang.annotation.Annotation;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
+ 
  import org.apache.ignite.IgniteCheckedException;
 +import org.apache.ignite.IgniteFileSystem;
  import org.apache.ignite.cache.store.CacheStoreSession;
  import org.apache.ignite.compute.ComputeJob;
  import org.apache.ignite.compute.ComputeJobContext;

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index ae0e6f0,ddc7687..ddc7687
mode 100755,100644..100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsEndpoint.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Context.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/739c606a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------


Mime
View raw message