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 2016/02/15 08:51:47 UTC
[03/50] [abbrv] ignite git commit: Merge branch 'ignite-1.5' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-split2
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-split2
# Conflicts:
# modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
# modules/spring/pom.xml
# 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/35e4b209
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35e4b209
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35e4b209
Branch: refs/heads/ignite-1232
Commit: 35e4b2098fc39ef4e1418748e37fac2fe848a420
Parents: f5c6370 171e9b1
Author: S.Vladykin <sv...@gridgain.com>
Authored: Fri Dec 4 08:05:50 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Fri Dec 4 08:05:50 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 19 +
assembly/release-fabric-base.xml | 9 +
.../config/binary/example-ignite-binary.xml | 44 --
examples/config/example-ignite.xml | 10 +-
examples/pom.xml | 7 +-
examples/schema-import/pom.xml | 4 +-
.../hibernate/CacheHibernatePersonStore.java | 4 +-
.../hibernate/CacheHibernateStoreExample.java | 2 +-
.../datagrid/store/hibernate/Person.hbm.xml | 2 +-
.../apache/ignite/examples/binary/Address.java | 72 ---
.../apache/ignite/examples/binary/Employee.java | 93 ----
.../ignite/examples/binary/EmployeeKey.java | 90 ----
.../binary/ExampleBinaryNodeStartup.java | 36 --
.../ignite/examples/binary/Organization.java | 93 ----
.../examples/binary/OrganizationType.java | 32 --
...ComputeClientBinaryTaskExecutionExample.java | 10 +-
.../CacheClientBinaryPutGetExample.java | 12 +-
.../datagrid/CacheClientBinaryQueryExample.java | 28 +-
.../ComputeFibonacciContinuationExample.java | 15 +-
.../computegrid/ComputeTaskMapExample.java | 6 +-
.../computegrid/ComputeTaskSplitExample.java | 4 +-
.../examples/datagrid/CacheQueryExample.java | 161 ++-----
.../ignite/examples/datagrid/store/Person.java | 154 -------
.../store/auto/CacheAutoStoreExample.java | 4 +-
.../auto/CacheAutoStoreLoadDataExample.java | 4 +-
.../datagrid/store/auto/CacheConfig.java | 6 +-
.../store/dummy/CacheDummyPersonStore.java | 12 +-
.../store/dummy/CacheDummyStoreExample.java | 4 +-
.../store/jdbc/CacheJdbcPersonStore.java | 18 +-
.../store/jdbc/CacheJdbcStoreExample.java | 4 +-
.../store/spring/CacheSpringPersonStore.java | 10 +-
.../store/spring/CacheSpringStoreExample.java | 4 +-
.../examples/messaging/MessagingExample.java | 18 +-
.../examples/misc/springbean/spring-bean.xml | 7 -
.../ignite/examples/model/Organization.java | 62 +++
.../apache/ignite/examples/model/Person.java | 127 ++++++
.../ignite/examples/model/binary/Address.java | 72 +++
.../ignite/examples/model/binary/Employee.java | 93 ++++
.../examples/model/binary/EmployeeKey.java | 93 ++++
.../examples/model/binary/Organization.java | 93 ++++
.../examples/model/binary/OrganizationType.java | 32 ++
.../scalar/examples/ScalarCacheExample.scala | 19 +-
.../examples/ScalarCacheQueryExample.scala | 66 +--
.../testsuites/IgniteExamplesSelfTestSuite.java | 4 +-
modules/aop/pom.xml | 14 +-
modules/apache-license-gen/pom.xml | 2 +-
modules/aws/pom.xml | 20 +-
modules/camel/pom.xml | 16 +-
.../ignite/stream/camel/package-info.java | 21 +
.../ignite/stream/camel/package-info.java | 21 +
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
.../ignite/codegen/MessageCodeGenerator.java | 1 +
modules/core/pom.xml | 28 +-
.../java/org/apache/ignite/IgniteBinary.java | 24 +-
.../java/org/apache/ignite/IgniteCache.java | 3 +-
.../apache/ignite/binary/BinaryIdMapper.java | 3 +-
.../org/apache/ignite/binary/BinaryObject.java | 17 +-
.../org/apache/ignite/binary/BinaryType.java | 16 +-
.../ignite/binary/BinaryTypeConfiguration.java | 21 +
.../apache/ignite/cache/CacheInterceptor.java | 2 +-
.../ignite/cache/CacheKeyConfiguration.java | 19 +
.../apache/ignite/cache/CacheTypeMetadata.java | 2 +
.../rendezvous/RendezvousAffinityFunction.java | 2 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 2 +-
.../cache/store/jdbc/CacheJdbcPojoStore.java | 191 +++++---
.../configuration/CacheConfiguration.java | 6 +-
.../configuration/IgniteConfiguration.java | 4 +-
.../internal/GridEventConsumeHandler.java | 5 +
.../internal/GridMessageListenHandler.java | 5 +
.../apache/ignite/internal/IgniteKernal.java | 13 +-
.../org/apache/ignite/internal/IgnitionEx.java | 10 +-
.../ignite/internal/NodeStoppingException.java | 35 ++
.../managers/communication/GridIoManager.java | 88 +---
.../communication/GridIoMessageFactory.java | 8 +-
.../GridDeploymentPerVersionStore.java | 12 +-
.../discovery/GridDiscoveryManager.java | 19 +-
.../internal/portable/BinaryEnumObjectImpl.java | 311 +++++++++++++
.../internal/portable/BinaryFieldAccessor.java | 83 +++-
.../internal/portable/BinaryFieldImpl.java | 6 +-
.../internal/portable/BinaryMarshaller.java | 142 ++++++
.../internal/portable/BinaryMetadata.java | 16 +-
.../internal/portable/BinaryObjectEx.java | 225 +---------
.../internal/portable/BinaryObjectExImpl.java | 251 +++++++++++
.../internal/portable/BinaryObjectImpl.java | 15 +-
.../portable/BinaryObjectOffheapImpl.java | 2 +-
.../internal/portable/BinaryReaderExImpl.java | 21 +-
.../internal/portable/BinaryTypeImpl.java | 12 +-
.../internal/portable/BinaryWriteMode.java | 3 +
.../internal/portable/BinaryWriterExImpl.java | 34 +-
.../portable/GridPortableMarshaller.java | 3 +
.../portable/PortableClassDescriptor.java | 28 +-
.../internal/portable/PortableContext.java | 139 ++++--
.../ignite/internal/portable/PortableUtils.java | 166 ++++++-
.../builder/BinaryObjectBuilderImpl.java | 25 +-
.../portable/builder/PortableBuilderEnum.java | 2 +-
.../builder/PortableBuilderSerializer.java | 14 +-
.../builder/PortableEnumArrayLazyValue.java | 2 +-
.../builder/PortableObjectArrayLazyValue.java | 2 +-
.../CacheDefaultBinaryAffinityKeyMapper.java | 62 +++
.../processors/cache/CacheInvokeResult.java | 14 +
.../processors/cache/CacheLazyEntry.java | 2 +-
.../internal/processors/cache/CacheObject.java | 3 +
.../processors/cache/CacheObjectContext.java | 23 +-
.../processors/cache/GridCacheAdapter.java | 12 +-
.../cache/GridCacheConcurrentMap.java | 68 +--
.../processors/cache/GridCacheContext.java | 79 +++-
.../GridCacheDefaultAffinityKeyMapper.java | 9 +-
.../cache/GridCacheDeploymentManager.java | 6 +-
.../processors/cache/GridCacheEventManager.java | 42 +-
.../processors/cache/GridCacheIoManager.java | 10 +-
.../processors/cache/GridCacheMapEntry.java | 10 +-
.../processors/cache/GridCacheMessage.java | 3 +-
.../processors/cache/GridCacheMvccManager.java | 3 +-
.../GridCachePartitionExchangeManager.java | 40 +-
.../processors/cache/GridCachePreloader.java | 16 +-
.../cache/GridCachePreloaderAdapter.java | 7 +-
.../processors/cache/GridCacheProcessor.java | 18 +-
.../processors/cache/GridCacheProxyImpl.java | 12 +
.../processors/cache/IgniteCacheProxy.java | 38 +-
.../processors/cache/IgniteInternalCache.java | 9 +
.../cache/affinity/GridCacheAffinityImpl.java | 3 +-
.../CacheDataStructuresManager.java | 76 ++--
.../distributed/dht/GridDhtCacheAdapter.java | 15 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 28 +-
.../distributed/dht/GridDhtLockFuture.java | 35 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 13 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 2 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 43 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 15 +-
.../distributed/dht/GridNoStorageCacheMap.java | 4 +-
.../dht/GridPartitionedSingleGetFuture.java | 18 +-
.../dht/atomic/GridDhtAtomicCache.java | 43 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 6 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 3 +-
.../colocated/GridDhtColocatedLockFuture.java | 17 +-
.../dht/preloader/GridDhtPartitionDemander.java | 71 +--
.../dht/preloader/GridDhtPreloader.java | 31 +-
.../preloader/GridDhtPreloaderAssignments.java | 19 +-
.../distributed/near/GridNearCacheAdapter.java | 4 +-
.../distributed/near/GridNearGetFuture.java | 16 +-
.../distributed/near/GridNearGetRequest.java | 3 +-
.../distributed/near/GridNearLockFuture.java | 24 +-
...arOptimisticSerializableTxPrepareFuture.java | 104 ++---
.../near/GridNearOptimisticTxPrepareFuture.java | 191 ++++----
...ridNearOptimisticTxPrepareFutureAdapter.java | 70 +++
.../near/GridNearSingleGetRequest.java | 12 +-
.../near/GridNearSingleGetResponse.java | 13 +-
.../near/GridNearTxFinishFuture.java | 14 +-
.../cache/local/GridLocalCacheEntry.java | 6 +
.../portable/CacheObjectBinaryProcessor.java | 11 +-
.../CacheObjectBinaryProcessorImpl.java | 66 ++-
.../portable/CacheObjectPortableContext.java | 3 +-
.../cache/portable/IgniteBinaryImpl.java | 21 +-
.../cache/query/GridCacheQueryManager.java | 12 +-
.../continuous/CacheContinuousQueryEntry.java | 50 ++-
.../continuous/CacheContinuousQueryEvent.java | 6 +-
.../continuous/CacheContinuousQueryHandler.java | 32 +-
.../CacheContinuousQueryListener.java | 5 +
.../continuous/CacheContinuousQueryManager.java | 57 ++-
.../cache/store/CacheOsStoreManager.java | 2 +-
.../cache/transactions/IgniteTxHandler.java | 12 +-
.../transactions/IgniteTxLocalAdapter.java | 38 +-
.../cache/transactions/IgniteTxManager.java | 22 +-
.../IgniteTxRemoteSingleStateImpl.java | 16 +-
.../cache/transactions/IgniteTxRemoteState.java | 5 +
.../transactions/IgniteTxRemoteStateImpl.java | 24 +
.../processors/cacheobject/NoOpBinary.java | 13 +-
.../continuous/GridContinuousHandler.java | 5 +
.../continuous/GridContinuousProcessor.java | 10 +-
.../StartRoutineDiscoveryMessage.java | 13 +-
.../datastructures/CollocatedQueueItemKey.java | 75 ++++
.../datastructures/CollocatedSetItemKey.java | 87 ++++
.../datastructures/DataStructuresProcessor.java | 27 +-
.../GridAtomicCacheQueueImpl.java | 8 +-
.../GridCacheInternalKeyImpl.java | 2 +-
.../datastructures/GridCacheQueueAdapter.java | 30 +-
.../datastructures/GridCacheQueueItemKey.java | 9 +-
.../datastructures/GridCacheSetImpl.java | 37 +-
.../datastructures/GridCacheSetItemKey.java | 21 +-
.../GridTransactionalCacheQueueImpl.java | 2 +-
.../processors/datastructures/QueueItemKey.java | 27 ++
.../processors/datastructures/SetItemKey.java | 36 ++
.../platform/PlatformContextImpl.java | 53 ++-
.../cpp/PlatformCppConfigurationClosure.java | 2 +-
.../PlatformDotNetConfigurationClosure.java | 2 +-
.../transactions/PlatformTransactions.java | 4 +-
.../platform/utils/PlatformUtils.java | 1 +
.../processors/query/GridQueryProcessor.java | 36 +-
.../handlers/query/QueryCommandHandler.java | 2 +-
.../ignite/internal/util/IgniteUtils.java | 8 +
.../util/future/GridCompoundFuture.java | 9 +-
.../internal/util/future/GridFutureAdapter.java | 2 +-
.../marshaller/portable/BinaryMarshaller.java | 146 ------
.../PlatformDotNetBinaryTypeConfiguration.java | 23 +
.../sharedfs/SharedFsCheckpointSpi.java | 14 +-
.../communication/tcp/TcpCommunicationSpi.java | 31 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 -
.../core/src/main/resources/ignite.properties | 2 +-
...heJdbcPojoStoreBinaryMarshallerSelfTest.java | 85 ++++
...JdbcPojoStorePortableMarshallerSelfTest.java | 85 ----
.../internal/GridMultipleJobsSelfTest.java | 7 +
...ectionLocalJobMultipleArgumentsSelfTest.java | 11 +-
.../IgniteClientReconnectCacheTest.java | 26 +-
.../internal/portable/BinaryEnumsSelfTest.java | 446 +++++++++++++++++++
.../portable/BinaryFieldsAbstractSelfTest.java | 13 +-
.../portable/BinaryFieldsHeapSelfTest.java | 4 +-
.../portable/BinaryFieldsOffheapSelfTest.java | 3 +-
.../BinaryFooterOffsetsAbstractSelfTest.java | 5 +-
.../BinaryFooterOffsetsHeapSelfTest.java | 4 +-
.../BinaryFooterOffsetsOffheapSelfTest.java | 3 +-
.../portable/BinaryMarshallerSelfTest.java | 306 ++++++++++---
.../BinaryObjectBuilderAdditionalSelfTest.java | 7 +-
.../portable/BinaryObjectBuilderSelfTest.java | 102 +++--
.../GridPortableAffinityKeySelfTest.java | 13 +-
...idPortableMarshallerCtxDisabledSelfTest.java | 1 -
.../portable/GridPortableMetaDataSelfTest.java | 11 +-
.../portable/GridPortableWildcardsSelfTest.java | 1 -
.../CachePutEventListenerErrorSelfTest.java | 185 ++++++++
...cheAbstractFullApiMultithreadedSelfTest.java | 9 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 99 +++-
.../cache/GridCacheClearSelfTest.java | 9 +-
.../cache/GridCacheConcurrentMapSelfTest.java | 2 +-
...inodeUpdateNearEnabledNoBackupsSelfTest.java | 9 +-
...CacheMultinodeUpdateNearEnabledSelfTest.java | 5 +
.../GridCacheOnCopyFlagAbstractSelfTest.java | 14 +-
.../processors/cache/GridCacheStopSelfTest.java | 143 +++++-
.../cache/IgniteCacheAbstractTest.java | 3 +
...niteCacheCopyOnReadDisabledAbstractTest.java | 2 +
.../cache/IgniteCacheInvokeAbstractTest.java | 369 +++++++++++----
.../IgniteCacheStoreValueAbstractTest.java | 111 +++--
.../cache/IgniteCacheTxPreloadNoWriteTest.java | 2 +-
...IgniteCacheAbstractExecutionContextTest.java | 2 +-
...eAbstractDataStructuresFailoverSelfTest.java | 39 +-
.../GridCacheQueueApiSelfAbstractTest.java | 18 +-
.../GridCacheSetFailoverAbstractSelfTest.java | 6 +-
.../GridCachePartitionedQueueApiSelfTest.java | 5 +
...dCachePartitionedQueueEntryMoveSelfTest.java | 2 +-
.../IgnitePartitionedQueueNoBackupsTest.java | 92 ++++
.../GridCacheReplicatedQueueApiSelfTest.java | 5 +
.../CacheLockReleaseNodeLeaveTest.java | 161 +++++++
...yMetadataUpdateChangingTopologySelfTest.java | 245 ++++++++++
.../IgniteCacheSizeFailoverTest.java | 7 +
.../dht/GridCacheDhtInternalEntrySelfTest.java | 203 ---------
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 37 +-
...gniteAtomicLongChangingTopologySelfTest.java | 40 +-
.../IgniteCacheCrossCacheTxFailoverTest.java | 6 +
.../IgniteCachePutRetryAbstractSelfTest.java | 2 +
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 3 +-
.../near/GridCacheNearTxForceKeyTest.java | 2 +-
...achePartitionedPreloadLifecycleSelfTest.java | 71 +--
...cingDelayedPartitionMapExchangeSelfTest.java | 9 +-
.../GridCacheRebalancingAsyncSelfTest.java | 3 +-
.../GridCacheRebalancingSyncCheckDataTest.java | 98 ++++
.../GridCacheRebalancingSyncSelfTest.java | 55 +--
...eRebalancingUnmarshallingFailedSelfTest.java | 19 +-
.../replicated/GridReplicatedTxPreloadTest.java | 6 +
...CacheReplicatedPreloadLifecycleSelfTest.java | 100 +++--
.../GridCacheEvictionLockUnlockSelfTest.java | 2 +-
.../random/RandomEvictionPolicySelfTest.java | 8 +-
.../GridCacheLocalIsolatedNodesSelfTest.java | 6 +-
...naryObjectsAbstractDataStreamerSelfTest.java | 2 +-
...aryObjectsAbstractMultiThreadedSelfTest.java | 10 +-
.../GridCacheBinaryObjectsAbstractSelfTest.java | 2 +-
...ntNodeBinaryObjectMetadataMultinodeTest.java | 10 +-
...CacheClientNodeBinaryObjectMetadataTest.java | 6 +-
.../GridCachePortableStoreAbstractSelfTest.java | 2 +-
...ridPortableCacheEntryMemorySizeSelfTest.java | 2 +-
...leDuplicateIndexObjectsAbstractSelfTest.java | 2 +-
.../DataStreamProcessorPortableSelfTest.java | 2 +-
.../GridDataStreamerImplSelfTest.java | 2 +-
...ridCacheAffinityRoutingPortableSelfTest.java | 2 +-
.../GridCacheMemoryModePortableSelfTest.java | 2 +-
...acheOffHeapTieredAtomicPortableSelfTest.java | 2 +-
...eapTieredEvictionAtomicPortableSelfTest.java | 2 +-
...heOffHeapTieredEvictionPortableSelfTest.java | 2 +-
.../GridCacheOffHeapTieredPortableSelfTest.java | 2 +-
...sNearPartitionedByteArrayValuesSelfTest.java | 2 +-
...sPartitionedOnlyByteArrayValuesSelfTest.java | 2 +-
.../GridCacheWriteBehindStoreAbstractTest.java | 2 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 7 +-
.../internal/util/nio/GridNioSelfTest.java | 69 +--
.../PlatformComputeBinarizableArgTask.java | 8 +-
.../platform/PlatformComputeEchoTask.java | 4 +-
.../session/GridSessionCheckpointSelfTest.java | 16 +
.../tcp/IgniteCacheSslStartStopSelfTest.java | 1 +
.../ignite/testframework/GridTestUtils.java | 61 ++-
.../config/GridTestProperties.java | 3 +
.../testframework/junits/GridAbstractTest.java | 15 +
.../ignite/testframework/junits/IgniteMock.java | 39 +-
.../junits/IgniteTestResources.java | 11 +
...ObjectsCacheDataStructuresSelfTestSuite.java | 37 ++
...BinaryObjectsCacheExpiryPolicyTestSuite.java | 38 ++
...gniteBinaryObjectsCacheRestartTestSuite.java | 37 ++
.../IgniteBinaryObjectsCacheTestSuite2.java | 37 ++
.../IgniteBinaryObjectsCacheTestSuite3.java | 37 ++
.../IgniteBinaryObjectsCacheTestSuite4.java | 37 ++
...IgniteBinaryObjectsComputeGridTestSuite.java | 37 ++
.../IgniteCacheDataStructuresSelfTestSuite.java | 3 +
.../IgniteCacheFailoverTestSuite3.java | 6 -
.../IgniteCacheFailoverTestSuiteSsl.java | 41 ++
.../ignite/testsuites/IgniteCacheTestSuite.java | 7 +-
.../testsuites/IgniteCacheTestSuite2.java | 2 -
.../testsuites/IgniteCacheTestSuite3.java | 2 +
.../IgnitePortableCacheFullApiTestSuite.java | 2 +-
.../IgnitePortableCacheTestSuite.java | 3 +-
.../IgnitePortableObjectsTestSuite.java | 4 +
modules/extdata/p2p/pom.xml | 2 +-
.../extdata/uri/modules/uri-dependency/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 4 +-
modules/flume/README.txt | 44 +-
modules/flume/pom.xml | 21 +-
.../ignite/stream/flume/package-info.java | 21 +
.../ignite/stream/flume/package-info.java | 21 +
modules/gce/pom.xml | 2 +-
modules/geospatial/pom.xml | 22 +-
modules/hadoop/pom.xml | 4 +-
modules/hibernate/pom.xml | 10 +-
modules/indexing/pom.xml | 22 +-
.../processors/query/h2/IgniteH2Indexing.java | 24 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 29 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 2 +-
.../cache/IgniteCacheNoClassQuerySelfTest.java | 122 +++++
...niteCacheP2pUnmarshallingQueryErrorTest.java | 7 -
.../IgniteCacheQuerySelfTestSuite.java | 2 +
.../IgnitePortableCacheQueryTestSuite.java | 2 +-
modules/jcl/pom.xml | 13 +-
modules/jms11/README.txt | 29 ++
modules/jms11/licenses/apache-2.0.txt | 202 +++++++++
modules/jms11/pom.xml | 22 +-
.../ignite/stream/jms11/package-info.java | 21 +
.../ignite/stream/jms11/package-info.java | 21 +
modules/jta/pom.xml | 19 +-
modules/kafka/README.txt | 32 ++
modules/kafka/pom.xml | 18 +-
.../ignite/stream/kafka/package-info.java | 21 +
.../ignite/stream/kafka/package-info.java | 21 +
modules/log4j/pom.xml | 12 +-
modules/log4j2/pom.xml | 13 +-
modules/mesos/pom.xml | 2 +-
modules/mqtt/README.txt | 29 ++
modules/mqtt/licenses/apache-2.0.txt | 202 +++++++++
modules/mqtt/pom.xml | 29 +-
.../apache/ignite/stream/mqtt/package-info.java | 21 +
.../apache/ignite/stream/mqtt/package-info.java | 21 +
modules/osgi-karaf/README.txt | 18 +
modules/osgi-karaf/licenses/apache-2.0.txt | 202 +++++++++
modules/osgi-karaf/pom.xml | 84 ++++
.../osgi-karaf/src/main/resources/features.xml | 327 ++++++++++++++
modules/osgi-paxlogging/README.txt | 12 +
modules/osgi-paxlogging/licenses/apache-2.0.txt | 202 +++++++++
modules/osgi-paxlogging/pom.xml | 69 +++
modules/osgi/README.txt | 65 +++
modules/osgi/licenses/apache-2.0.txt | 202 +++++++++
modules/osgi/pom.xml | 171 +++++++
.../IgniteAbstractOsgiContextActivator.java | 238 ++++++++++
.../org/apache/ignite/osgi/IgniteOsgiUtils.java | 69 +++
.../BundleDelegatingClassLoader.java | 147 ++++++
.../classloaders/ContainerSweepClassLoader.java | 134 ++++++
.../OsgiClassLoadingStrategyType.java | 29 ++
.../ignite/osgi/AbstractIgniteKarafTest.java | 109 +++++
.../IgniteKarafFeaturesInstallationTest.java | 100 +++++
.../ignite/osgi/IgniteOsgiServiceTest.java | 131 ++++++
.../apache/ignite/osgi/IgniteOsgiTestSuite.java | 32 ++
.../activators/BasicIgniteTestActivator.java | 76 ++++
.../ignite/osgi/activators/TestOsgiFlags.java | 53 +++
.../osgi/activators/TestOsgiFlagsImpl.java | 83 ++++
modules/platforms/README.txt | 6 +
modules/platforms/cpp/common/configure.ac | 2 +-
modules/platforms/cpp/core-test/configure.ac | 2 +-
modules/platforms/cpp/core/configure.ac | 2 +-
.../impl/binary/binary_type_updater_impl.cpp | 4 +-
modules/platforms/cpp/examples/configure.ac | 2 +-
modules/platforms/cpp/ignite/configure.ac | 2 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 12 +-
.../Binary/BinaryBuilderSelfTest.cs | 97 ++--
.../Binary/BinarySelfTest.cs | 48 +-
.../Cache/CacheAbstractTest.cs | 17 +-
.../Compute/ComputeApiTest.cs | 6 +
.../Config/Compute/compute-grid1.xml | 8 +-
.../Config/marshaller-explicit.xml | 2 +-
.../Config/native-client-test-cache-store.xml | 1 +
.../Examples/ExamplesTest.cs | 5 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Services/ServiceProxyTest.cs | 22 +-
.../Apache.Ignite.Core.csproj | 5 +-
.../Binary/BinaryTypeConfiguration.cs | 16 +-
.../dotnet/Apache.Ignite.Core/Binary/IBinary.cs | 136 ++++++
.../Apache.Ignite.Core/Binary/IBinaryObject.cs | 23 +-
.../Apache.Ignite.Core/Binary/IBinaryType.cs | 13 +
.../Apache.Ignite.Core/Binary/IIgniteBinary.cs | 120 -----
.../dotnet/Apache.Ignite.Core/IIgnite.cs | 6 +-
.../Apache.Ignite.Core/Impl/Binary/Binary.cs | 216 +++++++++
.../Impl/Binary/BinaryEnum.cs | 134 ++++++
.../Impl/Binary/BinaryFullTypeDescriptor.cs | 14 +-
.../Impl/Binary/BinaryObject.cs | 29 ++
.../Impl/Binary/BinaryObjectBuilder.cs | 44 +-
.../Impl/Binary/BinaryReader.cs | 51 ++-
.../Binary/BinarySurrogateTypeDescriptor.cs | 6 +
.../Impl/Binary/BinarySystemHandlers.cs | 34 +-
.../Impl/Binary/BinaryUtils.cs | 96 ++--
.../Impl/Binary/BinaryWriter.cs | 104 +++--
.../Impl/Binary/IBinaryTypeDescriptor.cs | 50 +--
.../Impl/Binary/IgniteBinary.cs | 192 --------
.../Impl/Binary/Marshaller.cs | 88 ++--
.../Impl/Binary/Metadata/BinaryType.cs | 184 ++++----
.../Impl/Binary/Metadata/BinaryTypeHolder.cs | 34 +-
.../Binary/Structure/BinaryStructureTracker.cs | 2 +-
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 11 +-
.../Apache.Ignite.Core/Impl/IgniteProxy.cs | 2 +-
.../Apache.Ignite.Core/Impl/PlatformTarget.cs | 11 +-
.../Impl/Transactions/TransactionsImpl.cs | 4 +-
.../Properties/AssemblyInfo.cs | 6 +-
.../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +-
.../Messaging/MessagingExample.cs | 9 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../examples/Config/example-cache-query.xml | 9 +-
.../dotnet/examples/Config/example-cache.xml | 9 +-
modules/rest-http/pom.xml | 36 +-
modules/scalar-2.10/pom.xml | 11 +-
modules/scalar/pom.xml | 11 +-
.../test/resources/spring-ping-pong-partner.xml | 18 -
modules/schedule/pom.xml | 27 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 14 +-
modules/spark-2.10/pom.xml | 4 +-
modules/spark/pom.xml | 2 +-
modules/spring/pom.xml | 27 +-
.../ignite/cache/store/spring/package-info.java | 21 +
modules/ssh/pom.xml | 21 +-
modules/tools/pom.xml | 2 +-
modules/twitter/pom.xml | 17 +-
.../ignite/stream/twitter/package-info.java | 21 +
.../twitter/IgniteTwitterStreamerTestSuite.java | 19 +-
.../ignite/stream/twitter/package-info.java | 21 +
modules/urideploy/pom.xml | 19 +-
modules/visor-console-2.10/pom.xml | 6 +-
modules/visor-console/pom.xml | 4 +-
modules/visor-plugins/pom.xml | 6 +-
modules/web/pom.xml | 15 +-
modules/yardstick/pom.xml | 6 +-
...IgniteTransactionalInvokeRetryBenchmark.java | 4 +-
...IgniteTransactionalWriteInvokeBenchmark.java | 6 +-
modules/yarn/pom.xml | 8 +-
.../yarn/IgniteApplicationMasterSelfTest.java | 11 +-
modules/zookeeper/README.txt | 29 ++
modules/zookeeper/licenses/apache-2.0.txt | 202 +++++++++
modules/zookeeper/pom.xml | 16 +-
.../discovery/tcp/ipfinder/zk/package-info.java | 21 +
parent/pom.xml | 132 +++++-
pom.xml | 46 +-
455 files changed, 12593 insertions(+), 4066 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e4b209/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e4b209/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 6858ca2,c9b8e27..e387c0a
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@@ -714,9 -715,14 +715,14 @@@ public class GridIoMessageFactory imple
break;
- // [-3..118] - this
+ case 119:
+ msg = new BinaryEnumObjectImpl();
+
+ break;
+
+ // [-3..119] - this
// [120..123] - DR
- // [-4..-22] - SQL
+ // [-4..-28] - SQL
default:
if (ext != null) {
for (MessageFactory factory : ext) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e4b209/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 59ea40f,bb5d230..980ff67
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@@ -69,10 -47,11 +69,10 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtUnreservedPartitionException;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
- import org.apache.ignite.internal.processors.datastructures.GridCacheSetItemKey;
import org.apache.ignite.internal.processors.datastructures.GridSetQueryPredicate;
+ import org.apache.ignite.internal.processors.datastructures.SetItemKey;
import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilter;
import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
-import org.apache.ignite.internal.processors.query.GridQueryFieldsResult;
import org.apache.ignite.internal.processors.query.GridQueryIndexDescriptor;
import org.apache.ignite.internal.processors.query.GridQueryIndexType;
import org.apache.ignite.internal.processors.query.GridQueryProcessor;
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e4b209/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e4b209/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e4b209/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 9424bfc,1437a16..802a0fa
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@@ -290,15 -281,8 +291,11 @@@ public class IgniteH2Indexing implement
/** */
private volatile GridKernalContext ctx;
+ /** */
+ private final ConcurrentMap<String, GridH2Table> dataTables = new ConcurrentHashMap8<>();
+
- /** */
- private final ThreadLocal<StatementCache> stmtCache = new ThreadLocal<StatementCache>() {
- @Override protected StatementCache initialValue() {
- return new StatementCache(PREPARED_STMT_CACHE_SIZE);
- }
- };
+ /** Statement cache. */
+ private final ConcurrentHashMap<Thread, StatementCache> stmtCache = new ConcurrentHashMap<>();
/** */
private final GridBoundedConcurrentLinkedHashMap<T3<String, String, Boolean>, TwoStepCachedQuery> twoStepCache =
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e4b209/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e4b209/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e4b209/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheQueryTestSuite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e4b209/modules/spring/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e4b209/parent/pom.xml
----------------------------------------------------------------------
diff --cc parent/pom.xml
index 38979d1,4fd7156..b7c0964
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@@ -35,16 -35,87 +35,88 @@@
<properties>
<ignite.edition>fabric</ignite.edition>
-
- <!-- Build parameters. -->
+ <hadoop.version>2.4.1</hadoop.version>
+ <spark.version>1.5.2</spark.version>
- <h2.version>1.0-SNAPSHOT</h2.version>
+ <spring.version>4.1.0.RELEASE</spring.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>MMMM d yyyy</maven.build.timestamp.format>
<doxygen.exec>doxygen</doxygen.exec>
<git.exec>git</git.exec>
- <jetty.version>9.2.11.v20150529</jetty.version>
+ <maven.bundle.plugin.version>2.5.4</maven.bundle.plugin.version>
<javadoc.opts>-XDenableSunApiLintControl</javadoc.opts>
+
+ <!-- Dependency versions. -->
+ <activemq.version>5.12.0</activemq.version>
+ <aopalliance.bundle.version>1.0_6</aopalliance.bundle.version>
+ <asm.version>4.2</asm.version>
+ <aspectj.bundle.version>1.7.2_1</aspectj.bundle.version>
+ <aspectj.version>1.7.2</aspectj.version>
+ <aws.sdk.bundle.version>1.10.12_1</aws.sdk.bundle.version>
+ <aws.sdk.version>1.10.29</aws.sdk.version>
+ <camel.version>2.16.0</camel.version>
+ <commons.beanutils.bundle.version>1.8.3_1</commons.beanutils.bundle.version>
+ <commons.beanutils.version>1.8.3</commons.beanutils.version>
+ <commons.codec.version>1.6</commons.codec.version>
+ <commons.collections.version>3.2.1</commons.collections.version>
+ <commons.lang.version>2.6</commons.lang.version>
+ <cron4j.version>2.2.5</cron4j.version>
+ <curator.version>2.9.1</curator.version>
+ <ezmorph.bundle.version>1.0.6_1</ezmorph.bundle.version>
+ <ezmorph.version>1.0.6</ezmorph.version>
+ <flume.ng.version>1.6.0</flume.ng.version>
+ <guava.retrying.version>2.0.0</guava.retrying.version>
+ <guava.version>18.0</guava.version>
+ <guava14.version>14.0.1</guava14.version>
+ <guava16.version>16.0.1</guava16.version>
- <h2.version>1.3.175</h2.version>
++ <h2.version>1.0-SNAPSHOT</h2.version>
+ <hadoop.version>2.4.1</hadoop.version>
+ <httpclient.version>4.5.1</httpclient.version>
+ <httpcore.version>4.4.3</httpcore.version>
+ <jackson.version>1.9.13</jackson.version>
+ <javax.cache.bundle.version>1.0.0_1</javax.cache.bundle.version>
+ <javax.cache.version>1.0.0</javax.cache.version>
+ <jetty.version>9.2.11.v20150529</jetty.version>
+ <jms.spec.version>1.1.1</jms.spec.version>
+ <jsch.bundle.version>0.1.53_1</jsch.bundle.version>
+ <jsch.version>0.1.53</jsch.version>
+ <jsonlib.bundle.version>2.4_1</jsonlib.bundle.version>
+ <jsonlib.version>2.4</jsonlib.version>
+ <jtidy.version>r938</jtidy.version>
+ <kafka.bundle.version>0.8.2.1_1</kafka.bundle.version>
+ <kafka.clients.bundle.version>0.8.2.0_1</kafka.clients.bundle.version>
+ <kafka.clients.version>0.8.2.0</kafka.clients.version>
+ <kafka.version>0.8.2.1</kafka.version>
+ <kafka.version>0.8.2.1</kafka.version>
+ <karaf.version>4.0.2</karaf.version>
+ <lucene.bundle.version>3.5.0_1</lucene.bundle.version>
+ <lucene.version>3.5.0</lucene.version>
+ <oro.bundle.version>2.0.8_6</oro.bundle.version>
+ <osgi.core.version>5.0.0</osgi.core.version>
+ <osgi.enterprise.version>5.0.0</osgi.enterprise.version>
+ <paho.version>1.0.2</paho.version>
+ <scala210.jline.version>2.10.4</scala210.jline.version>
+ <scala210.library.version>2.10.4</scala210.library.version>
+ <scala211.library.version>2.11.7</scala211.library.version>
+ <slf4j.version>1.7.7</slf4j.version>
+ <slf4j16.version>1.6.4</slf4j16.version>
+ <spark.version>1.5.2</spark.version>
+ <spring.version>4.1.0.RELEASE</spring.version>
+ <spring41.osgi.feature.version>4.1.7.RELEASE_1</spring41.osgi.feature.version>
+ <tomcat.version>8.0.23</tomcat.version>
+ <twitter.hbc.version>2.2.0</twitter.hbc.version>
+ <yammer.metrics.annotation.version>2.2.0</yammer.metrics.annotation.version>
+ <yammer.metrics.core.version>2.2.0</yammer.metrics.core.version>
+ <zkclient.version>0.5</zkclient.version>
+ <zookeeper.version>3.4.6</zookeeper.version>
+
+ <!-- OSGI Manifest generation default property values -->
+ <osgi.import.package>*</osgi.import.package>
+ <osgi.export.package>{local-packages}</osgi.export.package>
+ <osgi.private.package></osgi.private.package>
+ <osgi.embed.dependency></osgi.embed.dependency>
+ <osgi.embed.transitive>false</osgi.embed.transitive>
+ <osgi.fail.ok>false</osgi.fail.ok>
+
</properties>
<groupId>org.apache.ignite</groupId>