ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [50/50] [abbrv] ignite git commit: Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843
Date Wed, 26 Aug 2015 03:07:01 GMT
Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite
into ignite-843

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
	modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
	modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/dialect/DatabaseMetadataDialect.java
	modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
	modules/schema-import/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
	modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/JdbcMetadataDialect.java
	modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
	parent/pom.xml


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

Branch: refs/heads/ignite-843
Commit: dfd1774504ee3522e3042426a09b1bf383ee21f7
Parents: 7aa622e 89e94b6
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Wed Aug 26 10:06:26 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Aug 26 10:06:26 2015 +0700

----------------------------------------------------------------------
 .../examples/igfs/IgfsMapReduceExample.java     |    3 +
 .../examples/servicegrid/ServicesExample.java   |   13 +-
 .../ignite/codegen/MessageCodeGenerator.java    |   30 +-
 modules/core/pom.xml                            |   21 +
 .../src/main/java/org/apache/ignite/Ignite.java |    7 +
 .../java/org/apache/ignite/IgniteCache.java     |   41 +
 .../java/org/apache/ignite/IgnitePortables.java |  362 ++
 .../configuration/CacheConfiguration.java       |   40 +
 .../configuration/IgniteConfiguration.java      |   22 +
 .../configuration/PlatformConfiguration.java    |   25 +
 .../internal/GridEventConsumeHandler.java       |   14 +-
 .../ignite/internal/GridJobCancelRequest.java   |    2 +-
 .../ignite/internal/GridJobExecuteRequest.java  |    2 +-
 .../ignite/internal/GridJobExecuteResponse.java |    2 +-
 .../ignite/internal/GridJobSiblingsRequest.java |    2 +-
 .../internal/GridJobSiblingsResponse.java       |    2 +-
 .../ignite/internal/GridKernalContext.java      |    6 +
 .../ignite/internal/GridKernalContextImpl.java  |   15 +-
 .../ignite/internal/GridTaskCancelRequest.java  |    2 +-
 .../ignite/internal/GridTaskSessionRequest.java |    2 +-
 .../org/apache/ignite/internal/IgniteEx.java    |    1 +
 .../apache/ignite/internal/IgniteKernal.java    |   13 +-
 .../internal/direct/DirectByteBufferStream.java |    2 +-
 .../internal/direct/DirectMessageReader.java    |    6 +
 .../interop/InteropAwareEventFilter.java        |   37 -
 .../internal/interop/InteropBootstrap.java      |   35 -
 .../interop/InteropBootstrapFactory.java        |   39 -
 .../internal/interop/InteropException.java      |   71 -
 .../internal/interop/InteropIgnition.java       |  186 -
 .../interop/InteropLocalEventListener.java      |   28 -
 .../interop/InteropNoCallbackException.java     |   50 -
 .../internal/interop/InteropProcessor.java      |   39 -
 .../checkpoint/GridCheckpointRequest.java       |    2 +-
 .../managers/communication/GridIoManager.java   |    2 +-
 .../managers/communication/GridIoMessage.java   |    8 +-
 .../communication/GridIoMessageFactory.java     |    6 +
 .../communication/GridIoUserMessage.java        |    2 +-
 .../deployment/GridDeploymentInfoBean.java      |    2 +-
 .../deployment/GridDeploymentRequest.java       |    2 +-
 .../deployment/GridDeploymentResponse.java      |    2 +-
 .../eventstorage/GridEventStorageManager.java   |   10 +-
 .../eventstorage/GridEventStorageMessage.java   |    2 +-
 .../platform/PlatformAwareEventFilter.java      |   37 +
 .../platform/PlatformLocalEventListener.java    |   28 +
 .../portable/GridPortableMarshaller.java        |  304 ++
 .../portable/PortableAbstractLazyValue.java     |   57 +
 .../internal/portable/PortableBuilderEnum.java  |  114 +
 .../internal/portable/PortableBuilderImpl.java  |  519 +++
 .../portable/PortableBuilderReader.java         |  775 ++++
 .../PortableBuilderSerializationAware.java      |   29 +
 .../portable/PortableBuilderSerializer.java     |  210 +
 .../portable/PortableClassDescriptor.java       | 1344 +++++++
 .../internal/portable/PortableContext.java      | 1089 ++++++
 .../portable/PortableEnumArrayLazyValue.java    |  111 +
 .../portable/PortableLazyArrayList.java         |  156 +
 .../portable/PortableLazyLinkedList.java        |  210 +
 .../internal/portable/PortableLazyMap.java      |  214 +
 .../internal/portable/PortableLazyMapEntry.java |   66 +
 .../internal/portable/PortableLazySet.java      |   89 +
 .../internal/portable/PortableLazyValue.java    |   28 +
 .../portable/PortableMetaDataCollector.java     |  253 ++
 .../portable/PortableMetaDataHandler.java       |   43 +
 .../internal/portable/PortableMetaDataImpl.java |  140 +
 .../portable/PortableObjectArrayLazyValue.java  |   89 +
 .../internal/portable/PortableObjectEx.java     |  213 +
 .../internal/portable/PortableObjectImpl.java   |  383 ++
 .../portable/PortableObjectOffheapImpl.java     |  238 ++
 .../portable/PortablePlainLazyValue.java        |   47 +
 .../portable/PortablePlainPortableObject.java   |   50 +
 .../internal/portable/PortablePrimitives.java   |  773 ++++
 .../internal/portable/PortableRawReaderEx.java  |   33 +
 .../internal/portable/PortableRawWriterEx.java  |   60 +
 .../portable/PortableReaderContext.java         |   83 +
 .../internal/portable/PortableReaderExImpl.java | 2949 ++++++++++++++
 .../PortableThreadLocalMemoryAllocator.java     |  163 +
 .../ignite/internal/portable/PortableUtils.java |  419 ++
 .../portable/PortableValueWithType.java         |   74 +
 .../internal/portable/PortableWriterExImpl.java | 1759 +++++++++
 .../ignite/internal/portable/package-info.java  |   22 +
 .../streams/PortableAbstractInputStream.java    |  343 ++
 .../streams/PortableAbstractOutputStream.java   |  323 ++
 .../streams/PortableAbstractStream.java         |   82 +
 .../streams/PortableHeapInputStream.java        |  134 +
 .../streams/PortableHeapOutputStream.java       |  155 +
 .../portable/streams/PortableInputStream.java   |  168 +
 .../streams/PortableMemoryAllocator.java        |   76 +
 .../streams/PortableOffheapInputStream.java     |  129 +
 .../streams/PortableOffheapOutputStream.java    |  169 +
 .../portable/streams/PortableOutputStream.java  |  165 +
 .../streams/PortableSimpleMemoryAllocator.java  |   67 +
 .../portable/streams/PortableStream.java        |   53 +
 .../internal/portable/streams/package-info.java |   22 +
 .../affinity/AffinityTopologyVersion.java       |    2 +-
 .../cache/CacheEntryInfoCollection.java         |    2 +-
 .../cache/CacheEntryPredicateAdapter.java       |    2 +-
 .../cache/CacheEntryPredicateContainsValue.java |    2 +-
 .../cache/CacheEntrySerializablePredicate.java  |    2 +-
 .../processors/cache/CacheEvictionEntry.java    |    2 +-
 .../cache/CacheInvokeDirectResult.java          |    2 +-
 .../processors/cache/CacheObjectAdapter.java    |    2 +-
 .../cache/CacheObjectByteArrayImpl.java         |    2 +-
 .../processors/cache/GridCacheEntryInfo.java    |    2 +-
 .../cache/GridCacheEvictionRequest.java         |    2 +-
 .../cache/GridCacheEvictionResponse.java        |    2 +-
 .../processors/cache/GridCacheMessage.java      |    2 +-
 .../processors/cache/GridCacheProcessor.java    |   70 +-
 .../processors/cache/GridCacheReturn.java       |    2 +-
 .../processors/cache/IgniteCacheProxy.java      |    5 +
 .../distributed/GridCacheTtlUpdateRequest.java  |    3 +-
 .../distributed/GridCacheTxRecoveryRequest.java |    2 +-
 .../GridCacheTxRecoveryResponse.java            |    2 +-
 .../distributed/GridDistributedBaseMessage.java |    2 +-
 .../distributed/GridDistributedLockRequest.java |    2 +-
 .../GridDistributedLockResponse.java            |    2 +-
 .../GridDistributedTxFinishRequest.java         |    8 +-
 .../GridDistributedTxFinishResponse.java        |    2 +-
 .../GridDistributedTxPrepareRequest.java        |    8 +-
 .../GridDistributedTxPrepareResponse.java       |    2 +-
 .../GridDistributedUnlockRequest.java           |    2 +-
 .../dht/GridDhtAffinityAssignmentRequest.java   |    2 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |    2 +-
 .../distributed/dht/GridDhtLockRequest.java     |    6 +-
 .../distributed/dht/GridDhtLockResponse.java    |    2 +-
 .../distributed/dht/GridDhtTxFinishRequest.java |    2 +-
 .../dht/GridDhtTxFinishResponse.java            |    2 +-
 .../dht/GridDhtTxPrepareRequest.java            |    2 +-
 .../dht/GridDhtTxPrepareResponse.java           |    2 +-
 .../distributed/dht/GridDhtUnlockRequest.java   |    2 +-
 .../GridDhtAtomicDeferredUpdateResponse.java    |    2 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |    2 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |    2 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |    2 +-
 .../atomic/GridNearAtomicUpdateResponse.java    |    2 +-
 .../dht/preloader/GridDhtForceKeysRequest.java  |    3 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |    4 +-
 .../GridDhtPartitionDemandMessage.java          |    2 +-
 .../preloader/GridDhtPartitionExchangeId.java   |    2 +-
 .../GridDhtPartitionSupplyMessage.java          |    2 +-
 .../GridDhtPartitionsAbstractMessage.java       |    2 +-
 .../preloader/GridDhtPartitionsFullMessage.java |    2 +-
 .../GridDhtPartitionsSingleMessage.java         |    2 +-
 .../GridDhtPartitionsSingleRequest.java         |    2 +-
 .../distributed/near/CacheVersionedValue.java   |    2 +-
 .../distributed/near/GridNearGetRequest.java    |    2 +-
 .../distributed/near/GridNearGetResponse.java   |    2 +-
 .../distributed/near/GridNearLockRequest.java   |    2 +-
 .../distributed/near/GridNearLockResponse.java  |    2 +-
 .../near/GridNearTxFinishRequest.java           |    2 +-
 .../near/GridNearTxFinishResponse.java          |    2 +-
 .../near/GridNearTxPrepareRequest.java          |    2 +-
 .../near/GridNearTxPrepareResponse.java         |    2 +-
 .../distributed/near/GridNearUnlockRequest.java |    2 +-
 .../CacheDefaultPortableAffinityKeyMapper.java  |   51 +
 .../portable/CacheObjectPortableContext.java    |  187 +
 .../portable/CacheObjectPortableProcessor.java  |  101 +
 .../CacheObjectPortableProcessorImpl.java       |  956 +++++
 .../cache/portable/IgnitePortablesImpl.java     |  176 +
 .../cache/portable/PortableMetaDataKey.java     |   80 +
 .../processors/cache/portable/package-info.java |   22 +
 .../cache/query/GridCacheQueryRequest.java      |    2 +-
 .../cache/query/GridCacheQueryResponse.java     |    2 +-
 .../cache/query/GridCacheSqlQuery.java          |    9 +-
 .../continuous/CacheContinuousQueryEntry.java   |    2 +-
 .../cache/store/CacheOsStoreManager.java        |    3 +-
 .../cache/transactions/IgniteTxEntry.java       |    2 +-
 .../cache/transactions/IgniteTxKey.java         |    2 +-
 .../cache/transactions/TxEntryValueHolder.java  |    2 +-
 .../version/GridCacheRawVersionedEntry.java     |    2 +-
 .../cache/version/GridCacheVersion.java         |    2 +-
 .../cache/version/GridCacheVersionEx.java       |    2 +-
 .../clock/GridClockDeltaSnapshotMessage.java    |    2 +-
 .../processors/clock/GridClockDeltaVersion.java |    2 +-
 .../continuous/GridContinuousMessage.java       |    2 +-
 .../datastreamer/DataStreamerEntry.java         |    2 +-
 .../datastreamer/DataStreamerRequest.java       |    2 +-
 .../datastreamer/DataStreamerResponse.java      |    2 +-
 .../processors/igfs/IgfsAckMessage.java         |    2 +-
 .../internal/processors/igfs/IgfsBlockKey.java  |    2 +-
 .../processors/igfs/IgfsBlocksMessage.java      |    2 +-
 .../igfs/IgfsCommunicationMessage.java          |    2 +-
 .../processors/igfs/IgfsDeleteMessage.java      |    2 +-
 .../processors/igfs/IgfsFileAffinityRange.java  |    9 +-
 .../igfs/IgfsFragmentizerRequest.java           |    2 +-
 .../igfs/IgfsFragmentizerResponse.java          |    2 +-
 .../processors/igfs/IgfsSyncMessage.java        |    2 +-
 .../platform/PlatformNoopProcessor.java         |   41 +
 .../processors/platform/PlatformProcessor.java  |   40 +
 .../portable/GridPortableInputStream.java       |  168 -
 .../portable/GridPortableOutputStream.java      |  165 -
 .../processors/portable/GridPortableStream.java |   53 -
 .../processors/portable/package-info.java       |   22 -
 .../messages/GridQueryCancelRequest.java        |    2 +-
 .../twostep/messages/GridQueryFailResponse.java |    2 +-
 .../messages/GridQueryNextPageRequest.java      |    2 +-
 .../messages/GridQueryNextPageResponse.java     |    3 +-
 .../h2/twostep/messages/GridQueryRequest.java   |    5 +-
 .../handlers/task/GridTaskResultRequest.java    |    2 +-
 .../handlers/task/GridTaskResultResponse.java   |    2 +-
 .../ignite/internal/util/GridByteArrayList.java |    2 +-
 .../ignite/internal/util/GridLongList.java      |    2 +-
 .../internal/util/nio/GridDirectParser.java     |    2 +-
 .../visor/cache/VisorCacheClearTask.java        |   11 +-
 .../marshaller/portable/PortableMarshaller.java |  347 ++
 .../marshaller/portable/package-info.java       |   22 +
 .../communication/MessageFormatter.java         |    3 +-
 .../extensions/communication/MessageReader.java |   13 +
 .../apache/ignite/portable/PortableBuilder.java |  138 +
 .../ignite/portable/PortableException.java      |   58 +
 .../ignite/portable/PortableIdMapper.java       |   56 +
 .../portable/PortableInvalidClassException.java |   58 +
 .../ignite/portable/PortableMarshalAware.java   |   48 +
 .../ignite/portable/PortableMetadata.java       |   63 +
 .../apache/ignite/portable/PortableObject.java  |  153 +
 .../portable/PortableProtocolVersion.java       |   41 +
 .../ignite/portable/PortableRawReader.java      |  233 ++
 .../ignite/portable/PortableRawWriter.java      |  218 ++
 .../apache/ignite/portable/PortableReader.java  |  283 ++
 .../ignite/portable/PortableSerializer.java     |   49 +
 .../portable/PortableTypeConfiguration.java     |  197 +
 .../apache/ignite/portable/PortableWriter.java  |  265 ++
 .../apache/ignite/portable/package-info.java    |   22 +
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |    2 +-
 .../jobstealing/JobStealingRequest.java         |    2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |    8 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |    9 +-
 .../resources/META-INF/classnames.properties    |  287 +-
 .../GridPortableAffinityKeySelfTest.java        |  215 +
 .../GridPortableBuilderAdditionalSelfTest.java  | 1001 +++++
 .../portable/GridPortableBuilderSelfTest.java   | 1007 +++++
 ...eBuilderStringAsCharsAdditionalSelfTest.java |   28 +
 ...ridPortableBuilderStringAsCharsSelfTest.java |   28 +
 ...idPortableMarshallerCtxDisabledSelfTest.java |  128 +
 .../GridPortableMarshallerSelfTest.java         | 3691 ++++++++++++++++++
 .../GridPortableMetaDataDisabledSelfTest.java   |  218 ++
 .../portable/GridPortableMetaDataSelfTest.java  |  343 ++
 .../portable/GridPortableWildcardsSelfTest.java |  480 +++
 .../GridPortableMarshalerAwareTestClass.java    |   62 +
 .../mutabletest/GridPortableTestClasses.java    |  425 ++
 .../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 +
 .../GridCacheDaemonNodeAbstractSelfTest.java    |    9 +-
 .../near/IgniteCacheNearOnlyTxTest.java         |   82 +-
 .../local/GridCacheDaemonNodeLocalSelfTest.java |   30 -
 ...ClientNodePortableMetadataMultinodeTest.java |  277 ++
 ...GridCacheClientNodePortableMetadataTest.java |  280 ++
 ...ableObjectsAbstractDataStreamerSelfTest.java |  183 +
 ...bleObjectsAbstractMultiThreadedSelfTest.java |  222 ++
 ...ridCachePortableObjectsAbstractSelfTest.java |  958 +++++
 .../GridCachePortableStoreAbstractSelfTest.java |  294 ++
 .../GridCachePortableStoreObjectsSelfTest.java  |   55 +
 ...GridCachePortableStorePortablesSelfTest.java |   67 +
 ...ridPortableCacheEntryMemorySizeSelfTest.java |   52 +
 ...leDuplicateIndexObjectsAbstractSelfTest.java |  153 +
 .../DataStreamProcessorPortableSelfTest.java    |   67 +
 .../GridDataStreamerImplSelfTest.java           |  338 ++
 ...ridCacheAffinityRoutingPortableSelfTest.java |   48 +
 ...lyPortableDataStreamerMultiNodeSelfTest.java |   29 +
 ...rtableDataStreamerMultithreadedSelfTest.java |   46 +
 ...artitionedOnlyPortableMultiNodeSelfTest.java |   28 +
 ...tionedOnlyPortableMultithreadedSelfTest.java |   46 +
 .../GridCacheMemoryModePortableSelfTest.java    |   36 +
 ...acheOffHeapTieredAtomicPortableSelfTest.java |   48 +
 ...eapTieredEvictionAtomicPortableSelfTest.java |   96 +
 ...heOffHeapTieredEvictionPortableSelfTest.java |   96 +
 .../GridCacheOffHeapTieredPortableSelfTest.java |   48 +
 ...ateIndexObjectPartitionedAtomicSelfTest.java |   37 +
 ...xObjectPartitionedTransactionalSelfTest.java |   40 +
 ...AtomicNearDisabledOffheapTieredSelfTest.java |   29 +
 ...rtableObjectsAtomicNearDisabledSelfTest.java |   50 +
 ...tableObjectsAtomicOffheapTieredSelfTest.java |   29 +
 .../GridCachePortableObjectsAtomicSelfTest.java |   50 +
 ...tionedNearDisabledOffheapTieredSelfTest.java |   30 +
 ...eObjectsPartitionedNearDisabledSelfTest.java |   50 +
 ...ObjectsPartitionedOffheapTieredSelfTest.java |   30 +
 ...CachePortableObjectsPartitionedSelfTest.java |   50 +
 ...sNearPartitionedByteArrayValuesSelfTest.java |   41 +
 ...sPartitionedOnlyByteArrayValuesSelfTest.java |   42 +
 ...dCachePortableObjectsReplicatedSelfTest.java |   50 +
 ...CachePortableObjectsAtomicLocalSelfTest.java |   32 +
 ...rtableObjectsLocalOffheapTieredSelfTest.java |   29 +
 .../GridCachePortableObjectsLocalSelfTest.java  |   50 +
 .../tcp/TcpDiscoverySpiStartStopSelfTest.java   |    2 +-
 .../testframework/GridSpiTestContext.java       |    2 +-
 .../ignite/testframework/junits/IgniteMock.java |    5 +
 .../multijvm/IgniteCacheProcessProxy.java       |    5 +
 .../junits/multijvm/IgniteProcessProxy.java     |    5 +
 .../IgnitePortableCacheFullApiTestSuite.java    |   38 +
 .../IgnitePortableCacheTestSuite.java           |   86 +
 .../IgnitePortableObjectsTestSuite.java         |   74 +
 .../ignite/portable/test1/1.1/test1-1.1.jar     |  Bin 0 -> 2548 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 0 -> 1361 bytes
 .../ignite/portable/test2/1.1/test2-1.1.pom     |    9 +
 .../portable/test2/maven-metadata-local.xml     |   12 +
 .../IgnitePortableCacheQueryTestSuite.java      |   95 +
 modules/platform/pom.xml                        |   65 +
 .../Apache.Ignite.Core.csproj                   |   72 +
 .../main/dotnet/Apache.Ignite.Core/Ignition.cs  |   23 +
 .../Impl/Memory/IPlatformMemory.cs              |   62 +
 .../Memory/PlatformBigEndianMemoryStream.cs     |  483 +++
 .../Impl/Memory/PlatformMemory.cs               |   77 +
 .../Impl/Memory/PlatformMemoryManager.cs        |  106 +
 .../Impl/Memory/PlatformMemoryPool.cs           |  105 +
 .../Impl/Memory/PlatformMemoryStream.cs         |  676 ++++
 .../Impl/Memory/PlatformMemoryUtils.cs          |  462 +++
 .../Impl/Memory/PlatformPooledMemory.cs         |   70 +
 .../Impl/Memory/PlatformRawMemory.cs            |   88 +
 .../Impl/Memory/PlatformUnpooledMemory.cs       |   52 +
 .../Impl/Portable/Io/IPortableStream.cs         |  320 ++
 .../Properties/AssemblyInfo.cs                  |   45 +
 .../platform/src/main/dotnet/Apache.Ignite.sln  |   35 +
 .../main/dotnet/Apache.Ignite.sln.DotSettings   |    4 +
 .../internal/platform/PlatformBootstrap.java    |   36 +
 .../platform/PlatformBootstrapFactory.java      |   37 +
 .../internal/platform/PlatformException.java    |   71 +
 .../internal/platform/PlatformIgnition.java     |  187 +
 .../platform/PlatformNoCallbackException.java   |   50 +
 .../callback/PlatformCallbackGateway.java       |  869 +++++
 .../callback/PlatformCallbackUtils.java         |  468 +++
 .../platform/memory/PlatformAbstractMemory.java |  121 +
 .../PlatformBigEndianInputStreamImpl.java       |  126 +
 .../PlatformBigEndianOutputStreamImpl.java      |  162 +
 .../platform/memory/PlatformExternalMemory.java |   55 +
 .../platform/memory/PlatformInputStream.java    |   30 +
 .../memory/PlatformInputStreamImpl.java         |  323 ++
 .../platform/memory/PlatformMemory.java         |   77 +
 .../platform/memory/PlatformMemoryManager.java  |   46 +
 .../memory/PlatformMemoryManagerImpl.java       |   83 +
 .../platform/memory/PlatformMemoryPool.java     |  133 +
 .../platform/memory/PlatformMemoryUtils.java    |  468 +++
 .../platform/memory/PlatformOutputStream.java   |   30 +
 .../memory/PlatformOutputStreamImpl.java        |  259 ++
 .../platform/memory/PlatformPooledMemory.java   |   63 +
 .../platform/memory/PlatformUnpooledMemory.java |   51 +
 .../Apache.Ignite.Core.Tests.csproj             |   65 +
 .../Apache.Ignite.Core.Tests/IgnitionTest.cs    |   30 +
 .../Memory/InteropMemoryTest.cs                 |  213 +
 .../Properties/AssemblyInfo.cs                  |   35 +
 .../Apache.Ignite.Core.Tests/TestRunner.cs      |   70 +
 .../parser/dialect/OracleMetadataDialect.java   |    4 +-
 .../org/apache/ignite/IgniteSpringBean.java     |    7 +
 parent/pom.xml                                  |   12 +
 pom.xml                                         |    7 +-
 scripts/apply-pull-request.sh                   |  141 +
 350 files changed, 39292 insertions(+), 1318 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/dfd17745/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/ignite/blob/dfd17745/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 36b263c,d0a0fe7..d603835
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@@ -495,10 -491,8 +501,12 @@@ public class GridKernalContextImpl impl
              dataStructuresProc = (DataStructuresProcessor)comp;
          else if (comp instanceof ClusterProcessor)
              cluster = (ClusterProcessor)comp;
