ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [10/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5'
Date Tue, 29 Dec 2015 10:26:07 GMT
Merge remote-tracking branch 'remotes/origin/ignite-1.5'

Conflicts:
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java


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

Branch: refs/heads/ignite-2265
Commit: 3fbf3e9544329210c5e59be3f3ada13ac51a4482
Parents: 357d791 11b4262
Author: Anton Vinogradov <av@apache.org>
Authored: Mon Dec 7 13:52:27 2015 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Mon Dec 7 13:52:27 2015 +0300

----------------------------------------------------------------------
 RELEASE_NOTES.txt                               |   3 +
 examples/config/example-default.xml             |   7 +
 examples/pom.xml                                |   7 +-
 examples/schema-import/pom.xml                  |   4 +-
 .../store/auto/CacheBinaryAutoStoreExample.java | 158 ++++++++
 .../datagrid/store/auto/package-info.java       |  22 ++
 .../store/auto/CacheAutoStoreExample.java       |  93 ++++-
 .../auto/CacheAutoStoreLoadDataExample.java     |  85 -----
 .../datagrid/store/auto/CacheConfig.java        |  81 ----
 .../datagrid/store/auto/DbH2ServerStartup.java  |  79 ----
 .../ignite/examples/util/DbH2ServerStartup.java |  79 ++++
 .../ignite/examples/util/package-info.java      |  22 ++
 modules/aop/pom.xml                             |  14 +-
 modules/apache-license-gen/pom.xml              |   2 +-
 modules/aws/pom.xml                             |  20 +-
 modules/camel/pom.xml                           |  16 +-
 modules/clients/pom.xml                         |   2 +-
 modules/cloud/pom.xml                           |   2 +-
 modules/codegen/pom.xml                         |   2 +-
 modules/core/pom.xml                            |  30 +-
 .../store/jdbc/CacheAbstractJdbcStore.java      |  12 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |   9 +
 .../configuration/IgniteConfiguration.java      |   4 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   4 +-
 .../ignite/internal/MarshallerContextImpl.java  |   7 +-
 .../GridDeploymentPerVersionStore.java          |  12 +-
 .../internal/portable/BinaryFieldAccessor.java  |  83 ++++-
 .../internal/portable/BinaryReaderExImpl.java   |  13 +-
 .../internal/portable/BinaryWriterExImpl.java   |   5 +-
 .../internal/portable/PortableContext.java      |  34 +-
 .../CacheDefaultBinaryAffinityKeyMapper.java    |  19 +-
 .../processors/cache/GridCacheAdapter.java      |   8 +-
 .../processors/cache/GridCacheContext.java      |  67 +++-
 .../GridCacheDefaultAffinityKeyMapper.java      |   9 +-
 .../processors/cache/GridCacheIoManager.java    |   2 +-
 .../processors/cache/GridCacheMapEntry.java     |   6 +-
 .../GridCachePartitionExchangeManager.java      |  40 +-
 .../processors/cache/GridCachePreloader.java    |  16 +-
 .../cache/GridCachePreloaderAdapter.java        |   7 +-
 .../processors/cache/GridCacheProcessor.java    |  14 +-
 .../processors/cache/GridCacheProxyImpl.java    |  12 +
 .../processors/cache/IgniteCacheProxy.java      |  24 ++
 .../processors/cache/IgniteInternalCache.java   |   9 +
 .../CacheDataStructuresManager.java             |  31 +-
 .../distributed/dht/GridDhtLockFuture.java      |  17 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  24 +-
 .../dht/preloader/GridDhtPartitionDemander.java |  71 ++--
 .../GridDhtPartitionsExchangeFuture.java        |   9 +-
 .../dht/preloader/GridDhtPreloader.java         |  31 +-
 .../preloader/GridDhtPreloaderAssignments.java  |  19 +-
 .../distributed/near/GridNearGetFuture.java     |  12 +-
 .../CacheObjectBinaryProcessorImpl.java         |  15 +-
 .../cache/query/GridCacheQueryManager.java      |  12 +-
 .../cache/transactions/IgniteTxHandler.java     |   2 +-
 .../transactions/IgniteTxLocalAdapter.java      |  11 +-
 .../datastructures/CollocatedQueueItemKey.java  |  75 ++++
 .../datastructures/CollocatedSetItemKey.java    |  87 +++++
 .../datastructures/DataStructuresProcessor.java |   7 +-
 .../GridAtomicCacheQueueImpl.java               |   8 +-
 .../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 ++
 .../handlers/query/QueryCommandHandler.java     |   8 +-
 .../ignite/internal/util/IgniteUtils.java       |   8 +
 .../communication/tcp/TcpCommunicationSpi.java  |  18 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   2 -
 .../core/src/main/resources/ignite.properties   |   2 +-
 .../portable/BinaryMarshallerSelfTest.java      | 186 ++++++++--
 .../CachePutEventListenerErrorSelfTest.java     |  35 +-
 ...cheAbstractFullApiMultithreadedSelfTest.java |   9 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |   2 -
 ...eAtomicEntryProcessorDeploymentSelfTest.java |   6 +-
 .../cache/GridCacheClearSelfTest.java           |   9 +-
 ...inodeUpdateNearEnabledNoBackupsSelfTest.java |   9 +-
 ...CacheMultinodeUpdateNearEnabledSelfTest.java |   5 +
 .../cache/IgniteCacheAbstractTest.java          |   3 +
 .../cache/IgniteCacheInvokeAbstractTest.java    | 369 ++++++++++++++-----
 .../IgniteCacheStoreValueAbstractTest.java      | 111 +++---
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |   2 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |  15 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |  18 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |   6 +-
 .../GridCachePartitionedQueueApiSelfTest.java   |   5 +
 ...dCachePartitionedQueueEntryMoveSelfTest.java |   2 +-
 .../IgnitePartitionedQueueNoBackupsTest.java    |  92 +++++
 .../GridCacheReplicatedQueueApiSelfTest.java    |   5 +
 .../CacheLockReleaseNodeLeaveTest.java          | 161 ++++++++
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |  37 +-
 .../dht/GridCacheTxNodeFailureSelfTest.java     |   2 +
 .../dht/GridNearCacheTxNodeFailureSelfTest.java |   4 -
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |   3 +-
 ...cingDelayedPartitionMapExchangeSelfTest.java |   9 +-
 .../GridCacheRebalancingAsyncSelfTest.java      |   3 +-
 .../GridCacheRebalancingSyncCheckDataTest.java  |  98 +++++
 .../GridCacheRebalancingSyncSelfTest.java       |  55 +--
 ...eRebalancingUnmarshallingFailedSelfTest.java |  19 +-
 .../GridCacheLocalIsolatedNodesSelfTest.java    |   6 +-
 .../GridCacheWriteBehindStoreAbstractTest.java  |   2 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |   7 +-
 .../internal/util/nio/GridNioSelfTest.java      |  69 ++--
 .../config/GridTestProperties.java              |   6 +
 .../testframework/junits/GridAbstractTest.java  |  15 +
 ...ObjectsCacheDataStructuresSelfTestSuite.java |   4 +
 ...BinaryObjectsCacheExpiryPolicyTestSuite.java |   4 +
 ...gniteBinaryObjectsCacheRestartTestSuite.java |   4 +
 .../IgniteBinaryObjectsCacheTestSuite2.java     |   4 +
 .../IgniteBinaryObjectsCacheTestSuite3.java     |   6 +
 .../IgniteBinaryObjectsCacheTestSuite4.java     |   4 +
 ...IgniteBinaryObjectsComputeGridTestSuite.java |   4 +
 .../IgniteCacheDataStructuresSelfTestSuite.java |   3 +
 .../testsuites/IgniteCacheTestSuite2.java       |   2 +
 .../testsuites/IgniteCacheTestSuite3.java       |   2 +
 .../IgnitePortableCacheTestSuite.java           |   1 -
 modules/extdata/p2p/pom.xml                     |   2 +-
 .../extdata/uri/modules/uri-dependency/pom.xml  |   2 +-
 modules/extdata/uri/pom.xml                     |   4 +-
 modules/flume/pom.xml                           |  21 +-
 modules/gce/pom.xml                             |   2 +-
 modules/geospatial/pom.xml                      |  22 +-
 modules/hadoop/pom.xml                          |   4 +-
 modules/hibernate/pom.xml                       |  12 +-
 modules/indexing/pom.xml                        |  24 +-
 modules/jcl/pom.xml                             |  13 +-
 modules/jms11/pom.xml                           |  22 +-
 modules/jta/pom.xml                             |  19 +-
 modules/kafka/pom.xml                           |  18 +-
 modules/log4j/pom.xml                           |  12 +-
 modules/log4j2/pom.xml                          |  13 +-
 modules/mesos/pom.xml                           |   2 +-
 modules/mqtt/pom.xml                            |  29 +-
 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/cpp/common/configure.ac       |   2 +-
 modules/platforms/cpp/core-test/configure.ac    |   2 +-
 modules/platforms/cpp/core/configure.ac         |   2 +-
 modules/platforms/cpp/examples/configure.ac     |   2 +-
 modules/platforms/cpp/ignite/configure.ac       |   2 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Properties/AssemblyInfo.cs                  |  12 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Properties/AssemblyInfo.cs                  |   6 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs    |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 modules/rest-http/pom.xml                       |  36 +-
 modules/scalar-2.10/pom.xml                     |  11 +-
 modules/scalar/pom.xml                          |  11 +-
 modules/schedule/pom.xml                        |  27 +-
 modules/schema-import/pom.xml                   |   4 +-
 .../ignite/schema/ui/SchemaImportApp.java       |  14 +
 modules/slf4j/pom.xml                           |  14 +-
 modules/spark-2.10/pom.xml                      |   4 +-
 modules/spark/pom.xml                           |   2 +-
 modules/spring/pom.xml                          |  32 +-
 modules/ssh/pom.xml                             |  21 +-
 modules/tools/pom.xml                           |   2 +-
 modules/twitter/pom.xml                         |  17 +-
 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 +-
 .../yardstick/cache/IgnitePutTxBenchmark.java   |  26 +-
 ...IgniteTransactionalInvokeRetryBenchmark.java |   4 +-
 ...IgniteTransactionalWriteInvokeBenchmark.java |  22 +-
 modules/yarn/pom.xml                            |   2 +-
 modules/zookeeper/pom.xml                       |  16 +-
 parent/pom.xml                                  | 140 ++++++-
 pom.xml                                         |  46 ++-
 194 files changed, 5515 insertions(+), 1012 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3fbf3e95/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------


Mime
View raw message