ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [08/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-nio' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-nio
Date Sun, 15 Feb 2015 08:41:50 GMT
Merge branches 'ignite-nio' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-nio

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.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/6f20eb26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6f20eb26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6f20eb26

Branch: refs/heads/sprint-1
Commit: 6f20eb26ebeb2df7b38b6f6b1fc63fe303b33134
Parents: 43ba831 f846f8a
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Sat Feb 14 12:02:54 2015 -0800
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Sat Feb 14 12:02:54 2015 -0800

----------------------------------------------------------------------
 assembly/core-jar.xml                           |   49 -
 assembly/dependencies-fabric.xml                |   53 +-
 assembly/dependencies-hadoop.xml                |   42 +-
 assembly/dependencies-optional-fabric.xml       |    1 -
 assembly/dependencies-optional-hadoop.xml       |    1 -
 examples/pom-standalone.xml                     |    6 +
 examples/pom.xml                                |    6 +
 .../client/memcache/MemcacheRestExample.java    |    3 +-
 modules/core/licenses/sun-bcl-license.txt       |   50 +
 modules/core/pom.xml                            |   16 -
 .../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/GridKernalGateway.java      |    7 +
 .../ignite/internal/GridKernalGatewayImpl.java  |   16 +
 .../apache/ignite/internal/IgniteKernal.java    |   23 +-
 .../ignite/internal/IgniteTransactionsEx.java   |   37 +-
 .../deployment/GridDeploymentManager.java       |    2 +-
 .../processors/cache/GridCacheAdapter.java      |  661 ++-
 .../cache/GridCacheConcurrentMap.java           |    7 +-
 .../processors/cache/GridCacheEntryEx.java      |    5 +-
 .../processors/cache/GridCacheEntrySet.java     |    3 +-
 .../processors/cache/GridCacheMapEntry.java     |  163 +-
 .../processors/cache/GridCacheMvccManager.java  |   15 +
 .../processors/cache/GridCacheProcessor.java    |    8 +
 .../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    |   82 +-
 .../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 +-
 .../optimized/optimized-classnames.properties   |  254 +-
 .../fifoqueue/FifoQueueCollisionSpi.java        |    6 +-
 .../PriorityQueueCollisionSpi.java              |    6 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   70 +-
 .../tcp/internal/TcpDiscoveryNodesRing.java     |    2 -
 .../ignite/startup/BasicWarmupClosure.java      |    3 +-
 .../org/jdk8/backport/ConcurrentHashMap8.java   | 3825 ++++++++++++++++++
 .../jdk8/backport/ConcurrentLinkedDeque8.java   | 1983 +++++++++
 .../jdk8/backport/ConcurrentLinkedHashMap.java  | 2170 ++++++++++
 .../main/java/org/jdk8/backport/LongAdder.java  |  235 ++
 .../main/java/org/jdk8/backport/Striped64.java  |  370 ++
 .../org/jdk8/backport/ThreadLocalRandom8.java   |  231 ++
 .../META-INF/licenses/gnu-gplv2ce-license.txt   |  349 ++
 .../internal/GridReleaseTypeSelfTest.java       |   35 +-
 .../GridTopologyBuildVersionSelfTest.java       |  101 -
 .../internal/GridUpdateNotifierSelfTest.java    |    4 +
 .../cache/GridCacheAbstractFullApiSelfTest.java |   12 +-
 .../cache/GridCacheAbstractMetricsSelfTest.java |    4 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |    4 +-
 .../cache/GridCacheDeploymentSelfTest.java      |   40 -
 ...CacheFullTextQueryMultithreadedSelfTest.java |    2 +-
 .../GridCacheGroupLockAbstractSelfTest.java     | 1337 ------
 ...heGroupLockFailoverOptimisticTxSelfTest.java |   28 -
 .../GridCacheGroupLockFailoverSelfTest.java     |  533 ---
 ...CacheGroupLockMultiNodeAbstractSelfTest.java |   28 -
 .../cache/GridCacheGroupLockPutTask.java        |  161 -
 .../cache/GridCacheLuceneQueryIndexTest.java    |   16 +-
 .../cache/GridCacheOffHeapSelfTest.java         |    2 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |    2 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |    2 +-
 .../cache/GridCacheQueryIndexSelfTest.java      |    5 +-
 .../GridCacheQueryInternalKeysSelfTest.java     |    4 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |    2 +-
 .../processors/cache/GridCacheTestEntryEx.java  |    3 +-
 .../GridCacheVariableTopologySelfTest.java      |    2 +-
 .../IgniteCacheAbstractStopBusySelfTest.java    |  381 ++
 .../IgniteCacheAtomicStopBusySelfTest.java      |   59 +
 .../IgniteCacheContainsKeyAbstractSelfTest.java |  136 +
 ...gniteCacheTransactionalStopBusySelfTest.java |   53 +
 .../cache/IgniteTxMultiNodeAbstractTest.java    |    6 +-
 ...niteCacheContinuousExecutionContextTest.java |   34 +
 ...IgniteCacheIsolatedExecutionContextTest.java |   34 +
 ...niteCacheP2PDisableExecutionContextTest.java |   34 +
 .../IgniteCachePrivateExecutionContextTest.java |   34 +
 .../IgniteCacheSharedExecutionContextTest.java  |   34 +
 .../GridCacheQueueCleanupSelfTest.java          |    8 +-
 .../GridCacheAbstractJobExecutionTest.java      |    7 +-
 .../GridCacheClientModesAbstractSelfTest.java   |    9 +-
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |    2 -
 ...GridCacheDhtEvictionNearReadersSelfTest.java |    2 +-
 .../GridCacheGroupLockColocatedSelfTest.java    |   38 -
 ...acheGroupLockMultiNodeColocatedSelfTest.java |   29 -
 ...cheGroupLockPartitionedAbstractSelfTest.java |  137 -
 ...ockPartitionedMultiNodeAbstractSelfTest.java |  174 -
 ...ePartitionedNearDisabledMetricsSelfTest.java |    2 +-
 ...IgniteCacheContainsKeyColocatedSelfTest.java |   36 +
 ...CacheContainsKeyColocatedAtomicSelfTest.java |   41 +
 ...gniteCacheContainsKeyNearAtomicSelfTest.java |   36 +
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |   12 +-
 ...AtomicPartitionedTckMetricsSelfTestImpl.java |    6 +-
 ...GridCacheGroupLockMultiNodeNearSelfTest.java |   30 -
 .../near/GridCacheGroupLockNearSelfTest.java    |   38 -
 ...achePartitionedPreloadLifecycleSelfTest.java |    8 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |    2 +-
 .../IgniteCacheContainsKeyNearSelfTest.java     |   31 +
 ...cheGroupLockMultiNodeReplicatedSelfTest.java |   45 -
 .../GridCacheGroupLockReplicatedSelfTest.java   |   39 -
 ...CacheReplicatedPreloadLifecycleSelfTest.java |    7 +-
 .../GridCacheEvictionTouchSelfTest.java         |   94 -
 ...dCacheAtomicLocalTckMetricsSelfTestImpl.java |    4 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |   13 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |   44 +-
 ...dCacheContinuousQueryReplicatedSelfTest.java |    9 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |   11 +-
 ...cheReduceFieldsQueryPartitionedSelfTest.java |    3 +-
 .../dataload/GridDataLoaderPerformanceTest.java |   17 +-
 .../GridDataLoaderProcessorSelfTest.java        |   59 +-
 ...ridCacheAffinityTransactionsOffHeapTest.java |  270 --
 .../cache/GridCacheGroupLockComparisonTest.java |  204 -
 .../GridContinuousOperationsLoadTest.java       |    2 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |    1 -
 .../IgniteCacheGroupLockSelfTestSuite.java      |   48 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |   10 +-
 modules/extdata/p2p/pom.xml                     |    6 +
 .../query/h2/GridH2IndexingGeoSelfTest.java     |    8 +-
 modules/hadoop/pom.xml                          |    6 +
 modules/hibernate/pom.xml                       |    6 +
 .../GridHibernateAccessStrategyAdapter.java     |    3 +-
 .../hibernate/GridHibernateRegionFactory.java   |    7 +-
 modules/indexing/pom.xml                        |    6 +
 .../GridCacheAbstractFieldsQuerySelfTest.java   |   47 +-
 .../cache/GridCacheAbstractQuerySelfTest.java   |   82 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |    5 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |    4 +-
 .../cache/GridCacheQueryLoadSelfTest.java       |   74 -
 .../GridCacheQueryMultiThreadedSelfTest.java    |   30 +-
 .../GridCacheSqlQueryMultiThreadedSelfTest.java |    3 +-
 .../processors/cache/GridCacheSwapSelfTest.java |    7 +-
 .../cache/GridIndexingWithNoopSwapSelfTest.java |    3 +-
 .../GridCacheAtomicFieldsQuerySelfTest.java     |    3 +-
 ...GridCachePartitionedFieldsQuerySelfTest.java |    3 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |    2 +-
 .../near/GridCachePartitionedQuerySelfTest.java |   23 +-
 .../near/GridCacheQueryNodeRestartSelfTest.java |    2 +-
 .../GridCacheReplicatedFieldsQuerySelfTest.java |    4 +-
 .../GridCacheReplicatedQuerySelfTest.java       |    6 +-
 .../local/GridCacheLocalQuerySelfTest.java      |    5 +-
 .../query/h2/GridH2IndexRebuildTest.java        |   16 +-
 .../query/h2/sql/GridQueryParsingTest.java      |    2 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |    2 +-
 .../jdk8-backport/licenses/sun-bcl-license.txt  |   50 -
 modules/jdk8-backport/pom.xml                   |   36 -
 .../org/jdk8/backport/ConcurrentHashMap8.java   | 3825 ------------------
 .../jdk8/backport/ConcurrentLinkedDeque8.java   | 1983 ---------
 .../jdk8/backport/ConcurrentLinkedHashMap.java  | 2170 ----------
 .../main/java/org/jdk8/backport/LongAdder.java  |  235 --
 .../main/java/org/jdk8/backport/Striped64.java  |  370 --
 .../org/jdk8/backport/ThreadLocalRandom8.java   |  231 --
 .../META-INF/licenses/gnu-gplv2ce-license.txt   |  349 --
 modules/jta/pom.xml                             |    6 +
 modules/scalar/pom.xml                          |    6 +
 modules/spring/pom.xml                          |    6 +
 .../org/apache/ignite/IgniteSpringBean.java     |    3 +-
 .../ignite/cache/spring/SpringCacheManager.java |    3 +-
 .../cache/spring/SpringDynamicCacheManager.java |   11 +-
 modules/visor-console/pom.xml                   |    6 +
 .../commands/cache/VisorCacheCommand.scala      |    2 +-
 modules/web/pom.xml                             |    6 +
 pom.xml                                         |  153 +-
 191 files changed, 11667 insertions(+), 14872 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6f20eb26/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
index 223192a,0aca49b..8a3343e
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
@@@ -297,68 -288,67 +287,68 @@@ public class GridNearGetRequest<K, V> e
                  if (!writer.writeLong("accessTtl", accessTtl))
                      return false;
  
 -                state++;
 +                state.increment();
  
              case 4:
-                 if (!writer.writeObjectArray("filterBytes", filterBytes, byte[].class))
+                 if (!writer.writeIgniteUuid("futId", futId))
                      return false;
  
 -                state++;
 +                state.increment();
  
              case 5:
-                 if (!writer.writeIgniteUuid("futId", futId))
+                 if (!writer.writeMap("keyBytes", keyBytes, byte[].class, boolean.class))
                      return false;
  
 -                state++;
 +                state.increment();
  
              case 6:
-                 if (!writer.writeMap("keyBytes", keyBytes, byte[].class, boolean.class))
+                 if (!writer.writeIgniteUuid("miniId", miniId))
                      return false;
  
 -                state++;
 +                state.increment();
  
              case 7:
-                 if (!writer.writeIgniteUuid("miniId", miniId))
+                 if (!writer.writeBoolean("readThrough", readThrough))
                      return false;
  
 -                state++;
 +                state.increment();
  
              case 8:
-                 if (!writer.writeBoolean("readThrough", readThrough))
+                 if (!writer.writeBoolean("reload", reload))
                      return false;
  
 -                state++;
 +                state.increment();
  
              case 9:
-                 if (!writer.writeBoolean("reload", reload))
+                 if (!writer.writeUuid("subjId", subjId))
                      return false;
  
 -                state++;
 +                state.increment();
  
              case 10:
-                 if (!writer.writeUuid("subjId", subjId))
+                 if (!writer.writeInt("taskNameHash", taskNameHash))
                      return false;
  
 -                state++;
 +                state.increment();
  
              case 11:
-                 if (!writer.writeInt("taskNameHash", taskNameHash))
+                 if (!writer.writeLong("topVer", topVer))
                      return false;
  
 -                state++;
 +                state.increment();
  
              case 12:
-                 if (!writer.writeLong("topVer", topVer))
+                 if (!writer.writeMessage("ver", ver))
                      return false;
  
 -                state++;
 +                state.increment();
  
              case 13:
-                 if (!writer.writeMessage("ver", ver))
+                 if (!writer.writeBoolean("skipVals", skipVals))
                      return false;
  
 -                state++;
 +                state.increment();
 +
          }
  
          return true;