+         else if (comp instanceof PlatformProcessor)
+             platformProc = (PlatformProcessor)comp;
 +        else if (comp instanceof IgniteScriptingProcessor)
 +            scriptProc = (IgniteScriptingProcessor)comp;
 +        else if (comp instanceof IgniteJsonProcessor)
 +            json = (IgniteJsonProcessor)comp;
          else if (!(comp instanceof DiscoveryNodeValidationProcessor))
              assert (comp instanceof GridPluginComponent) : "Unknown manager class: " + comp.getClass();
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/dfd17745/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index c8d97df,1db73bf..de12053
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@@ -791,7 -791,7 +793,8 @@@ public class IgniteKernal implements Ig
                  IgniteComponentType.HADOOP.createIfInClassPath(ctx, cfg.getHadoopConfiguration()
!= null)));
              startProcessor(new GridServiceProcessor(ctx));
              startProcessor(new DataStructuresProcessor(ctx));
+             startProcessor(createComponent(PlatformProcessor.class, ctx));
 +            startProcessor((GridProcessor)IgniteComponentType.JSON.createIfInClassPath(ctx,
false));
  
              // Start plugins.
              for (PluginProvider provider : ctx.plugins().allProviders()) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/dfd17745/modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
----------------------------------------------------------------------
diff --cc modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
index a3cc203,0000000..c569a29
mode 100644,000000..100644
--- a/modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
+++ b/modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
@@@ -1,327 -1,0 +1,327 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *      http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +
 +package org.apache.ignite.schema.parser.dialect;
 +
 +import org.apache.ignite.schema.parser.*;
 +
 +import java.sql.*;
 +import java.util.*;
 +
 +import static java.sql.Types.*;
 +
 +/**
 + * Oracle specific metadata dialect.
 + */
 +public class OracleMetadataDialect extends DatabaseMetadataDialect {
 +    /** SQL to get columns metadata. */
 +    private static final String SQL_COLUMNS = "SELECT a.owner, a.table_name, a.column_name,
a.nullable," +
 +        " a.data_type, a.data_precision, a.data_scale " +
 +        "FROM all_tab_columns a %s " +
 +        " %s " +
 +        " ORDER BY a.owner, a.table_name, a.column_id";
 +
 +    /** SQL to get list of PRIMARY KEYS columns. */
 +    private static final String SQL_PRIMARY_KEYS = "SELECT b.column_name" +
 +        " FROM all_constraints a" +
 +        "  INNER JOIN all_cons_columns b ON a.owner = b.owner AND a.constraint_name = b.constraint_name"
+
 +        " WHERE a.owner = ? and a.table_name = ? AND a.constraint_type = 'P'";
 +
 +    /** SQL to get indexes metadata. */
 +    private static final String SQL_INDEXES = "SELECT i.index_name, u.column_expression,
i.column_name, i.descend" +
 +        " FROM all_ind_columns i" +
 +        " LEFT JOIN user_ind_expressions u on u.index_name = i.index_name and i.table_name
= u.table_name" +
 +        " WHERE i.index_owner = ? and i.table_name = ?" +
 +        " ORDER BY i.index_name, i.column_position";
 +
 +    /** Owner index. */
 +    private static final int OWNER_IDX = 1;
 +
 +    /** Table name index. */
 +    private static final int TBL_NAME_IDX = 2;
 +
 +    /** Column name index. */
 +    private static final int COL_NAME_IDX = 3;
 +
 +    /** Nullable index. */
 +    private static final int NULLABLE_IDX = 4;
 +
 +    /** Data type index. */
 +    private static final int DATA_TYPE_IDX = 5;
 +
 +    /** Numeric precision index. */
 +    private static final int DATA_PRECISION_IDX = 6;
 +
 +    /** Numeric scale index. */
 +    private static final int DATA_SCALE_IDX = 7;
 +
 +    /** Index name index. */
 +    private static final int IDX_NAME_IDX = 1;
 +
 +    /** Index name index. */
 +    private static final int IDX_EXPR_IDX = 2;
 +
 +    /** Index column name index. */
 +    private static final int IDX_COL_NAME_IDX = 3;
 +
 +    /** Index column sort order index. */
 +    private static final int IDX_COL_DESCEND_IDX = 4;
 +
 +    /** {@inheritDoc} */
 +    @Override public Set<String> systemSchemas() {
 +        return new HashSet<>(Arrays.asList("ANONYMOUS", "CTXSYS", "DBSNMP", "EXFSYS",
"LBACSYS", "MDSYS", "MGMT_VIEW",
 +            "OLAPSYS", "OWBSYS", "ORDPLUGINS", "ORDSYS", "OUTLN", "SI_INFORMTN_SCHEMA",
"SYS", "SYSMAN", "SYSTEM",
 +            "TSMSYS", "WK_TEST", "WKSYS", "WKPROXY", "WMSYS", "XDB",
 +
 +            "APEX_040000", "APEX_PUBLIC_USER", "DIP", "FLOWS_30000", "FLOWS_FILES", "MDDATA",
"ORACLE_OCM",
 +            "SPATIAL_CSW_ADMIN_USR", "SPATIAL_WFS_ADMIN_USR", "XS$NULL",
 +
 +            "BI", "HR", "OE", "PM", "IX", "SH"));
 +    }
 +
 +    /** {@inheritDoc} */
-     @Override public Collection<String> schemas(Connection conn) throws SQLException
{
-         Collection<String> schemas = new ArrayList<>();
++    @Override public List<String> schemas(Connection conn) throws SQLException {
++        List<String> schemas = new ArrayList<>();
 +
 +        ResultSet rs = conn.getMetaData().getSchemas();
 +
 +        Set<String> sysSchemas = systemSchemas();
 +
 +        while(rs.next()) {
 +            String schema = rs.getString(1);
 +
 +            if (!sysSchemas.contains(schema) && !schema.startsWith("FLOWS_"))
 +                schemas.add(schema);
 +        }
 +
 +        return schemas;
 +    }
 +
 +    /**
 +     * @param rs Result set with column type metadata from Oracle database.
 +     * @return JDBC type.
 +     * @throws SQLException If failed to decode type.
 +     */
 +    private int decodeType(ResultSet rs) throws SQLException {
 +        String type = rs.getString(DATA_TYPE_IDX);
 +
 +        if (type.startsWith("TIMESTAMP"))
 +            return TIMESTAMP;
 +        else {
 +            switch (type) {
 +                case "CHAR":
 +                case "NCHAR":
 +                    return CHAR;
 +
 +                case "VARCHAR2":
 +                case "NVARCHAR2":
 +                    return VARCHAR;
 +
 +                case "LONG":
 +                    return LONGVARCHAR;
 +
 +                case "LONG RAW":
 +                    return LONGVARBINARY;
 +
 +                case "FLOAT":
 +                    return FLOAT;
 +
 +                case "NUMBER":
 +                    int precision = rs.getInt(DATA_PRECISION_IDX);
 +                    int scale = rs.getInt(DATA_SCALE_IDX);
 +
 +                    if (scale > 0) {
 +                        if (scale < 4 && precision < 19)
 +                            return FLOAT;
 +
 +                        if (scale > 4 || precision > 19)
 +                            return DOUBLE;
 +
 +                        return NUMERIC;
 +                    }
 +                    else {
 +                        if (precision < 1)
 +                            return INTEGER;
 +
 +                        if (precision < 2)
 +                            return BOOLEAN;
 +
 +                        if (precision < 4)
 +                            return TINYINT;
 +
 +                        if (precision < 6)
 +                            return SMALLINT;
 +
 +                        if (precision < 11)
 +                            return INTEGER;
 +
 +                        if (precision < 20)
 +                            return BIGINT;
 +
 +                        return NUMERIC;
 +                    }
 +
 +                case "DATE":
 +                    return DATE;
 +
 +                case "BFILE":
 +                case "BLOB":
 +                    return BLOB;
 +
 +                case "CLOB":
 +                case "NCLOB":
 +                case "XMLTYPE":
 +                    return CLOB;
 +            }
 +        }
 +
 +        return OTHER;
 +    }
 +
 +    /**
 +     * Retrieve primary key columns.
 +     *
 +     * @param stmt Prepared SQL statement to execute.
 +     * @param owner DB owner.
 +     * @param tbl Table name.
 +     * @return Primary key columns.
 +     * @throws SQLException If failed to retrieve primary key columns.
 +     */
 +    private Set<String> primaryKeys(PreparedStatement stmt, String owner, String tbl)
throws SQLException {
 +        Set<String> pkCols = new HashSet<>();
 +
 +        stmt.setString(1, owner);
 +        stmt.setString(2, tbl);
 +
 +        try (ResultSet pkRs = stmt.executeQuery()) {
 +            while(pkRs.next())
 +                pkCols.add(pkRs.getString(1));
 +        }
 +
 +        return pkCols;
 +    }
 +
 +    /**
 +     * Retrieve index columns.
 +     *
 +     * @param stmt Prepared SQL statement to execute.
 +     * @param owner DB owner.
 +     * @param tbl Table name.
 +     * @return Index columns.
 +     * @throws SQLException If failed to retrieve indexes columns.
 +     */
 +    private Map<String, Map<String, Boolean>> indexes(PreparedStatement stmt,
String owner, String tbl)
 +        throws SQLException {
 +        Map<String, Map<String, Boolean>> idxs = new LinkedHashMap<>();
 +
 +        stmt.setString(1, owner);
 +        stmt.setString(2, tbl);
 +
 +        try (ResultSet idxsRs = stmt.executeQuery()) {
 +            while (idxsRs.next()) {
 +                String idxName = idxsRs.getString(IDX_NAME_IDX);
 +
 +                Map<String, Boolean> idx = idxs.get(idxName);
 +
 +                if (idx == null) {
 +                    idx = new LinkedHashMap<>();
 +
 +                    idxs.put(idxName, idx);
 +                }
 +
 +                String expr = idxsRs.getString(IDX_EXPR_IDX);
 +
 +                String col = expr == null ? idxsRs.getString(IDX_COL_NAME_IDX) : expr.replaceAll("\"",
"");
 +
 +                idx.put(col, "DESC".equals(idxsRs.getString(IDX_COL_DESCEND_IDX)));
 +            }
 +        }
 +
 +        return idxs;
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public Collection<DbTable> tables(Connection conn, List<String>
schemas, boolean tblsOnly)
 +        throws SQLException {
 +        Collection<DbTable> tbls = new ArrayList<>();
 +
 +        PreparedStatement pkStmt = conn.prepareStatement(SQL_PRIMARY_KEYS);
 +
 +        PreparedStatement idxStmt = conn.prepareStatement(SQL_INDEXES);
 +
 +        if (schemas.size() == 0)
 +            schemas.add(null);
 +
 +        Set<String> sysSchemas = systemSchemas();
 +
 +        try (Statement colsStmt = conn.createStatement()) {
 +            for (String schema: schemas) {
 +                if (systemSchemas().contains(schema) || (schema != null && schema.startsWith("FLOWS_")))
 +                    continue;
 +
 +                Collection<DbColumn> cols = new ArrayList<>();
 +
 +                Set<String> pkCols = Collections.emptySet();
 +                Map<String, Map<String, Boolean>> idxs = Collections.emptyMap();
 +
 +                String sql = String.format(SQL_COLUMNS,
 +                        tblsOnly ? "INNER JOIN all_tables b on a.table_name = b.table_name
and a.owner = b.owner" : "",
 +                        schema != null ? String.format(" WHERE a.owner = '%s' ", schema)
: "");
 +
 +                try (ResultSet colsRs = colsStmt.executeQuery(sql)) {
 +                    String prevSchema = "";
 +                    String prevTbl = "";
 +
 +                    boolean first = true;
 +
 +                    while (colsRs.next()) {
 +                        String owner = colsRs.getString(OWNER_IDX);
 +                        String tbl = colsRs.getString(TBL_NAME_IDX);
 +
 +                        if (sysSchemas.contains(owner) || (schema != null && schema.startsWith("FLOWS_")))
 +                            continue;
 +
 +                        boolean changed = !owner.equals(prevSchema) || !tbl.equals(prevTbl);
 +
 +                        if (changed) {
 +                            if (first)
 +                                first = false;
 +                            else
 +                                tbls.add(table(prevSchema, prevTbl, cols, idxs));
 +
 +                            prevSchema = owner;
 +                            prevTbl = tbl;
 +                            cols = new ArrayList<>();
 +                            pkCols = primaryKeys(pkStmt, owner, tbl);
 +                            idxs = indexes(idxStmt, owner, tbl);
 +                        }
 +
 +                        String colName = colsRs.getString(COL_NAME_IDX);
 +
 +                        cols.add(new DbColumn(colName, decodeType(colsRs), pkCols.contains(colName),
 +                                !"N".equals(colsRs.getString(NULLABLE_IDX))));
 +                    }
 +
 +                    if (!cols.isEmpty())
 +                        tbls.add(table(prevSchema, prevTbl, cols, idxs));
 +                }
 +            }
 +        }
 +
 +        return tbls;
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/ignite/blob/dfd17745/parent/pom.xml
----------------------------------------------------------------------
diff --cc parent/pom.xml
index ac0e203,17fcea7..4b90d78
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@@ -703,7 -707,10 +707,11 @@@
                                          <exclude>dev-tools/.gradle/**/*</exclude>
                                          <exclude>dev-tools/gradle/wrapper/**/*</exclude>
                                          <exclude>dev-tools/gradlew</exclude>
+                                         <exclude>src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.pom</exclude>
+                                         <exclude>src/test/portables/repo/org/apache/ignite/portable/test2/maven-metadata-local.xml</exclude>
+                                         <exclude>src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.pom</exclude>
+                                         <exclude>src/test/portables/repo/org/apache/ignite/portable/test1/maven-metadata-local.xml</exclude>
 +                                        <exclude>src/main/js/package.json</exclude>
                                          <!--shmem-->
                                          <exclude>ipc/shmem/**/Makefile.in</exclude><!--auto
generated files-->
                                          <exclude>ipc/shmem/**/Makefile</exclude><!--auto
generated files-->

http://git-wip-us.apache.org/repos/asf/ignite/blob/dfd17745/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 7df4d66,96305a3..dc261a9
--- a/pom.xml
+++ b/pom.xml
@@@ -76,8 -75,8 +76,9 @@@
          <module>modules/kafka</module>
          <module>modules/yarn</module>
          <module>modules/jms11</module>
 +        <module>modules/json</module>
          <module>modules/zookeeper</module>
+         <module>modules/platform</module>
      </modules>
  
      <profiles>


Mime
View raw message