ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [49/50] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests
Date Tue, 03 Mar 2015 21:39:09 GMT
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.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/ab5c732f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ab5c732f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ab5c732f

Branch: refs/heads/ignite-sql-tests
Commit: ab5c732f6913f03f03789e19e2b722e7f079f4b7
Parents: 9424b9c 6909cc4
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Wed Mar 4 00:34:22 2015 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
Committed: Wed Mar 4 00:34:22 2015 +0300

----------------------------------------------------------------------
 examples/pom-standalone.xml                     |   2 +-
 .../ClientAbstractMultiThreadedSelfTest.java    |  37 +-
 .../impl/ClientPartitionAffinitySelfTest.java   | 406 -----------
 .../ClientAbstractMultiNodeSelfTest.java        |  54 +-
 .../integration/ClientAbstractSelfTest.java     |   8 -
 .../ClientTcpUnreachableMultiNodeSelfTest.java  |   4 -
 .../client/suite/IgniteClientTestSuite.java     |   1 -
 .../src/test/resources/spring-server-node.xml   |   2 +-
 .../test/resources/spring-server-ssl-node.xml   |   2 +-
 .../java/org/apache/ignite/IgniteCluster.java   |   8 +-
 .../java/org/apache/ignite/IgniteEvents.java    |   2 +-
 .../ignite/cache/CacheTypeFieldMetadata.java    |   2 +-
 .../apache/ignite/cache/CacheTypeMetadata.java  |  18 +-
 .../java/org/apache/ignite/cache/GridCache.java |   2 +-
 .../CacheConsistentHashAffinityFunction.java    | 702 -------------------
 .../cache/affinity/consistenthash/package.html  |  24 -
 .../CacheRendezvousAffinityFunction.java        |   2 +-
 .../configuration/CacheConfiguration.java       |   2 +-
 .../configuration/IgniteConfiguration.java      |  11 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 591 +++++++---------
 .../ignite/internal/client/GridClientNode.java  |   8 -
 .../client/GridClientPartitionAffinity.java     |   2 +-
 .../client/impl/GridClientNodeImpl.java         |  22 -
 .../connection/GridClientNioTcpConnection.java  |   3 +-
 .../affinity/GridAffinityAssignmentCache.java   |  13 +-
 .../processors/cache/CacheMetricsImpl.java      |   4 +
 .../processors/cache/GridCacheAttributes.java   |  32 +-
 .../processors/cache/GridCacheContext.java      |  19 +
 .../processors/cache/GridCacheMapEntry.java     |   9 +
 .../processors/cache/GridCacheProcessor.java    |  44 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   3 +
 .../distributed/dht/GridDhtLocalPartition.java  |   5 +
 .../dht/atomic/GridDhtAtomicCache.java          |   2 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   2 +-
 .../cache/transactions/IgniteTxManager.java     |   7 +-
 .../rest/client/message/GridClientNodeBean.java |  23 -
 .../top/GridTopologyCommandHandler.java         |   8 -
 .../cache/VisorCacheAffinityConfiguration.java  |  19 +-
 .../core/src/main/resources/ignite.properties   |   2 +-
 .../config/load/dsi-49-server-production.xml    |   2 +-
 .../GridCacheAffinityBackupsSelfTest.java       |   9 -
 .../ignite/IgniteCacheAffinitySelfTest.java     |  30 +-
 ...AffinityProcessorConsistentHashSelfTest.java |  31 -
 .../GridCacheAbstractLocalStoreSelfTest.java    | 440 ++++++++++++
 .../cache/GridCacheAbstractMetricsSelfTest.java |  42 ++
 ...acheAbstractUsersAffinityMapperSelfTest.java | 207 ++++++
 ...dCacheAtomicUsersAffinityMapperSelfTest.java |  45 ++
 ...idCacheConfigurationConsistencySelfTest.java |  46 +-
 ...ridCacheConfigurationValidationSelfTest.java |   8 +-
 .../cache/GridCacheOffHeapSelfTest.java         |  12 +-
 .../GridCachePartitionedAffinitySpreadTest.java |  16 +-
 .../GridCachePartitionedLocalStoreSelfTest.java |  51 ++
 ...chePartitionedOffHeapLocalStoreSelfTest.java |  56 ++
 .../GridCacheReplicatedLocalStoreSelfTest.java  |  51 ++
 ...heReplicatedUsersAffinityMapperSelfTest.java |  45 ++
 ...ridCacheTxPartitionedLocalStoreSelfTest.java |  51 ++
 .../GridCacheTxUsersAffinityMapperSelfTest.java |  45 ++
 .../IgniteClientAffinityAssignmentSelfTest.java |  16 +-
 .../GridCacheQueueCleanupSelfTest.java          |   1 -
 .../GridCacheClientModesAbstractSelfTest.java   |   4 +-
 ...dCachePartitionedAffinityFilterSelfTest.java |   6 +-
 ...GridCachePreloadRestartAbstractSelfTest.java |   4 +-
 .../dht/GridCacheColocatedDebugTest.java        |   4 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |   4 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |  13 +-
 .../dht/GridCacheDhtEvictionSelfTest.java       |  13 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |   4 +-
 .../dht/GridCacheDhtPreloadBigDataSelfTest.java |   4 +-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |   4 +-
 .../GridCacheDhtPreloadDisabledSelfTest.java    |   4 +-
 .../GridCacheDhtPreloadMessageCountTest.java    |   4 +-
 ...ridCacheDhtPreloadMultiThreadedSelfTest.java |   4 +-
 .../dht/GridCacheDhtPreloadSelfTest.java        |   4 +-
 .../GridCacheDhtPreloadStartStopSelfTest.java   |   4 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |   4 +-
 .../distributed/dht/GridCacheDhtTestUtils.java  |   6 +-
 ...dCachePartitionedTopologyChangeSelfTest.java |   7 +-
 ...ridCachePartitionedUnloadEventsSelfTest.java |   5 +-
 ...ffinityFunctionExcludeNeighborsSelfTest.java |  32 -
 ...AffinityExcludeNeighborsPerformanceTest.java |   4 +-
 ...rtitionedAffinityHashIdResolverSelfTest.java |   4 +-
 .../GridCachePartitionedAffinitySelfTest.java   | 226 ------
 .../GridCachePartitionedFullApiSelfTest.java    |  11 +-
 .../GridCachePartitionedNodeRestartTest.java    |   4 +-
 ...ePartitionedOptimisticTxNodeRestartTest.java |   4 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |   4 +-
 ...cheSynchronousEvictionsFailoverSelfTest.java |   4 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |   4 +-
 ...idOffHeapPartitionedMapAbstractSelfTest.java |   4 +-
 ...apPartitionedMapPerformanceAbstractTest.java |   4 +-
 ...GridUnsafePartitionedMapPerformanceTest.java |   4 +-
 .../capacity/spring-capacity-cache.xml          |   2 +-
 .../loadtests/colocation/spring-colocation.xml  |   2 +-
 .../GridCachePartitionedAtomicLongLoadTest.java |   4 +-
 ...apPartitionedMapPerformanceAbstractTest.java |   4 +-
 ...GridUnsafePartitionedMapPerformanceTest.java |   4 +-
 .../ignite/testframework/GridTestUtils.java     |  11 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |   1 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |   5 +-
 .../hibernate/HibernateL2CacheSelfTest.java     |   8 +-
 .../processors/cache/GridCacheSwapSelfTest.java |  12 +-
 modules/scalar/pom.xml                          |   6 +
 .../ignite/schema/generator/PojoGenerator.java  |   3 +-
 .../schema/generator/SnippetGenerator.java      | 138 ++++
 .../apache/ignite/schema/ui/SchemaLoadApp.java  |   2 +
 .../commands/cache/VisorCacheCommand.scala      |  18 +-
 .../commands/cache/VisorCacheScanCommand.scala  |   7 +-
 .../config/VisorConfigurationCommand.scala      |   5 +-
 .../visor/commands/node/VisorNodeCommand.scala  |   6 +-
 .../scala/org/apache/ignite/visor/visor.scala   |  27 +-
 pom.xml                                         |   4 +-
 111 files changed, 1742 insertions(+), 2249 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab5c732f/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 58d8be9,cf88778..3b2294d
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@@ -1878,9 -1882,23 +1879,9 @@@ public class IgniteConfiguration 
      /**
       * @param pluginCfgs Plugin configurations.
       */