@@@ -379,82 -369,82 +369,82 @@@
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
              case 4:
-                 filterBytes = reader.readObjectArray("filterBytes", byte[].class);
+                 futId = reader.readIgniteUuid("futId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
              case 5:
-                 futId = reader.readIgniteUuid("futId");
+                 keyBytes = reader.readMap("keyBytes", byte[].class, boolean.class, true);
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
              case 6:
-                 keyBytes = reader.readMap("keyBytes", byte[].class, boolean.class, true);
+                 miniId = reader.readIgniteUuid("miniId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
              case 7:
-                 miniId = reader.readIgniteUuid("miniId");
+                 readThrough = reader.readBoolean("readThrough");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
              case 8:
-                 readThrough = reader.readBoolean("readThrough");
+                 reload = reader.readBoolean("reload");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
              case 9:
-                 reload = reader.readBoolean("reload");
+                 subjId = reader.readUuid("subjId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
              case 10:
-                 subjId = reader.readUuid("subjId");
+                 taskNameHash = reader.readInt("taskNameHash");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
              case 11:
-                 taskNameHash = reader.readInt("taskNameHash");
+                 topVer = reader.readLong("topVer");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
              case 12:
-                 topVer = reader.readLong("topVer");
+                 ver = reader.readMessage("ver");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
              case 13:
-                 ver = reader.readMessage("ver");
+                 skipVals = reader.readBoolean("skipVals");
  
                  if (!reader.isLastRead())
                      return false;


Mime
View raw message