ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [43/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-2.0
Date Thu, 02 Mar 2017 11:31:20 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-2.0

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
#	modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java


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

Branch: refs/heads/ignite-4565-ddl
Commit: 0d2d5b365dd138b8fa56ddd1a594da3e6903f026
Parents: 53802d8 76f3060
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Feb 20 14:44:10 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Feb 20 14:44:10 2017 +0300

----------------------------------------------------------------------
 examples/config/spark/example-shared-rdd.xml    |  83 +++
 examples/pom.xml                                |  27 +-
 .../examples/java8/spark/SharedRDDExample.java  | 110 ++++
 .../examples/spark/ScalarSharedRDDExample.scala |  89 +++
 .../examples/SharedRDDExampleSelfTest.java      |  36 ++
 .../IgniteExamplesJ8SelfTestSuite.java          |   3 +
 .../tests/examples/ScalarExamplesSelfTest.scala |   6 +
 .../java/org/apache/ignite/IgniteMessaging.java |  11 +-
 .../ignite/internal/GridKernalGatewayImpl.java  |  25 +-
 .../org/apache/ignite/internal/GridTopic.java   |   2 +-
 .../apache/ignite/internal/IgniteKernal.java    |  48 +-
 .../ignite/internal/IgniteMessagingImpl.java    |   6 +-
 .../internal/StripedExecutorMXBeanAdapter.java  |  90 +++
 .../client/util/GridClientConsistentHash.java   |  14 +-
 .../internal/managers/GridManagerAdapter.java   |   2 +-
 .../managers/communication/GridIoManager.java   |  84 +--
 .../discovery/GridDiscoveryManager.java         | 267 +++------
 .../eventstorage/GridEventStorageManager.java   |  34 +-
 .../affinity/GridAffinityAssignmentCache.java   |   8 +-
 .../cache/CacheAffinitySharedManager.java       |   2 +-
 .../cache/GridCacheEvictionManager.java         |  60 +-
 .../processors/cache/GridCacheGateway.java      |  48 +-
 .../processors/cache/GridCacheIoManager.java    |  19 +-
 .../processors/cache/GridCacheProcessor.java    |   5 +
 .../processors/cache/GridCacheUtils.java        |   6 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |   2 +-
 .../dht/GridClientPartitionTopology.java        |  13 +-
 .../dht/GridDhtAssignmentFetchFuture.java       |   5 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  23 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |  14 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  35 +-
 .../GridDhtAtomicAbstractUpdateFuture.java      |   7 +-
 .../GridDhtAtomicAbstractUpdateRequest.java     |   2 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  16 +-
 .../atomic/GridDhtAtomicSingleUpdateFuture.java |   6 +-
 .../GridDhtAtomicSingleUpdateRequest.java       |   5 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |   6 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |  10 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |  31 +-
 .../GridNearAtomicSingleUpdateFuture.java       |   7 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   7 +-
 .../atomic/GridNearAtomicUpdateResponse.java    |  35 +-
 .../dht/preloader/GridDhtPreloader.java         |  39 +-
 .../near/GridNearSingleGetRequest.java          |   5 +
 .../cache/query/GridCacheQueryManager.java      |  97 ++--
 .../cache/transactions/IgniteTxHandler.java     |   4 +-
 .../cache/version/GridCacheVersion.java         |   2 +-
 .../cache/version/GridCacheVersionManager.java  |   2 +-
 .../clock/GridClockSyncProcessor.java           |   2 +-
 .../processors/query/GridQueryIndexing.java     |  17 +-
 .../processors/query/GridQueryProcessor.java    |  32 +-
 .../processors/query/GridRunningQueryInfo.java  | 132 +++++
 .../ignite/internal/util/GridBusyLock.java      |   2 +-
 .../util/StripedCompositeReadWriteLock.java     |  50 +-
 .../ignite/internal/util/StripedExecutor.java   |  65 ++-
 .../nio/GridAbstractCommunicationClient.java    |  37 +-
 .../util/nio/GridCommunicationClient.java       |   5 -
 .../internal/visor/VisorMultiNodeTask.java      |   2 +-
 .../visor/cache/VisorCacheClearTask.java        |  88 +--
 .../visor/cache/VisorCacheTypeMetadata.java     |   6 +
 .../visor/compute/VisorGatewayTask.java         |  30 +-
 .../visor/query/VisorCancelQueriesTask.java     |  72 +++
 .../query/VisorCollectRunningQueriesTask.java   |  96 ++++
 .../internal/visor/query/VisorRunningQuery.java | 132 +++++
 .../ignite/mxbean/StripedExecutorMXBean.java    |  90 +++
 .../communication/tcp/TcpCommunicationSpi.java  |   9 +
 .../org/apache/ignite/thread/IgniteThread.java  |  26 +-
 .../communication/GridIoManagerSelfTest.java    |   6 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |  55 --
 .../discovery/GridDiscoveryManagerSelfTest.java | 214 --------
 .../cache/GridCacheLifecycleAwareSelfTest.java  |  33 ++
 .../processors/cache/GridCacheOffHeapTest.java  | 274 ----------
 ...niteTopologyValidatorGridSplitCacheTest.java | 334 ++++++++++++
 ...niteMessagingConfigVariationFullApiTest.java | 195 +++++--
 .../internal/util/StripedExecutorTest.java      | 168 ++++++
 .../ignite/messaging/GridMessagingSelfTest.java | 114 +++-
 .../messaging/IgniteMessagingSendAsyncTest.java | 544 +++++++++++++++++++
 .../junits/multijvm/IgniteProcessProxy.java     |   5 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |   2 +
 .../testsuites/IgniteComputeGridTestSuite.java  |   2 +
 .../testsuites/IgniteKernalSelfTestSuite.java   |   5 +-
 .../IgniteTopologyValidatorTestSuit.java        |   1 +
 .../hadoop/shuffle/HadoopShuffle.java           |   2 +-
 .../cache/query/GridCacheTwoStepQuery.java      |  18 +-
 .../processors/query/h2/IgniteH2Indexing.java   |  81 ++-
 .../query/h2/sql/GridSqlQuerySplitter.java      |   4 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |  60 +-
 .../cache/CacheSqlQueryValueCopySelfTest.java   | 208 ++++++-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |   2 +-
 .../h2/GridIndexingSpiAbstractSelfTest.java     |   7 +
 modules/kubernetes/DEVNOTES.txt                 |  63 +++
 modules/kubernetes/README.txt                   |  33 ++
 modules/kubernetes/config/Dockerfile            |  45 ++
 modules/kubernetes/config/example-kube.xml      |  44 ++
 .../kubernetes/config/ignite-deployment.yaml    |  26 +
 modules/kubernetes/config/ignite-service.yaml   |  14 +
 modules/kubernetes/config/run.sh                |  50 ++
 modules/kubernetes/licenses/apache-2.0.txt      | 202 +++++++
 modules/kubernetes/pom.xml                      |  93 ++++
 .../TcpDiscoveryKubernetesIpFinder.java         | 317 +++++++++++
 .../tcp/ipfinder/kubernetes/package-info.java   |  22 +
 .../TcpDiscoveryKubernetesIpFinderSelfTest.java |  93 ++++
 .../tcp/ipfinder/kubernetes/package-info.java   |  22 +
 .../testsuites/IgniteKubernetesTestSuite.java   |  41 ++
 .../apache/ignite/spark/JavaIgniteContext.scala |   6 +
 .../ignite/tools/classgen/ClassesGenerator.java |   4 +-
 .../web-console/backend/routes/activities.js    |   7 -
 modules/web-console/backend/routes/profile.js   |   4 +-
 .../web-console/backend/services/activities.js  |  30 +-
 .../web-console/backend/services/sessions.js    |   6 +-
 modules/web-console/backend/services/users.js   |   7 +-
 .../backend/test/unit/ActivitiesService.test.js | 131 +++++
 modules/web-console/frontend/app/app.config.js  |   4 +
 .../activities-user-dialog.controller.js        |  39 +-
 .../activities-user-dialog.jade                 |   2 +-
 .../components/activities-user-dialog/index.js  |   5 +-
 .../form-field-datepicker.jade                  |   4 +-
 .../list-of-registered-users.column-defs.js     |  26 +-
 .../list-of-registered-users.controller.js      |  56 +-
 .../list-of-registered-users.jade               |  16 +-
 .../ui-grid-settings/ui-grid-settings.scss      |  39 +-
 .../app/core/activities/Activities.data.js      |   5 -
 modules/web-console/frontend/app/data/i18n.js   |   1 +
 .../ui-ace-pom/ui-ace-pom.controller.js         |   4 +-
 .../frontend/app/modules/agent/agent.module.js  |  15 -
 .../modules/configuration/Version.service.js    |  35 +-
 .../configuration/configuration.module.js       |   6 +-
 .../configuration/generator/Maven.service.js    |  10 +-
 .../configuration/summary/summary.worker.js     |  34 +-
 modules/web-console/frontend/package.json       | 182 +++----
 .../frontend/public/stylesheets/style.scss      |   8 -
 .../frontend/public/stylesheets/variables.scss  |   1 -
 .../frontend/test/unit/Version.test.js          |  26 +-
 .../views/templates/agent-download.jade         |  10 +-
 .../console/agent/handlers/RestListener.java    |   9 +-
 .../demo/service/DemoCachesLoadService.java     |   2 +-
 .../service/DemoRandomCacheLoadService.java     |   2 +-
 modules/yardstick/DEVNOTES-standalone.txt       |   5 +-
 modules/yardstick/README.txt                    |  85 +--
 .../config/benchmark-atomic-win.properties      |   2 +-
 .../config/benchmark-atomic.properties          |  35 +-
 .../config/benchmark-bin-identity.properties    |  16 +-
 .../config/benchmark-cache-load-win.properties  |   2 +-
 .../config/benchmark-cache-load.properties      |   4 +-
 .../config/benchmark-client-mode.properties     |  68 ++-
 .../config/benchmark-compute-win.properties     |   2 +-
 .../config/benchmark-compute.properties         |  30 +-
 .../config/benchmark-failover.properties        |   2 +-
 .../yardstick/config/benchmark-full.properties  |  62 +--
 .../config/benchmark-multicast.properties       | 107 ++--
 .../config/benchmark-put-indexed-val.properties |  23 +-
 .../benchmark-query-put-separated.properties    |   3 +-
 .../config/benchmark-query-win.properties       |   2 +-
 .../yardstick/config/benchmark-query.properties |  33 +-
 .../config/benchmark-remote-sample.properties   |  80 +++
 .../config/benchmark-remote.properties          | 119 ++++
 .../config/benchmark-sample.properties          |  22 +-
 .../config/benchmark-sql-dml.properties         |  36 +-
 .../yardstick/config/benchmark-store.properties |   3 +-
 .../config/benchmark-tx-win.properties          |   2 +-
 .../yardstick/config/benchmark-tx.properties    |  33 +-
 .../yardstick/config/benchmark-win.properties   |   2 +-
 modules/yardstick/config/benchmark.properties   |  76 ++-
 .../yardstick/config/ignite-remote-config.xml   |  47 ++
 .../test-max-int-values-offheap.properties      |   3 +-
 .../test-max-int-values-onheap.properties       |   3 +-
 .../config/test-max-int-values-swap.properties  |   3 +-
 modules/yardstick/pom-standalone.xml            |   2 +-
 modules/yardstick/pom.xml                       |   2 +-
 .../yardstick/IgniteBenchmarkArguments.java     |  28 +-
 .../org/apache/ignite/yardstick/IgniteNode.java |   2 +-
 .../IgniteCacheRandomOperationBenchmark.java    |  49 ++
 pom.xml                                         |   6 +-
 173 files changed, 5724 insertions(+), 1761 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 750c316,cdbe2e3..f6e47b7
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@@ -300,8 -299,8 +301,12 @@@ public class IgniteKernal implements Ig
  
      /** */
      @GridToStringExclude
 +    private ObjectName qryExecSvcMBean;
 +
++    /** */
++    @GridToStringExclude
+     private ObjectName stripedExecSvcMBean;
+ 
      /** Kernal start timestamp. */
      private long startTime = U.currentTimeMillis();
  
@@@ -978,7 -967,8 +983,8 @@@
              // Register MBeans.
              registerKernalMBean();
              registerLocalNodeMBean();
 -            registerExecutorMBeans(execSvc, sysExecSvc, p2pExecSvc, mgmtExecSvc, restExecSvc);
 +            registerExecutorMBeans(execSvc, sysExecSvc, p2pExecSvc, mgmtExecSvc, restExecSvc,
qryExecSvc);
+             registerStripedExecutorMBean(stripedExecSvc);
  
              // Lifecycle bean notifications.
              notifyLifecycleBeans(AFTER_NODE_START);
@@@ -2063,7 -2086,7 +2102,8 @@@
                      unregisterMBean(kernalMBean) &
                      unregisterMBean(locNodeMBean) &
                      unregisterMBean(restExecSvcMBean) &
-                     unregisterMBean(qryExecSvcMBean)
++                    unregisterMBean(qryExecSvcMBean) &
+                     unregisterMBean(stripedExecSvcMBean)
              ))
                  errOnStop = false;
  

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

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 6646f4c,9ea707d..e0d4593
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@@ -17,7 -17,7 +17,8 @@@
  
  package org.apache.ignite.internal.managers.discovery;
  
