ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [50/50] [abbrv] incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-929
Date Mon, 01 Jun 2015 14:18:36 GMT
# Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-929


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

Branch: refs/heads/ignite-929
Commit: 9c90271a969cc34d88979453d02bd4051c30a38b
Parents: 4c296de 97d0b04
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Jun 1 17:16:31 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Jun 1 17:16:31 2015 +0300

----------------------------------------------------------------------
 dev-tools/gradle/wrapper/gradle-wrapper.jar     |  Bin 51017 -> 0 bytes
 .../gradle/wrapper/gradle-wrapper.properties    |   18 +-
 dev-tools/gradlew                               |  163 +-
 dev-tools/slurp.sh                              |    2 +-
 dev-tools/src/main/groovy/jiraslurp.groovy      |   76 +-
 examples/pom.xml                                |    2 +-
 modules/aop/pom.xml                             |    2 +-
 modules/aws/pom.xml                             |    2 +-
 modules/clients/pom.xml                         |    2 +-
 modules/cloud/pom.xml                           |    2 +-
 modules/codegen/pom.xml                         |    2 +-
 modules/core/pom.xml                            |    2 +-
 .../src/main/java/org/apache/ignite/Ignite.java |    8 +-
 .../java/org/apache/ignite/IgniteServices.java  |    5 +-
 .../main/java/org/apache/ignite/Ignition.java   |    9 +-
 .../org/apache/ignite/cache/CacheMetrics.java   |  187 +-
 .../org/apache/ignite/cluster/ClusterNode.java  |    6 +-
 .../configuration/IgniteConfiguration.java      |   10 +-
 .../org/apache/ignite/igfs/IgfsUserContext.java |  119 +
 .../igfs/secondary/IgfsSecondaryFileSystem.java |    7 +
 .../apache/ignite/internal/IgniteKernal.java    |    8 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   19 +-
 .../internal/igfs/common/IgfsMarshaller.java    |   35 +-
 .../igfs/common/IgfsPathControlRequest.java     |   22 +
 .../internal/managers/GridManagerAdapter.java   |   59 +-
 .../discovery/GridDiscoveryManager.java         |    7 +
 .../processors/cache/CacheMetricsImpl.java      |  367 +-
 .../cache/CacheMetricsMXBeanImpl.java           |  100 +
 .../processors/cache/CacheMetricsSnapshot.java  |  380 +-
 .../processors/cache/GridCacheAdapter.java      |   12 +-
 .../processors/cache/GridCacheEntryEx.java      |    6 +
 .../processors/cache/GridCacheMapEntry.java     |    5 +
 .../processors/cache/GridCacheSwapManager.java  |  118 +-
 .../distributed/GridDistributedCacheEntry.java  |    7 -
 .../distributed/dht/GridDhtCacheEntry.java      |    6 +-
 .../colocated/GridDhtColocatedLockFuture.java   |   18 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   18 +-
 .../datastreamer/DataStreamerImpl.java          |    2 +
 .../internal/processors/hadoop/HadoopJob.java   |    2 +-
 .../ignite/internal/processors/igfs/IgfsEx.java |    8 +-
 .../internal/processors/igfs/IgfsImpl.java      |    8 +-
 .../processors/igfs/IgfsIpcHandler.java         |  184 +-
 .../igfs/IgfsSecondaryFileSystemImpl.java       |    9 +-
 .../internal/processors/igfs/IgfsServer.java    |    4 +-
 .../internal/processors/igfs/IgfsUtils.java     |   16 +
 .../service/GridServiceProcessor.java           |  117 +-
 .../ignite/internal/util/GridJavaProcess.java   |   30 +-
 .../shmem/IpcSharedMemoryServerEndpoint.java    |    2 +-
 .../ignite/mxbean/CacheMetricsMXBean.java       |   80 +
 .../apache/ignite/plugin/PluginProvider.java    |   26 +-
 .../org/apache/ignite/services/Service.java     |    5 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   35 +-
 .../org/apache/ignite/spi/IgniteSpiContext.java |   47 -
 .../ignite/spi/discovery/DiscoverySpi.java      |   13 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java    | 1478 +++++
 .../ignite/spi/discovery/tcp/ServerImpl.java    | 4766 ++++++++++++++
 .../discovery/tcp/TcpClientDiscoverySpi.java    | 1648 -----
 .../tcp/TcpClientDiscoverySpiMBean.java         |  156 -
 .../spi/discovery/tcp/TcpDiscoveryImpl.java     |  170 +
 .../spi/discovery/tcp/TcpDiscoverySpi.java      | 5914 ++++--------------
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   | 1229 ----
 .../spi/discovery/tcp/TcpDiscoverySpiMBean.java |    9 +
 .../TcpDiscoveryMulticastIpFinder.java          |   10 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |    8 +-
 .../core/src/main/resources/ignite.properties   |    2 +-
 .../ignite/internal/GridAffinitySelfTest.java   |    1 +
 .../internal/GridProjectionAbstractTest.java    |   16 +
 .../internal/GridReleaseTypeSelfTest.java       |   31 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |   21 +-
 .../GridDiscoveryManagerAttributesSelfTest.java |   28 +-
 .../discovery/GridDiscoveryManagerSelfTest.java |   28 +-
 .../GridAffinityProcessorAbstractSelfTest.java  |    1 +
 .../cache/CacheRemoveAllSelfTest.java           |    2 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |    3 +
 .../GridCacheAbstractRemoveFailureTest.java     |    3 +
 .../GridCacheAtomicMessageCountSelfTest.java    |    1 +
 ...GridCacheMixedPartitionExchangeSelfTest.java |    2 +-
 .../cache/GridCachePutAllFailoverSelfTest.java  |    1 +
 .../GridCacheReturnValueTransferSelfTest.java   |    3 +
 ...acheTcpClientDiscoveryMultiThreadedTest.java |    6 +-
 .../processors/cache/GridCacheTestEntryEx.java  |    4 +
 .../IgniteCacheAbstractStopBusySelfTest.java    |    6 +-
 .../cache/IgniteCacheAbstractTest.java          |    2 +-
 .../IgniteCacheConfigurationTemplateTest.java   |    2 +-
 .../cache/IgniteCacheNearLockValueSelfTest.java |    3 +
 .../cache/IgniteDynamicCacheStartSelfTest.java  |   30 +-
 .../IgniteClientDataStructuresAbstractTest.java |   11 +-
 .../GridCacheClientModesAbstractSelfTest.java   |    3 +
 ...ientModesTcpClientDiscoveryAbstractTest.java |   10 +-
 .../distributed/GridCacheMixedModeSelfTest.java |    3 +
 ...niteCacheClientNodeChangingTopologyTest.java |    2 +-
 ...teCacheClientNodePartitionsExchangeTest.java |    2 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |    6 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |    3 +-
 .../near/GridCacheNearOnlyTopologySelfTest.java |    1 +
 ...ionedClientOnlyNoPrimaryFullApiSelfTest.java |    5 +-
 ...idCacheRendezvousAffinityClientSelfTest.java |    4 +
 .../GridCacheSyncReplicatedPreloadSelfTest.java |    1 -
 ...heNearOnlyLruNearEvictionPolicySelfTest.java |    6 +-
 ...CacheLocalOffHeapAndSwapMetricsSelfTest.java |  412 ++
 .../DataStreamProcessorSelfTest.java            |    1 +
 .../DataStreamerMultiThreadedSelfTest.java      |    2 -
 .../processors/igfs/IgfsOneClientNodeTest.java  |    8 +-
 .../service/ClosureServiceClientsNodesTest.java |  251 +
 ...pClientDiscoveryMarshallerCheckSelfTest.java |   13 +-
 .../TcpClientDiscoverySpiConfigSelfTest.java    |   39 -
 .../tcp/TcpClientDiscoverySpiSelfTest.java      |   54 +-
 .../tcp/TcpDiscoveryConcurrentStartTest.java    |    6 +-
 .../tcp/TcpDiscoveryMultiThreadedTest.java      |   18 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |    2 +-
 .../testframework/GridSpiTestContext.java       |   25 +-
 .../testframework/junits/GridAbstractTest.java  |    8 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |    2 +
 .../IgniteCacheMetricsSelfTestSuite.java        |    1 +
 .../IgniteSpiDiscoverySelfTestSuite.java        |    1 -
 modules/extdata/p2p/pom.xml                     |    2 +-
 modules/extdata/uri/pom.xml                     |    2 +-
 modules/gce/pom.xml                             |    2 +-
 modules/geospatial/pom.xml                      |    2 +-
 modules/hadoop/pom.xml                          |    2 +-
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |  165 +-
 .../hadoop/fs/v1/IgniteHadoopFileSystem.java    |  107 +-
 .../hadoop/fs/v2/IgniteHadoopFileSystem.java    |   32 +-
 .../internal/processors/hadoop/HadoopUtils.java |   10 +-
 .../hadoop/SecondaryFileSystemProvider.java     |   53 +-
 .../hadoop/fs/HadoopDistributedFileSystem.java  |   91 -
 .../hadoop/fs/HadoopFileSystemsUtils.java       |   17 -
 .../hadoop/fs/HadoopLazyConcurrentMap.java      |  204 +
 .../processors/hadoop/igfs/HadoopIgfsEx.java    |    6 +
 .../hadoop/igfs/HadoopIgfsInProc.java           |  170 +-
 .../processors/hadoop/igfs/HadoopIgfsIpcIo.java |    2 +-
 .../hadoop/igfs/HadoopIgfsOutProc.java          |   33 +-
 .../hadoop/igfs/HadoopIgfsWrapper.java          |   19 +-
 .../hadoop/v2/HadoopV2TaskContext.java          |    4 +-
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |   56 +-
 ...oopSecondaryFileSystemConfigurationTest.java |    4 +-
 .../igfs/IgfsNearOnlyMultiNodeSelfTest.java     |    5 +-
 .../IgniteHadoopFileSystemAbstractSelfTest.java |   63 +-
 .../IgniteHadoopFileSystemClientSelfTest.java   |    2 +-
 .../IgniteHadoopFileSystemIpcCacheSelfTest.java |    2 +
 .../hadoop/HadoopFileSystemsTest.java           |   23 +-
 .../collections/HadoopSkipListSelfTest.java     |    4 +-
 modules/hibernate/pom.xml                       |    2 +-
 modules/indexing/pom.xml                        |    2 +-
 .../query/h2/sql/GridSqlQuerySplitter.java      |    4 +
 .../cache/IgniteCacheAbstractQuerySelfTest.java |    6 +-
 .../query/h2/sql/BaseH2CompareQueryTest.java    |   16 +
 modules/jcl/pom.xml                             |    2 +-
 modules/jta/pom.xml                             |    2 +-
 modules/log4j/pom.xml                           |    2 +-
 modules/mesos/README.txt                        |   28 +
 modules/mesos/licenses/apache-2.0.txt           |  202 +
 modules/mesos/licenses/jetty-epl-license.txt    |   69 +
 modules/mesos/pom.xml                           |  101 +
 .../apache/ignite/mesos/ClusterProperties.java  |  519 ++
 .../apache/ignite/mesos/IgniteFramework.java    |  119 +
 .../apache/ignite/mesos/IgniteScheduler.java    |  361 ++
 .../org/apache/ignite/mesos/IgniteTask.java     |   86 +
 .../org/apache/ignite/mesos/package-info.java   |   22 +
 .../ignite/mesos/resource/IgniteProvider.java   |  234 +
 .../ignite/mesos/resource/JettyServer.java      |   61 +
 .../ignite/mesos/resource/ResourceHandler.java  |  142 +
 .../ignite/mesos/resource/ResourceProvider.java |  120 +
 .../ignite/mesos/resource/package-info.java     |   22 +
 .../main/resources/ignite-default-config.xml    |   35 +
 .../org/apache/ignite/IgniteMesosTestSuite.java |   38 +
 .../ignite/mesos/IgniteSchedulerSelfTest.java   |  464 ++
 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 +-
 .../licenses/jcraft-revised-bsd.txt             |   28 -
 modules/visor-console/pom.xml                   |    2 +-
 modules/visor-plugins/pom.xml                   |    2 +-
 modules/web/pom.xml                             |    2 +-
 modules/yardstick/pom.xml                       |    2 +-
 parent/pom.xml                                  |    4 +
 pom.xml                                         |    3 +-
 scripts/git-format-patch.sh                     |   14 +-
 scripts/git-patch-prop.sh                       |    2 +-
 185 files changed, 13681 insertions(+), 9020 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c90271a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------

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

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c90271a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
index 39cbd80,095221e..0b12e42
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
@@@ -157,9 -164,8 +164,8 @@@ public class IgniteDynamicCacheStartSel
          futs.clear();
  
          GridTestUtils.runMultiThreaded(new Callable<Object>() {
-             @Override
-             public Object call() throws Exception {
+             @Override public Object call() throws Exception {
 -                futs.add(kernal.context().cache().dynamicStopCache(DYNAMIC_CACHE_NAME));
 +                futs.add(kernal.context().cache().dynamicDestroyCache(DYNAMIC_CACHE_NAME));
  
                  return null;
              }
@@@ -218,11 -224,10 +224,10 @@@
          futs.clear();
  
          GridTestUtils.runMultiThreaded(new Callable<Object>() {
-             @Override
-             public Object call() throws Exception {
+             @Override public Object call() throws Exception {
                  IgniteEx kernal = grid(ThreadLocalRandom.current().nextInt(nodeCount()));
  
 -                futs.add(kernal.context().cache().dynamicStopCache(DYNAMIC_CACHE_NAME));
 +                futs.add(kernal.context().cache().dynamicDestroyCache(DYNAMIC_CACHE_NAME));
  
                  return null;
              }
@@@ -931,47 -934,45 +936,46 @@@
  
          cfg.setNodeFilter(F.not(NODE_FILTER));
  
 -        try (IgniteCache<Object, Object> ignored = ignite(0).createCache(cfg)) {
 +        IgniteCache<Object, Object> cache = ignite(0).createCache(cfg);
  
 -            final CountDownLatch[] latches = new CountDownLatch[nodeCount()];
 +        final CountDownLatch[] latches = new CountDownLatch[nodeCount()];
  
 -            IgnitePredicate[] lsnrs = new IgnitePredicate[nodeCount()];
 +        IgnitePredicate[] lsnrs = new IgnitePredicate[nodeCount()];
  
 -            for (int i = 0; i < nodeCount(); i++) {
 -                final int idx = i;
 +        for (int i = 0; i < nodeCount(); i++) {
 +            final int idx = i;
  
-             latches[i] = new CountDownLatch(1);
-             lsnrs[i] = new IgnitePredicate<CacheEvent>() {
-                 @Override
-                 public boolean apply(CacheEvent e) {
-                     switch (e.type()) {
-                         case EventType.EVT_CACHE_NODES_LEFT:
-                             latches[idx].countDown();
+                 latches[i] = new CountDownLatch(1);
+                 lsnrs[i] = new IgnitePredicate<CacheEvent>() {
+                     @Override public boolean apply(CacheEvent e) {
+                         switch (e.type()) {
+                             case EventType.EVT_CACHE_NODES_LEFT:
+                                 latches[idx].countDown();
  
 -                                break;
 +                            break;
  
 -                            default:
 -                                assert false;
 -                        }
 +                        default:
 +                            assert false;
 +                    }
  
 -                        assertEquals(DYNAMIC_CACHE_NAME, e.cacheName());
 +                    assertEquals(DYNAMIC_CACHE_NAME, e.cacheName());
  
 -                        return true;
 -                    }
 -                };
 +                    return true;
 +                }
 +            };
  
 -                ignite(i).events().localListen(lsnrs[i], EventType.EVTS_CACHE_LIFECYCLE);
 -            }
 +            ignite(i).events().localListen(lsnrs[i], EventType.EVTS_CACHE_LIFECYCLE);
 +        }
  
 -            stopGrid(nodeCount());
 +        stopGrid(nodeCount());
  
 -            for (CountDownLatch latch : latches)
 -                latch.await();
 +        for (CountDownLatch latch : latches)
 +            latch.await();
  
 -            for (int i = 0; i < nodeCount(); i++)
 -                ignite(i).events().stopLocalListen(lsnrs[i]);
 -        }
 +        for (int i = 0; i < nodeCount(); i++)
 +            ignite(i).events().stopLocalListen(lsnrs[i]);
 +
 +        cache.destroy();
      }
  
      /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c90271a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
----------------------------------------------------------------------


Mime
View raw message