-     public void setPluginConfigurations(Collection<? extends PluginConfiguration>
pluginCfgs) {
+     public void setPluginConfigurations(PluginConfiguration... pluginCfgs) {
          this.pluginCfgs = pluginCfgs;
      }
 -
 -    /**
 -     * @return Query configuration.
 -     */
 -    public QueryConfiguration getQueryConfiguration() {
 -        return qryCfg;
 -    }
 -
 -    /**
 -     * @param qryCfg Query configuration.
 -     */
 -    public void setQueryConfiguration(QueryConfiguration qryCfg) {
 -        this.qryCfg = qryCfg;
 -    }
  
      /**
       * @return Atomic data structures configuration.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab5c732f/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 23dbd27,cb2efbf..1cf1c3e
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@@ -34,25 -34,13 +34,20 @@@ import org.apache.ignite.marshaller.opt
  import org.apache.ignite.mxbean.*;
  import org.apache.ignite.plugin.segmentation.*;
  import org.apache.ignite.spi.*;
 +import org.apache.ignite.spi.indexing.*;
 +import org.apache.ignite.spi.indexing.noop.*;
 +import org.apache.ignite.streamer.*;
 +import org.apache.ignite.thread.*;
 +import org.apache.ignite.internal.processors.resource.*;
 +import org.apache.ignite.internal.processors.spring.*;
 +import org.apache.ignite.plugin.segmentation.*;
  import org.apache.ignite.spi.checkpoint.*;
  import org.apache.ignite.spi.checkpoint.noop.*;
- import org.apache.ignite.spi.collision.*;
  import org.apache.ignite.spi.collision.noop.*;
- import org.apache.ignite.spi.communication.*;
  import org.apache.ignite.spi.communication.tcp.*;
- import org.apache.ignite.spi.deployment.*;
  import org.apache.ignite.spi.deployment.local.*;
- import org.apache.ignite.spi.discovery.*;
  import org.apache.ignite.spi.discovery.tcp.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*;
- import org.apache.ignite.spi.eventstorage.*;
  import org.apache.ignite.spi.eventstorage.memory.*;
  import org.apache.ignite.spi.failover.*;
  import org.apache.ignite.spi.failover.always.*;

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

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab5c732f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab5c732f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab5c732f/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------


Mime
View raw message