ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [03/17] ignite git commit: Merge branch 'master' into feature/ignite-1370.
Date Tue, 22 Sep 2015 14:50:50 GMT
Merge branch 'master' into feature/ignite-1370.

# Conflicts:
#	modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java


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

Branch: refs/heads/ignite-1093-2
Commit: b80b17196269a036da65d781eb772a317039b014
Parents: b1dee96 6e48c9c
Author: Raul Kripalani <raulk@apache.org>
Authored: Tue Sep 15 18:28:09 2015 +0100
Committer: Raul Kripalani <raulk@apache.org>
Committed: Tue Sep 15 18:28:09 2015 +0100

----------------------------------------------------------------------
 RELEASE_NOTES.txt                               |    2 +-
 examples/config/example-default.xml             |   76 -
 examples/config/example-ignite.xml              |   56 +-
 examples/config/filesystem/README.txt           |    2 +-
 examples/config/filesystem/example-igfs.xml     |    7 -
 .../config/portable/example-ignite-portable.xml |   44 -
 .../ignite/examples/portable/Address.java       |   72 -
 .../ignite/examples/portable/Employee.java      |   93 -
 .../ignite/examples/portable/EmployeeKey.java   |   90 -
 .../portable/ExamplePortableNodeStartup.java    |   36 -
 .../ignite/examples/portable/Organization.java  |   93 -
 .../examples/portable/OrganizationType.java     |   32 -
 ...mputeClientPortableTaskExecutionExample.java |  154 -
 .../portable/computegrid/ComputeClientTask.java |  116 -
 .../portable/computegrid/package-info.java      |   21 -
 .../CacheClientPortablePutGetExample.java       |  230 --
 .../CacheClientPortableQueryExample.java        |  325 --
 .../portable/datagrid/package-info.java         |   21 -
 .../ignite/examples/portable/package-info.java  |   21 -
 .../CacheClientPortableExampleTest.java         |   46 -
 .../ComputeClientPortableExampleTest.java       |   37 -
 .../testsuites/IgniteExamplesSelfTestSuite.java |    6 -
 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 +
 modules/core/pom.xml                            |   21 -
 .../src/main/java/org/apache/ignite/Ignite.java |    7 -
 .../java/org/apache/ignite/IgniteCache.java     |   44 +-
 .../org/apache/ignite/IgniteJdbcDriver.java     |  281 +-
 .../java/org/apache/ignite/IgnitePortables.java |  370 --
 .../apache/ignite/IgniteSystemProperties.java   |    5 +-
 .../configuration/CacheConfiguration.java       |   70 +-
 .../ignite/internal/GridKernalContext.java      |    7 +-
 .../ignite/internal/GridKernalContextImpl.java  |   10 +-
 .../apache/ignite/internal/GridLoggerProxy.java |    6 +-
 .../org/apache/ignite/internal/IgniteEx.java    |    9 +
 .../apache/ignite/internal/IgniteKernal.java    |   14 +-
 .../ignite/internal/IgniteNodeAttributes.java   |    5 +-
 .../internal/executor/GridExecutorService.java  |    4 +-
 .../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 +
 .../deployment/GridDeploymentStoreAdapter.java  |    4 +-
 .../discovery/GridDiscoveryManager.java         |   10 -
 .../portable/GridPortableMarshaller.java        |    2 +-
 .../portable/PortableClassDescriptor.java       |   10 +-
 .../internal/portable/PortableContext.java      |   32 +-
 .../portable/PortableMetaDataCollector.java     |    6 +-
 .../portable/PortableMetaDataHandler.java       |    4 +-
 .../internal/portable/PortableMetaDataImpl.java |   14 +-
 .../internal/portable/PortableObjectEx.java     |    6 +-
 .../internal/portable/PortableObjectImpl.java   |    6 +-
 .../portable/PortableObjectOffheapImpl.java     |    6 +-
 .../internal/portable/PortableRawReaderEx.java  |    4 +-
 .../internal/portable/PortableRawWriterEx.java  |    4 +-
 .../portable/PortableReaderContext.java         |    2 +-
 .../internal/portable/PortableReaderExImpl.java |   10 +-
 .../ignite/internal/portable/PortableUtils.java |    2 +-
 .../internal/portable/PortableWriterExImpl.java |   11 +-
 .../internal/portable/api/IgnitePortables.java  |  362 ++
 .../internal/portable/api/PortableBuilder.java  |  136 +
 .../portable/api/PortableException.java         |   57 +
 .../internal/portable/api/PortableIdMapper.java |   54 +
 .../api/PortableInvalidClassException.java      |   58 +
 .../portable/api/PortableMarshalAware.java      |   48 +
 .../portable/api/PortableMarshaller.java        |  358 ++
 .../internal/portable/api/PortableMetadata.java |   60 +
 .../internal/portable/api/PortableObject.java   |  152 +
 .../portable/api/PortableProtocolVersion.java   |   41 +
 .../portable/api/PortableRawReader.java         |  234 ++
 .../portable/api/PortableRawWriter.java         |  219 +
 .../internal/portable/api/PortableReader.java   |  284 ++
 .../portable/api/PortableSerializer.java        |   47 +
 .../portable/api/PortableTypeConfiguration.java |  195 +
 .../internal/portable/api/PortableWriter.java   |  266 ++
 .../portable/builder/PortableBuilderEnum.java   |    2 +-
 .../portable/builder/PortableBuilderImpl.java   |   14 +-
 .../portable/builder/PortableBuilderReader.java |    2 +-
 .../builder/PortableBuilderSerializer.java      |    2 +-
 .../builder/PortableEnumArrayLazyValue.java     |    4 +-
 .../builder/PortableObjectArrayLazyValue.java   |    2 +-
 .../builder/PortablePlainPortableObject.java    |    2 +-
 .../streams/PortableAbstractInputStream.java    |    2 +-
 .../processors/cache/GridCacheAdapter.java      |   31 +-
 .../cache/GridCacheClearAllRunnable.java        |    4 +-
 .../processors/cache/GridCacheContext.java      |    4 +-
 .../processors/cache/GridCacheIoManager.java    |    4 +-
 .../processors/cache/GridCacheLogger.java       |    4 +-
 .../processors/cache/GridCacheMapEntry.java     |   15 +-
 .../processors/cache/GridCacheMvcc.java         |    5 +-
 .../processors/cache/GridCacheProcessor.java    |   37 +-
 .../cache/GridCacheSharedContext.java           |    4 +-
 .../processors/cache/GridCacheSwapManager.java  |   46 +-
 .../processors/cache/IgniteCacheProxy.java      |    5 -
 .../distributed/GridCacheTxRecoveryFuture.java  |   11 +-
 .../distributed/GridDistributedCacheEntry.java  |    6 +-
 .../GridDistributedTxFinishRequest.java         |   13 +-
 .../GridDistributedTxRemoteAdapter.java         |   18 +-
 .../dht/GridClientPartitionTopology.java        |  104 +-
 .../distributed/dht/GridDhtLocalPartition.java  |    1 +
 .../dht/GridDhtPartitionTopology.java           |    4 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   16 +-
 .../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 |   34 +-
 .../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 |   55 +-
 .../GridNearPessimisticTxPrepareFuture.java     |   11 +-
 .../near/GridNearTxFinishFuture.java            |  345 +-
 .../near/GridNearTxFinishRequest.java           |   20 +-
 .../cache/distributed/near/GridNearTxLocal.java |   64 +-
 .../distributed/near/GridNearTxRemote.java      |   38 +-
 .../CacheDefaultPortableAffinityKeyMapper.java  |    2 +-
 .../portable/CacheObjectPortableContext.java    |    2 +-
 .../portable/CacheObjectPortableProcessor.java  |    8 +-
 .../CacheObjectPortableProcessorImpl.java       |   12 +-
 .../cache/portable/IgnitePortablesImpl.java     |   10 +-
 .../cache/store/CacheOsStoreManager.java        |    4 +-
 .../cache/transactions/IgniteTxAdapter.java     |    5 +-
 .../cache/transactions/IgniteTxHandler.java     |  286 +-
 .../transactions/IgniteTxLocalAdapter.java      |   37 +-
 .../cache/transactions/IgniteTxManager.java     |   48 +-
 .../continuous/GridContinuousProcessor.java     |   22 +-
 .../datastructures/DataStructuresProcessor.java |  102 +-
 .../datastructures/GridCacheAtomicLongImpl.java |    4 +-
 .../GridCacheAtomicReferenceImpl.java           |    4 +-
 .../GridCacheAtomicSequenceImpl.java            |    4 +-
 .../GridCacheAtomicStampedImpl.java             |    4 +-
 .../GridCacheCountDownLatchImpl.java            |    4 +-
 .../GridTransactionalCacheQueueImpl.java        |   15 +-
 .../processors/igfs/IgfsFileAffinityRange.java  |    4 +-
 .../processors/igfs/IgfsFileWorkerBatch.java    |   15 +-
 .../igfs/IgfsFragmentizerManager.java           |    8 +-
 .../processors/igfs/IgfsServerManager.java      |    5 +-
 .../internal/processors/job/GridJobWorker.java  |    4 +-
 .../dotnet/PlatformDotNetConfiguration.java     |   12 +-
 .../PlatformDotNetPortableConfiguration.java    |   12 +-
 ...PlatformDotNetPortableTypeConfiguration.java |   12 +-
 .../processors/task/GridTaskWorker.java         |    4 +-
 .../util/GridSpiCloseableIteratorWrapper.java   |    5 +
 .../ignite/internal/util/IgniteUtils.java       |   16 +
 .../util/offheap/GridOffHeapEvictListener.java  |    2 +-
 .../util/offheap/GridOffHeapPartitionedMap.java |    1 +
 .../util/offheap/unsafe/GridUnsafeMap.java      |    4 +-
 .../marshaller/portable/PortableMarshaller.java |  358 --
 .../marshaller/portable/package-info.java       |   22 -
 .../apache/ignite/portable/PortableBuilder.java |  137 -
 .../ignite/portable/PortableException.java      |   57 -
 .../ignite/portable/PortableIdMapper.java       |   56 -
 .../portable/PortableInvalidClassException.java |   58 -
 .../ignite/portable/PortableMarshalAware.java   |   48 -
 .../ignite/portable/PortableMetadata.java       |   61 -
 .../apache/ignite/portable/PortableObject.java  |  154 -
 .../portable/PortableProtocolVersion.java       |   41 -
 .../ignite/portable/PortableRawReader.java      |  234 --
 .../ignite/portable/PortableRawWriter.java      |  219 -
 .../apache/ignite/portable/PortableReader.java  |  284 --
 .../ignite/portable/PortableSerializer.java     |   49 -
 .../portable/PortableTypeConfiguration.java     |  196 -
 .../apache/ignite/portable/PortableWriter.java  |  266 --
 .../apache/ignite/portable/package-info.java    |   22 -
 .../resources/META-INF/classnames.properties    |   20 +-
 .../GridDiscoveryManagerAttributesSelfTest.java |   45 -
 .../GridPortableAffinityKeySelfTest.java        |  218 -
 .../GridPortableBuilderAdditionalSelfTest.java  | 1226 ------
 .../portable/GridPortableBuilderSelfTest.java   | 1021 -----
 ...eBuilderStringAsCharsAdditionalSelfTest.java |   28 -
 ...ridPortableBuilderStringAsCharsSelfTest.java |   28 -
 ...idPortableMarshallerCtxDisabledSelfTest.java |  256 --
 .../GridPortableMarshallerSelfTest.java         | 3807 ------------------
 .../GridPortableMetaDataDisabledSelfTest.java   |  238 --
 .../portable/GridPortableMetaDataSelfTest.java  |  369 --
 .../portable/GridPortableWildcardsSelfTest.java |  482 ---
 .../GridPortableMarshalerAwareTestClass.java    |   67 -
 .../mutabletest/GridPortableTestClasses.java    |  434 --
 .../portable/mutabletest/package-info.java      |   22 -
 .../ignite/internal/portable/package-info.java  |   22 -
 .../portable/test/GridPortableTestClass1.java   |   28 -
 .../portable/test/GridPortableTestClass2.java   |   24 -
 .../internal/portable/test/package-info.java    |   22 -
 .../test/subpackage/GridPortableTestClass3.java |   24 -
 .../portable/test/subpackage/package-info.java  |   22 -
 .../CacheStoreUsageMultinodeAbstractTest.java   |   16 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |   57 +-
 .../GridCacheAbstractRemoveFailureTest.java     |  199 +-
 .../cache/GridCacheMemoryModeSelfTest.java      |    9 +-
 .../processors/cache/GridCacheMvccSelfTest.java |    4 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |   30 +-
 .../cache/GridCachePutAllFailoverSelfTest.java  |   88 +-
 .../GridCacheVariableTopologySelfTest.java      |    5 +-
 .../cache/IgniteCacheCreateRestartSelfTest.java |  106 +
 .../IgniteCacheEntryProcessorNodeJoinTest.java  |   73 +
 .../cache/IgniteCachePutAllRestartTest.java     |    2 +
 .../cache/IgniteInternalCacheTypesTest.java     |    4 +-
 .../cache/IgniteOnePhaseCommitNearSelfTest.java |  243 ++
 .../IgniteTxExceptionAbstractSelfTest.java      |   29 +-
 .../GridCacheAbstractNodeRestartSelfTest.java   |  149 +-
 ...ridCachePartitionNotLoadedEventSelfTest.java |   27 +-
 .../GridCacheTransformEventSelfTest.java        |    5 +-
 .../GridCacheColocatedTxExceptionSelfTest.java  |    2 +-
 .../GridCacheDhtAtomicRemoveFailureTest.java    |   16 +-
 .../dht/GridCacheDhtRemoveFailureTest.java      |   16 +-
 .../dht/GridCacheTxNodeFailureSelfTest.java     |  405 ++
 .../dht/GridNearCacheTxNodeFailureSelfTest.java |   31 +
 ...gniteAtomicLongChangingTopologySelfTest.java |  278 ++
 .../IgniteCacheCrossCacheTxFailoverTest.java    |   53 +-
 .../IgniteCachePutRetryAbstractSelfTest.java    |  166 +-
 .../dht/IgniteCachePutRetryAtomicSelfTest.java  |    2 +
 ...gniteCachePutRetryTransactionalSelfTest.java |   50 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |   98 +-
 ...tomicPrimaryWriteOrderRemoveFailureTest.java |   15 +-
 .../GridCacheAtomicRemoveFailureTest.java       |   15 +-
 .../GridCacheAtomicNearRemoveFailureTest.java   |   15 +-
 ...cPrimaryWriteOrderNearRemoveFailureTest.java |   15 +-
 .../near/GridCacheNearRemoveFailureTest.java    |   15 +-
 .../near/GridCacheNearTxExceptionSelfTest.java  |    2 +-
 .../GridCachePartitionedNodeRestartTest.java    |    9 +-
 ...ePartitionedOptimisticTxNodeRestartTest.java |    9 +-
 .../near/IgniteCacheNearOnlyTxTest.java         |   14 +-
 .../GridCacheReplicatedNodeRestartSelfTest.java |    8 +-
 .../GridCacheReplicatedTxExceptionSelfTest.java |    2 +-
 .../GridCacheLocalTxExceptionSelfTest.java      |    2 +-
 ...ClientNodePortableMetadataMultinodeTest.java |  295 --
 ...GridCacheClientNodePortableMetadataTest.java |  286 --
 ...ableObjectsAbstractDataStreamerSelfTest.java |  190 -
 ...bleObjectsAbstractMultiThreadedSelfTest.java |  231 --
 ...ridCachePortableObjectsAbstractSelfTest.java |  978 -----
 .../GridCachePortableStoreAbstractSelfTest.java |  297 --
 .../GridCachePortableStoreObjectsSelfTest.java  |   55 -
 ...GridCachePortableStorePortablesSelfTest.java |   66 -
 ...ridPortableCacheEntryMemorySizeSelfTest.java |   55 -
 ...leDuplicateIndexObjectsAbstractSelfTest.java |  158 -
 .../DataStreamProcessorPortableSelfTest.java    |   66 -
 .../GridDataStreamerImplSelfTest.java           |  345 --
 ...ridCacheAffinityRoutingPortableSelfTest.java |   47 -
 ...lyPortableDataStreamerMultiNodeSelfTest.java |   29 -
 ...rtableDataStreamerMultithreadedSelfTest.java |   47 -
 ...artitionedOnlyPortableMultiNodeSelfTest.java |   28 -
 ...tionedOnlyPortableMultithreadedSelfTest.java |   47 -
 .../GridCacheMemoryModePortableSelfTest.java    |   36 -
 ...acheOffHeapTieredAtomicPortableSelfTest.java |   47 -
 ...eapTieredEvictionAtomicPortableSelfTest.java |   95 -
 ...heOffHeapTieredEvictionPortableSelfTest.java |   95 -
 .../GridCacheOffHeapTieredPortableSelfTest.java |   47 -
 ...ateIndexObjectPartitionedAtomicSelfTest.java |   38 -
 ...xObjectPartitionedTransactionalSelfTest.java |   41 -
 ...AtomicNearDisabledOffheapTieredSelfTest.java |   29 -
 ...rtableObjectsAtomicNearDisabledSelfTest.java |   51 -
 ...tableObjectsAtomicOffheapTieredSelfTest.java |   29 -
 .../GridCachePortableObjectsAtomicSelfTest.java |   51 -
 ...tionedNearDisabledOffheapTieredSelfTest.java |   30 -
 ...eObjectsPartitionedNearDisabledSelfTest.java |   51 -
 ...ObjectsPartitionedOffheapTieredSelfTest.java |   30 -
 ...CachePortableObjectsPartitionedSelfTest.java |   51 -
 ...sNearPartitionedByteArrayValuesSelfTest.java |   41 -
 ...sPartitionedOnlyByteArrayValuesSelfTest.java |   42 -
 ...dCachePortableObjectsReplicatedSelfTest.java |   51 -
 ...CachePortableObjectsAtomicLocalSelfTest.java |   32 -
 ...rtableObjectsLocalOffheapTieredSelfTest.java |   29 -
 .../GridCachePortableObjectsLocalSelfTest.java  |   51 -
 .../processors/igfs/IgfsAbstractSelfTest.java   |   61 +-
 .../igfs/IgfsDualAbstractSelfTest.java          |   10 +-
 .../processors/igfs/IgfsStartCacheTest.java     |    2 +-
 .../offheap/GridOffHeapMapAbstractSelfTest.java |    6 +-
 ...idOffHeapPartitionedMapAbstractSelfTest.java |   10 +-
 .../stream/socket/SocketStreamerSelfTest.java   |   29 +-
 .../ignite/testframework/GridTestUtils.java     |  117 +
 .../ignite/testframework/junits/IgniteMock.java |    8 +-
 .../multijvm/IgniteCacheProcessProxy.java       |    5 -
 .../junits/multijvm/IgniteProcessProxy.java     |    2 +-
 .../IgniteCacheFailoverTestSuite.java           |   15 +-
 .../IgniteCacheFailoverTestSuite3.java          |   62 +
 .../testsuites/IgniteCacheRestartTestSuite.java |   15 +-
 .../IgniteCacheRestartTestSuite2.java           |   47 +
 .../IgnitePortableCacheFullApiTestSuite.java    |   37 -
 .../IgnitePortableCacheTestSuite.java           |  103 -
 .../IgnitePortableObjectsTestSuite.java         |   92 -
 .../ignite/portable/test1/1.1/test1-1.1.jar     |  Bin 2548 -> 0 bytes
 .../ignite/portable/test1/1.1/test1-1.1.pom     |    9 -
 .../portable/test1/maven-metadata-local.xml     |   12 -
 .../ignite/portable/test2/1.1/test2-1.1.jar     |  Bin 1361 -> 0 bytes
 .../ignite/portable/test2/1.1/test2-1.1.pom     |    9 -
 .../portable/test2/maven-metadata-local.xml     |   12 -
 .../hadoop/SecondaryFileSystemProvider.java     |    4 +-
 .../hadoop/igfs/HadoopIgfsWrapper.java          |  100 +-
 .../HadoopDefaultMapReducePlannerSelfTest.java  |    6 +
 .../testsuites/IgniteHadoopTestSuite.java       |    6 +-
 .../query/h2/opt/GridH2AbstractKeyValueRow.java |   31 +-
 ...CacheScanPartitionQueryFallbackSelfTest.java |  105 +-
 ...QueryOffheapEvictsMultiThreadedSelfTest.java |    5 -
 ...lientQueryReplicatedNodeRestartSelfTest.java |    8 +-
 .../IgniteCacheQueryNodeRestartSelfTest.java    |    4 +-
 .../IgniteCacheQueryNodeRestartSelfTest2.java   |   10 +-
 .../IgniteCacheReplicatedQuerySelfTest.java     |   49 +-
 .../IgnitePortableCacheQueryTestSuite.java      |  117 -
 .../platform/PlatformContextImpl.java           |    4 +-
 .../platform/compute/PlatformCompute.java       |    2 +-
 .../cpp/PlatformCppConfigurationClosure.java    |    2 +-
 .../PlatformDotNetConfigurationClosure.java     |    6 +-
 .../platform/events/PlatformEvents.java         |    2 +-
 .../services/PlatformAbstractService.java       |    3 +-
 .../Cache/CacheAbstractTest.cs                  |   71 +-
 .../Config/Compute/compute-grid1.xml            |    8 +-
 .../PlatformComputePortableArgTask.java         |    8 +-
 .../ignite/schema/generator/CodeGenerator.java  |    4 +-
 .../ignite/schema/model/PojoDescriptor.java     |    6 +-
 .../parser/dialect/OracleMetadataDialect.java   |    7 +-
 .../org/apache/ignite/IgniteSpringBean.java     |    7 -
 .../yardstick/config/benchmark-query.properties |    5 +-
 modules/yardstick/config/ignite-base-config.xml |    2 +-
 modules/yardstick/config/ignite-jdbc-config.xml |   55 +
 parent/pom.xml                                  |   10 -
 pom.xml                                         |   10 +
 343 files changed, 15499 insertions(+), 18992 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b80b1719/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
index 6786b7e,da15de3..1056990
--- a/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
@@@ -267,10 -233,10 +268,11 @@@ public class SocketStreamerSelfTest ext
       * @param converter Converter.
       * @param r Runnable..
       */
-     private void test(@Nullable SocketMessageConverter<Message> converter, @Nullable
byte[] delim, Runnable r,
-         boolean oneMessagePerTuple) throws Exception
-     {
 -    private void test(@Nullable SocketMessageConverter<Tuple> converter,
 -        @Nullable byte[] delim,
 -        Runnable r) throws Exception {
 -        SocketStreamer<Tuple, Integer, String> sockStmr = null;
++    private void test(@Nullable SocketMessageConverter<Message> converter, 
++        @Nullable byte[] delim, 
++        Runnable r,
++        boolean oneMessagePerTuple) throws Exception {
 +        SocketStreamer<Message, Integer, String> sockStmr = null;
  
          Ignite ignite = grid(0);
  


Mime
View raw message