ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [16/28] incubator-ignite git commit: Merge branches 'ignite-sql-old' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-old
Date Sun, 15 Feb 2015 07:55:50 GMT
Merge branches 'ignite-sql-old' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-sql-old


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

Branch: refs/heads/sprint-1
Commit: a0f9e67dd46b73cd2eb9c93c4b4009ae13515373
Parents: e7e7c18 a7b2d72
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Sat Feb 14 13:50:39 2015 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
Committed: Sat Feb 14 13:50:39 2015 +0300

----------------------------------------------------------------------
 examples/pom-standalone.xml                     |    6 +
 examples/pom.xml                                |    6 +
 .../java/org/apache/ignite/IgniteCache.java     |    5 +-
 .../org/apache/ignite/IgniteTransactions.java   |   79 +-
 .../org/apache/ignite/cache/CacheManager.java   |    4 +-
 .../apache/ignite/cache/CacheProjection.java    |   92 +-
 .../store/jdbc/CacheAbstractJdbcStore.java      |    3 +-
 .../configuration/CacheConfiguration.java       |    4 +-
 .../ignite/internal/IgniteTransactionsEx.java   |   37 +-
 .../processors/cache/GridCacheAdapter.java      |  661 ++++-----
 .../cache/GridCacheConcurrentMap.java           |    7 +-
 .../processors/cache/GridCacheEntryEx.java      |    5 +-
 .../processors/cache/GridCacheEntrySet.java     |    3 +-
 .../processors/cache/GridCacheMapEntry.java     |  163 +--
 .../cache/GridCacheProjectionImpl.java          |   50 +-
 .../processors/cache/GridCacheProxyImpl.java    |   50 +-
 .../processors/cache/GridCacheUtils.java        |   12 +
 .../processors/cache/IgniteCacheProxy.java      |   18 +
 .../cache/affinity/GridCacheAffinityProxy.java  |    2 +-
 .../GridDistributedTxRemoteAdapter.java         |    4 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   50 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |   37 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |    2 -
 .../dht/GridPartitionedGetFuture.java           |   26 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   36 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   48 +-
 .../distributed/near/GridNearAtomicCache.java   |    6 +-
 .../distributed/near/GridNearCacheAdapter.java  |   77 +-
 .../distributed/near/GridNearCacheEntry.java    |    6 +-
 .../distributed/near/GridNearGetFuture.java     |   35 +-
 .../distributed/near/GridNearGetRequest.java    |   84 +-
 .../near/GridNearTransactionalCache.java        |   17 +-
 .../cache/distributed/near/GridNearTxLocal.java |   26 +-
 .../local/atomic/GridLocalAtomicCache.java      |   37 +-
 .../transactions/IgniteTransactionsImpl.java    |  154 --
 .../cache/transactions/IgniteTxAdapter.java     |    1 -
 .../transactions/IgniteTxLocalAdapter.java      |  241 ++--
 .../cache/transactions/IgniteTxLocalEx.java     |    5 +-
 .../cache/transactions/IgniteTxProxyImpl.java   |    7 +
 .../dataload/GridDataLoadCacheUpdaters.java     |   81 --
 .../dataload/IgniteDataLoaderImpl.java          |    2 +-
 .../handlers/cache/GridCacheCommandHandler.java |    2 +-
 .../cache/GridCacheQueryCommandHandler.java     |    6 +-
 .../protocols/tcp/GridTcpRestNioListener.java   |   16 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |   10 +-
 .../node/VisorNodeEventsCollectorTask.java      |    3 +-
 .../internal/visor/query/VisorQueryTask.java    |   45 +-
 .../internal/visor/util/VisorTaskUtils.java     |    4 +-
 .../tcp/internal/TcpDiscoveryNodesRing.java     |    2 -
 .../ignite/startup/BasicWarmupClosure.java      |    3 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |   12 +-
 .../cache/GridCacheAbstractMetricsSelfTest.java |    4 +-
 .../cache/GridCacheDeploymentSelfTest.java      |   40 -
 .../GridCacheGroupLockAbstractSelfTest.java     | 1337 ------------------
 ...heGroupLockFailoverOptimisticTxSelfTest.java |   28 -
 .../GridCacheGroupLockFailoverSelfTest.java     |  533 -------
 ...CacheGroupLockMultiNodeAbstractSelfTest.java |   28 -
 .../cache/GridCacheGroupLockPutTask.java        |  161 ---
 .../GridCachePreloadingEvictionsSelfTest.java   |    2 +-
 .../GridCacheQueryInternalKeysSelfTest.java     |    2 +-
 .../processors/cache/GridCacheTestEntryEx.java  |    3 +-
 .../IgniteCacheContainsKeyAbstractSelfTest.java |  136 ++
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |    2 -
 ...GridCacheDhtEvictionNearReadersSelfTest.java |    2 +-
 .../GridCacheGroupLockColocatedSelfTest.java    |   38 -
 ...acheGroupLockMultiNodeColocatedSelfTest.java |   29 -
 ...cheGroupLockPartitionedAbstractSelfTest.java |  137 --
 ...ockPartitionedMultiNodeAbstractSelfTest.java |  174 ---
 ...IgniteCacheContainsKeyColocatedSelfTest.java |   36 +
 ...CacheContainsKeyColocatedAtomicSelfTest.java |   41 +
 ...gniteCacheContainsKeyNearAtomicSelfTest.java |   36 +
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |   12 +-
 ...AtomicPartitionedTckMetricsSelfTestImpl.java |    6 +-
 ...GridCacheGroupLockMultiNodeNearSelfTest.java |   30 -
 .../near/GridCacheGroupLockNearSelfTest.java    |   38 -
 .../IgniteCacheContainsKeyNearSelfTest.java     |   31 +
 ...cheGroupLockMultiNodeReplicatedSelfTest.java |   45 -
 .../GridCacheGroupLockReplicatedSelfTest.java   |   39 -
 .../GridCacheEvictionTouchSelfTest.java         |   94 --
 ...dCacheAtomicLocalTckMetricsSelfTestImpl.java |    4 +-
 .../dataload/GridDataLoaderPerformanceTest.java |   17 +-
 .../GridDataLoaderProcessorSelfTest.java        |   59 +-
 ...ridCacheAffinityTransactionsOffHeapTest.java |  270 ----
 .../cache/GridCacheGroupLockComparisonTest.java |  204 ---
 .../IgniteCacheGroupLockSelfTestSuite.java      |   48 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |    3 -
 modules/extdata/p2p/pom.xml                     |    6 +
 modules/hadoop/pom.xml                          |   12 +
 modules/hibernate/pom.xml                       |    6 +
 modules/indexing/pom.xml                        |   12 +
 .../cache/GridCacheQueryLoadSelfTest.java       |   74 -
 modules/jta/pom.xml                             |    6 +
 modules/scalar/pom.xml                          |    6 +
 modules/spring/pom.xml                          |    6 +
 .../cache/spring/SpringDynamicCacheManager.java |    9 +-
 .../commands/cache/VisorCacheCommand.scala      |    2 +-
 96 files changed, 1187 insertions(+), 4913 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0f9e67d/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0f9e67d/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0f9e67d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0f9e67d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0f9e67d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0f9e67d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0f9e67d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0f9e67d/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0f9e67d/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0f9e67d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java
----------------------------------------------------------------------


Mime
View raw message