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 2015/09/14 11:11:35 UTC
[26/28] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.4' into ignite-971
Merge remote-tracking branch 'remotes/origin/ignite-1.4' into ignite-971
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/716972fe
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/716972fe
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/716972fe
Branch: refs/heads/ignite-971
Commit: 716972fed892b73970666ced118dd3183004421f
Parents: ee0041f d076622
Author: sboikov <sb...@gridgain.com>
Authored: Mon Sep 14 10:09:20 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Sep 14 10:09:20 2015 +0300
----------------------------------------------------------------------
examples/config/platform/cpp/example-cache.xml | 87 -
modules/clients/pom.xml | 7 +
modules/clients/src/test/config/jdbc-config.xml | 55 +
.../jdbc2/JdbcComplexQuerySelfTest.java | 316 ++++
.../internal/jdbc2/JdbcConnectionSelfTest.java | 268 +++
.../internal/jdbc2/JdbcEmptyCacheSelfTest.java | 140 ++
.../internal/jdbc2/JdbcLocalCachesSelfTest.java | 156 ++
.../internal/jdbc2/JdbcMetadataSelfTest.java | 334 ++++
.../jdbc2/JdbcPreparedStatementSelfTest.java | 730 +++++++++
.../internal/jdbc2/JdbcResultSetSelfTest.java | 751 +++++++++
.../internal/jdbc2/JdbcStatementSelfTest.java | 292 ++++
.../jdbc/suite/IgniteJdbcDriverTestSuite.java | 11 +
.../org/apache/ignite/IgniteJdbcDriver.java | 281 +++-
.../apache/ignite/IgniteSystemProperties.java | 5 +-
.../configuration/CacheConfiguration.java | 41 +-
.../ignite/configuration/TopologyValidator.java | 24 +-
.../ignite/internal/jdbc/JdbcConnection.java | 4 +
.../internal/jdbc/JdbcConnectionInfo.java | 91 --
.../internal/jdbc/JdbcDatabaseMetadata.java | 4 +
.../internal/jdbc/JdbcPreparedStatement.java | 4 +
.../ignite/internal/jdbc/JdbcResultSet.java | 4 +
.../internal/jdbc/JdbcResultSetMetadata.java | 4 +
.../ignite/internal/jdbc/JdbcStatement.java | 4 +
.../apache/ignite/internal/jdbc/JdbcUtils.java | 4 +
.../ignite/internal/jdbc2/JdbcConnection.java | 777 +++++++++
.../internal/jdbc2/JdbcDatabaseMetadata.java | 1401 ++++++++++++++++
.../internal/jdbc2/JdbcPreparedStatement.java | 411 +++++
.../ignite/internal/jdbc2/JdbcQueryTask.java | 361 +++++
.../ignite/internal/jdbc2/JdbcResultSet.java | 1520 ++++++++++++++++++
.../internal/jdbc2/JdbcResultSetMetadata.java | 171 ++
.../ignite/internal/jdbc2/JdbcStatement.java | 456 ++++++
.../apache/ignite/internal/jdbc2/JdbcUtils.java | 155 ++
.../internal/portable/PortableContext.java | 24 +-
.../internal/portable/PortableReaderExImpl.java | 3 -
.../processors/cache/GridCacheAdapter.java | 6 +
.../processors/cache/GridCacheContext.java | 4 +-
.../processors/cache/GridCacheIoManager.java | 4 +-
.../processors/cache/GridCacheMvcc.java | 5 +-
.../distributed/GridCacheTxRecoveryFuture.java | 11 +-
.../distributed/GridDistributedCacheEntry.java | 6 +-
.../GridDistributedTxFinishRequest.java | 13 +-
.../GridDistributedTxRemoteAdapter.java | 10 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 514 +++---
.../distributed/dht/GridDhtTxFinishFuture.java | 15 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 84 +-
.../dht/GridDhtTxFinishResponse.java | 89 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 4 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 67 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 32 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 40 +-
.../dht/GridPartitionedGetFuture.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +-
.../colocated/GridDhtColocatedLockFuture.java | 11 +-
.../distributed/near/GridNearLockFuture.java | 11 +-
.../distributed/near/GridNearLockRequest.java | 18 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 52 +-
.../GridNearPessimisticTxPrepareFuture.java | 11 +-
.../near/GridNearTxFinishFuture.java | 319 +++-
.../near/GridNearTxFinishRequest.java | 20 +-
.../cache/distributed/near/GridNearTxLocal.java | 64 +-
.../distributed/near/GridNearTxRemote.java | 38 +-
.../cache/transactions/IgniteTxAdapter.java | 5 +-
.../cache/transactions/IgniteTxHandler.java | 281 ++--
.../transactions/IgniteTxLocalAdapter.java | 37 +-
.../cache/transactions/IgniteTxManager.java | 48 +-
.../datastructures/DataStructuresProcessor.java | 102 +-
.../GridTransactionalCacheQueueImpl.java | 15 +-
.../processors/igfs/IgfsFileAffinityRange.java | 4 +-
.../dotnet/PlatformDotNetConfiguration.java | 119 ++
.../PlatformDotNetPortableConfiguration.java | 228 +++
...PlatformDotNetPortableTypeConfiguration.java | 248 +++
.../util/GridSpiCloseableIteratorWrapper.java | 5 +
.../dotnet/PlatformDotNetConfiguration.java | 119 --
.../PlatformDotNetPortableConfiguration.java | 228 ---
...PlatformDotNetPortableTypeConfiguration.java | 248 ---
.../resources/META-INF/classnames.properties | 12 +-
...idPortableMarshallerCtxDisabledSelfTest.java | 168 +-
.../GridPortableMarshallerSelfTest.java | 1 -
.../portable/GridPortableMetaDataSelfTest.java | 2 +
.../CacheStoreUsageMultinodeAbstractTest.java | 16 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 50 +-
.../processors/cache/GridCacheMvccSelfTest.java | 4 +-
.../cache/GridCacheP2PUndeploySelfTest.java | 30 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 28 +-
.../GridCacheVariableTopologySelfTest.java | 5 +-
.../cache/IgniteCachePutAllRestartTest.java | 2 +
.../cache/IgniteInternalCacheTypesTest.java | 4 +-
.../cache/IgniteOnePhaseCommitNearSelfTest.java | 243 +++
.../IgniteTxExceptionAbstractSelfTest.java | 29 +-
...dCachePartitionedQueueEntryMoveSelfTest.java | 191 +--
...ridCachePartitionNotLoadedEventSelfTest.java | 27 +-
.../GridCacheTransformEventSelfTest.java | 5 +-
.../GridCacheColocatedTxExceptionSelfTest.java | 2 +-
.../dht/GridCacheTxNodeFailureSelfTest.java | 400 +++++
.../dht/GridNearCacheTxNodeFailureSelfTest.java | 31 +
...gniteAtomicLongChangingTopologySelfTest.java | 283 ++++
.../near/GridCacheNearTxExceptionSelfTest.java | 2 +-
.../near/IgniteCacheNearOnlyTxTest.java | 14 +-
.../GridCacheReplicatedTxExceptionSelfTest.java | 2 +-
.../GridCacheLocalTxExceptionSelfTest.java | 2 +-
.../processors/igfs/IgfsStartCacheTest.java | 2 +-
.../IgniteCacheFailoverTestSuite.java | 9 +-
.../IgniteCacheReplicatedQuerySelfTest.java | 49 +-
.../PlatformDotNetConfigurationClosure.java | 1 -
.../dotnet/PlatformDotNetConfigurationEx.java | 1 -
.../platform/events/PlatformEvents.java | 2 +-
.../Cache/CacheAbstractTest.cs | 71 +-
.../Config/Compute/compute-standalone.xml | 8 +-
.../Config/cache-portables.xml | 4 +-
.../Config/cache-query.xml | 4 +-
.../native-client-test-cache-affinity.xml | 6 +-
.../ignite/schema/generator/CodeGenerator.java | 4 +-
.../ignite/schema/model/PojoDescriptor.java | 6 +-
.../parser/dialect/OracleMetadataDialect.java | 7 +-
.../yardstick/config/benchmark-query.properties | 5 +-
modules/yardstick/config/ignite-base-config.xml | 2 +-
modules/yardstick/config/ignite-jdbc-config.xml | 55 +
pom.xml | 10 +
118 files changed, 11898 insertions(+), 1940 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/716972fe/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
----------------------------------------------------------------------