ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/3] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-157
Date Fri, 17 Apr 2015 09:57:49 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-157 [created] 7ee795497


Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-157

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java


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

Branch: refs/heads/ignite-157
Commit: 54d1f5f522f1c1a0b89331d1e06789bc5adf4e3b
Parents: 848a252 338e803
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Apr 17 12:12:19 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Apr 17 12:12:19 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |  49 ++
 examples/README.txt                             |   2 +-
 examples/pom.xml                                |   2 +-
 .../hibernate/CacheHibernateStoreExample.java   |   3 -
 .../store/jdbc/CacheJdbcStoreExample.java       |   3 -
 modules/aop/pom.xml                             |   2 +-
 modules/aws/pom.xml                             |   2 +-
 modules/clients/pom.xml                         |   2 +-
 modules/codegen/pom.xml                         |   2 +-
 modules/core/pom.xml                            |   2 +-
 .../apache/ignite/IgniteSystemProperties.java   |   6 -
 .../apache/ignite/cache/query/QueryMetrics.java |   4 +-
 .../internal/managers/GridManagerAdapter.java   |   4 +
 .../discovery/GridDiscoveryManager.java         |  14 +
 .../processors/cache/CacheProjection.java       | 298 ++--------
 .../internal/processors/cache/GridCache.java    |   1 -
 .../processors/cache/GridCacheAdapter.java      | 546 ++++++-------------
 .../processors/cache/GridCacheAtomicFuture.java |   7 -
 .../cache/GridCacheConcurrentMap.java           |   2 +-
 .../processors/cache/GridCacheMapAdapter.java   | 238 --------
 .../processors/cache/GridCacheProjectionEx.java | 129 -----
 .../cache/GridCacheProjectionImpl.java          | 276 ++--------
 .../processors/cache/GridCacheProxyImpl.java    | 453 ++-------------
 .../processors/cache/GridCacheSwapManager.java  |   4 +-
 .../processors/cache/GridCacheUtils.java        |  28 -
 .../processors/cache/IgniteCacheProxy.java      |  37 +-
 .../CacheDataStructuresManager.java             |   4 +-
 .../GridDistributedCacheAdapter.java            |  15 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  23 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   5 +-
 .../dht/GridPartitionedGetFuture.java           |  20 +-
 .../dht/atomic/GridDhtAtomicCache.java          | 170 ++----
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |  19 -
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  12 -
 .../dht/colocated/GridDhtColocatedCache.java    |  21 +-
 .../GridDhtPartitionsExchangeFuture.java        |   5 +
 .../distributed/near/GridNearAtomicCache.java   | 130 ++---
 .../distributed/near/GridNearCacheAdapter.java  |  57 +-
 .../distributed/near/GridNearCacheEntry.java    |  16 +-
 .../distributed/near/GridNearGetFuture.java     |  20 +-
 .../near/GridNearTransactionalCache.java        |   9 +-
 .../processors/cache/local/GridLocalCache.java  |  16 +-
 .../local/atomic/GridLocalAtomicCache.java      | 131 ++---
 .../processors/cache/query/CacheQueries.java    |  98 +---
 .../cache/query/CacheQueriesImpl.java           | 142 +++++
 .../cache/query/CacheQueriesProxy.java          | 200 +++++++
 .../processors/cache/query/CacheQuery.java      |   7 +-
 .../CacheQueryCloseableScanBiPredicate.java     |  30 +
 .../cache/query/GridCacheQueriesEx.java         |  68 ---
 .../cache/query/GridCacheQueriesImpl.java       | 217 --------
 .../cache/query/GridCacheQueriesProxy.java      | 285 ----------
 .../cache/query/GridCacheQueryManager.java      |   8 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |   2 +-
 .../transactions/IgniteTxLocalAdapter.java      |  12 +-
 .../datastreamer/DataStreamerCacheUpdaters.java |  12 +-
 .../datastructures/DataStructuresProcessor.java |  14 +-
 .../GridAtomicCacheQueueImpl.java               |  12 +-
 .../datastructures/GridCacheAtomicLongImpl.java |  16 +-
 .../GridCacheAtomicReferenceImpl.java           |   4 +-
 .../GridCacheAtomicSequenceImpl.java            |   2 +-
 .../GridCacheAtomicStampedImpl.java             |   4 +-
 .../GridCacheCountDownLatchImpl.java            |   2 +-
 .../datastructures/GridCacheSetImpl.java        |   4 +-
 .../GridTransactionalCacheQueueImpl.java        |   8 +-
 .../processors/igfs/IgfsDataManager.java        |   6 +-
 .../processors/igfs/IgfsMetaManager.java        |  39 +-
 .../processors/rest/GridRestCommand.java        |  11 +-
 .../processors/rest/GridRestProcessor.java      |   9 -
 .../message/GridClientCacheQueryRequest.java    | 366 -------------
 .../cache/GridCacheClientQueryResult.java       |  97 ----
 .../handlers/cache/GridCacheCommandHandler.java |  14 +-
 .../cache/GridCacheQueryCommandHandler.java     | 480 ----------------
 .../protocols/tcp/GridTcpRestNioListener.java   |  24 -
 .../rest/request/GridRestCacheQueryRequest.java | 143 -----
 .../service/GridServiceProcessor.java           |  13 +-
 .../processors/task/GridTaskProcessor.java      |   2 +-
 .../util/future/GridCompoundFuture.java         |   9 +-
 .../visor/cache/VisorCacheMetadataTask.java     |   2 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   5 +
 .../org/apache/ignite/spi/IgniteSpiContext.java |   6 +
 .../communication/tcp/TcpCommunicationSpi.java  |  70 +--
 .../tcp/TcpCommunicationSpiMBean.java           |   9 -
 .../ignite/spi/discovery/DiscoverySpi.java      |   7 +
 .../discovery/tcp/TcpClientDiscoverySpi.java    |  12 +
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  32 +-
 .../ignite/startup/BasicWarmupClosure.java      |  12 +-
 ...ridFailFastNodeFailureDetectionSelfTest.java | 112 ++++
 .../internal/GridLifecycleBeanSelfTest.java     |  36 ++
 .../GridCacheAbstractFailoverSelfTest.java      |  44 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  48 +-
 ...CacheFullTextQueryMultithreadedSelfTest.java |   4 +-
 .../processors/cache/GridCacheOffHeapTest.java  |   4 +-
 .../cache/GridCachePutAllFailoverSelfTest.java  |  14 +-
 .../processors/cache/GridCachePutAllTask.java   |  56 +-
 ...IgniteCacheAtomicPutAllFailoverSelfTest.java |  32 ++
 .../cache/IgniteTxMultiNodeAbstractTest.java    |  35 +-
 .../GridCacheSequenceApiSelfAbstractTest.java   |   2 +-
 ...GridCachePartitionedNodeRestartSelfTest.java |  67 ---
 .../GridCacheAbstractNodeRestartSelfTest.java   |  23 +-
 .../GridCacheAtomicTimeoutSelfTest.java         | 314 -----------
 .../GridCacheMultiNodeLockAbstractTest.java     |  14 +-
 .../IgniteCacheAtomicMessageRecoveryTest.java   |  32 ++
 .../IgniteCacheAtomicNodeRestartTest.java       |  33 ++
 .../IgniteCacheMessageRecoveryAbstractTest.java | 175 ++++++
 .../IgniteCacheSystemTransactionsSelfTest.java  |   4 +-
 .../IgniteCacheTxMessageRecoveryTest.java       |  32 ++
 ...GridCacheDhtEvictionNearReadersSelfTest.java |   2 +-
 .../dht/GridCacheDhtEvictionSelfTest.java       |   4 +-
 .../dht/GridCacheDhtPreloadPutGetSelfTest.java  |   8 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |  14 +-
 .../GridCachePartitionedFullApiSelfTest.java    |   2 +-
 .../GridCachePartitionedNodeRestartTest.java    |   1 +
 .../GridCachePartitionedTxSalvageSelfTest.java  |   4 +
 .../GridCacheReplicatedNodeRestartSelfTest.java |   2 +
 ...acheAtomicReplicatedNodeRestartSelfTest.java |  32 ++
 .../GridCacheReplicatedPreloadSelfTest.java     |   4 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |  12 +-
 .../testframework/GridSpiTestContext.java       |   5 +
 .../junits/common/GridCommonAbstractTest.java   |  36 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |   1 +
 .../IgniteCacheFailoverTestSuite.java           |   2 +-
 .../testsuites/IgniteCacheRestartTestSuite.java |  20 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   3 +-
 modules/extdata/p2p/pom.xml                     |   2 +-
 modules/extdata/uri/pom.xml                     |   2 +-
 modules/geospatial/pom.xml                      |   2 +-
 .../query/h2/GridH2IndexingGeoSelfTest.java     |  70 +--
 modules/hadoop/pom.xml                          |   2 +-
 .../hadoop/jobtracker/HadoopJobTracker.java     |   2 +-
 modules/hibernate/pom.xml                       |   2 +-
 .../HibernateAccessStrategyAdapter.java         |   4 +-
 .../hibernate/HibernateGeneralDataRegion.java   |   2 +-
 .../HibernateNonStrictAccessStrategy.java       |   2 +-
 .../HibernateReadOnlyAccessStrategy.java        |   2 +-
 .../HibernateReadWriteAccessStrategy.java       |   8 +-
 .../ignite/cache/hibernate/HibernateRegion.java |   2 +-
 .../HibernateTransactionalAccessStrategy.java   |   8 +-
 modules/indexing/pom.xml                        |   2 +-
 .../processors/query/h2/IgniteH2Indexing.java   |   3 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |  39 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |  16 +-
 .../cache/GridCacheQueryMetricsSelfTest.java    |  32 +-
 ...idCacheReduceQueryMultithreadedSelfTest.java |  11 +-
 .../cache/GridIndexingWithNoopSwapSelfTest.java |  19 +-
 ...cheReduceFieldsQueryPartitionedSelfTest.java |   5 +-
 .../query/h2/GridH2IndexRebuildTest.java        |  18 +-
 .../IgniteCacheQuerySelfTestSuite.java          |   2 +
 modules/jcl/pom.xml                             |   2 +-
 modules/jta/pom.xml                             |   2 +-
 modules/log4j/pom.xml                           |   2 +-
 modules/rest-http/pom.xml                       |   2 +-
 modules/scalar/pom.xml                          |   2 +-
 modules/schedule/pom.xml                        |   2 +-
 modules/schema-import/pom.xml                   |   2 +-
 modules/slf4j/pom.xml                           |   2 +-
 modules/spring/pom.xml                          |   2 +-
 modules/ssh/pom.xml                             |   2 +-
 modules/tools/pom.xml                           |   2 +-
 modules/urideploy/pom.xml                       |   2 +-
 modules/visor-console/pom.xml                   |   6 +-
 .../ignite/visor/commands/VisorConsole.scala    |  20 +-
 modules/visor-plugins/pom.xml                   |   2 +-
 modules/web/pom.xml                             |   2 +-
 modules/yardstick/pom.xml                       |   2 +-
 pom.xml                                         |   2 +-
 165 files changed, 2124 insertions(+), 4728 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d1f5f5/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d1f5f5/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d1f5f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d1f5f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d1f5f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d1f5f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 2131155,974a197..8cd42c1
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@@ -137,12 -136,6 +137,9 @@@ public class GridNearAtomicUpdateFutur
      /** Task name hash. */
      private final int taskNameHash;
  