+ import java.io.Serializable;
 +import java.io.Externalizable;
  import java.lang.management.GarbageCollectorMXBean;
  import java.lang.management.ManagementFactory;
  import java.lang.management.MemoryMXBean;
@@@ -2595,13 -2554,9 +2561,11 @@@ public class GridDiscoveryManager exten
              aliveSrvNodesWithCaches = new ConcurrentSkipListMap<>(GridNodeOrderComparator.INSTANCE);
              nodesByVer = new TreeMap<>();
  
 +            List<ClusterNode> aliveSrvNodesList = new ArrayList<>(allNodes.size());
 +
              long maxOrder0 = 0;
  
-             Set<String> nearEnabledSet = new HashSet<>();
+             Set<Integer> nearEnabledSet = new HashSet<>();
  
              List<ClusterNode> srvNodes = new ArrayList<>();
  
@@@ -2687,10 -2628,7 +2641,9 @@@
  
              maxOrder = maxOrder0;
  
 +            aliveSrvNodes = Collections.unmodifiableList(aliveSrvNodesList);
 +
              allCacheNodes = Collections.unmodifiableMap(cacheMap);
-             rmtCacheNodes = Collections.unmodifiableMap(rmtCacheMap);
              affCacheNodes = Collections.unmodifiableMap(dhtNodesMap);
              allNodesWithCaches = Collections.unmodifiableCollection(nodesWithCaches);
              this.rmtNodesWithCaches = Collections.unmodifiableCollection(rmtNodesWithCaches);
@@@ -2803,21 -2713,8 +2728,15 @@@
          }
  
          /**
-          * Gets all nodes that have cache with given name and should participate in affinity
calculation. With
-          * partitioned cache nodes with near-only cache do not participate in affinity node
calculation.
-          *
-          * @param cacheName Cache name.
-          * @param topVer Topology version.
-          * @return Collection of nodes.
++         * Gets all alive server nodes.
 +         */
-         Collection<ClusterNode> cacheAffinityNodes(@Nullable String cacheName, final
long topVer) {
-             return filter(topVer, affCacheNodes.get(cacheName));
++        Collection<ClusterNode> aliveSrvNodes() {
++            return aliveSrvNodes;
 +        }
 +
 +        /**
-          * Gets all alive nodes that have cache with given name.
+          * Gets all remote nodes that have at least one cache configured.
           *
-          * @param cacheName Cache name.
           * @param topVer Topology version.
           * @return Collection of nodes.
           */

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

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 4c89a7c,2664505..2664505
mode 100755,100644..100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------


Mime
View raw message