-     /** Map time. */
-     private volatile long mapTime;
- 
 +    /** Topology locked flag. Set if atomic update is performed inside a TX or explicit
lock. */
 +    private boolean topLocked;
 +
      /**
       * @param cctx Cache context.
       * @param cache Cache instance.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d1f5f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 767502d,c874ae9..3408975
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@@ -698,10 -696,10 +698,15 @@@ public class GridDhtPartitionsExchangeF
          for (GridCacheFuture<?> fut : cctx.mvcc().activeFutures())
              U.warn(log, ">>> " + fut);
  
 +        U.warn(log, "Locally locked entries:");
 +
 +        for (GridCacheEntryEx entry : cctx.mvcc().locked())
 +            U.warn(log, ">>> " + entry);
++
+         U.warn(log, "Pending atomic cache futures:");
+ 
+         for (GridCacheFuture<?> fut : cctx.mvcc().atomicFutures())
+             U.warn(log, ">>> " + fut);
      }
  
      /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d1f5f5/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index 3fa1c9f,3e06b5e..aacac8c
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@@ -896,25 -960,38 +896,25 @@@ public final class DataStructuresProces
          assert name != null;
          assert dsCacheCtx != null;
  
 -        removeDataStructure(new IgniteCallable<Void>() {
 -            @Override
 -            public Void call() throws Exception {
 +        removeDataStructure(new IgniteClosureX<IgniteInternalTx, Void>() {
 +            @Override public Void applyx(IgniteInternalTx tx) throws IgniteCheckedException
{
                  GridCacheInternal key = new GridCacheInternalKeyImpl(name);
  
 -                dsCacheCtx.gate().enter();
 -
 -                try (IgniteInternalTx tx = CU.txStartInternal(dsCacheCtx, dsView, PESSIMISTIC,
REPEATABLE_READ)) {
 -                    // Check correctness type of removable object.
 -                    GridCacheCountDownLatchValue val =
 -                            cast(dsView.get(key), GridCacheCountDownLatchValue.class);
 -
 -                    if (val != null) {
 -                        if (val.get() > 0) {
 -                            throw new IgniteCheckedException("Failed to remove count down
latch " +
 -                                    "with non-zero count: " + val.get());
 -                        }
 -
 -                        dsView.remove(key);
 -
 -                        tx.commit();
 -                    } else
 -                        tx.setRollbackOnly();
 +                // Check correctness type of removable object.
 +                GridCacheCountDownLatchValue val =
 +                    cast(dsView.get(key), GridCacheCountDownLatchValue.class);
  
 -                    return null;
 -                } catch (Error | Exception e) {
 -                    U.error(log, "Failed to remove data structure: " + key, e);
 +                if (val != null) {
 +                    if (val.get() > 0)
 +                        throw new IgniteCheckedException("Failed to remove count down latch
" +
 +                            "with non-zero count: " + val.get());
  
-                     dsView.removex(key);
 -                    throw e;
 -                } finally {
 -                    dsCacheCtx.gate().leave();
++                    dsView.remove(key);
                  }
 +                else
 +                    tx.setRollbackOnly();
 +
 +                return null;
              }
          }, name, COUNT_DOWN_LATCH, null);
      }
@@@ -928,21 -1004,33 +928,21 @@@
       * @return Method returns true if sequence has been removed and false if it's not cached.
       * @throws IgniteCheckedException If removing failed or class of object is different
to expected class.
       */
 -    private <R> boolean removeInternal(final GridCacheInternal key, final Class<R>
cls) throws IgniteCheckedException {
 -        return CU.outTx(
 -            new Callable<Boolean>() {
 -                @Override public Boolean call() throws Exception {
 -                    try (IgniteInternalTx tx = CU.txStartInternal(dsCacheCtx, dsView, PESSIMISTIC,
REPEATABLE_READ)) {
 -                        // Check correctness type of removable object.
 -                        R val = cast(dsView.get(key), cls);
 -
 -                        if (val != null) {
 -                            dsView.remove(key);
 -
 -                            tx.commit();
 -                        }
 -                        else
 -                            tx.setRollbackOnly();
 +    private <R> boolean removeInternal(
 +        IgniteInternalTx tx,
 +        GridCacheInternal key,
 +        final Class<R> cls)
 +        throws IgniteCheckedException
 +    {
 +        // Check correctness type of removable object.
 +        R val = cast(dsView.get(key), cls);
  
 -                        return val != null;
 -                    }
 -                    catch (Error | Exception e) {
 -                        U.error(log, "Failed to remove data structure: " + key, e);
 +        if (val != null)
-             dsView.removex(key);
++            dsView.remove(key);
 +        else
 +            tx.setRollbackOnly();
  
 -                        throw e;
 -                    }
 -                }
 -            },
 -            dsCacheCtx
 -        );
 +        return val != null;
      }
  
      /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d1f5f5/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d1f5f5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d1f5f5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54d1f5f5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------


Mime
View raw message