ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [29/29] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4705-2
Date Mon, 13 Mar 2017 11:36:22 GMT
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4705-2

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
#	modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
#	modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadFactory.java
#	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNoStripedPoolMultiNodeFullApiSelfTest.java
#	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNoStripedPoolMultiNodeFullApiSelfTest.java


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

Branch: refs/heads/ignite-4705-2
Commit: fc3cc0abbafeedd90f4a1a806020ceab867e89e5
Parents: 9adc20a
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Mar 13 14:34:02 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Mar 13 14:34:02 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/util/StripedExecutor.java    |  8 ++++++--
 .../org/apache/ignite/thread/IgniteThread.java   | 19 +++++--------------
 2 files changed, 11 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fc3cc0ab/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
index 7ccd386..6c85b32 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
@@ -56,7 +56,7 @@ public class StripedExecutor implements ExecutorService {
 
     /**
      * @param cnt Count.
-     * @param gridName Node name.
+     * @param igniteInstanceName Node name.
      * @param poolName Pool name.
      * @param log Logger.
      */
@@ -435,7 +435,11 @@ public class StripedExecutor implements ExecutorService {
          * Starts the stripe.
          */
         void start() {
-            thread = new IgniteThread(igniteInstanceName, poolName + "-stripe-" + idx, this,
idx);
+            thread = new IgniteThread(igniteInstanceName,
+                poolName + "-stripe-" + idx,
+                this,
+                IgniteThread.GRP_IDX_UNASSIGNED,
+                idx);
 
             thread.start();
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/fc3cc0ab/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
index f7411d3..6005ac9 100644
--- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
+++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
@@ -79,9 +79,10 @@ public class IgniteThread extends Thread {
      * @param threadName Name of thread.
      * @param r Runnable to execute.
      * @param grpIdx Index within a group.
+     * @param stripe Non-negative stripe number if this thread is striped pool thread.
      */
-    public IgniteThread(String igniteInstanceName, String threadName, Runnable r, int grpIdx)
{
-        this(DFLT_GRP, igniteInstanceName, threadName, r, grpIdx, -1);
+    public IgniteThread(String igniteInstanceName, String threadName, Runnable r, int grpIdx,
int stripe) {
+        this(DFLT_GRP, igniteInstanceName, threadName, r, grpIdx, stripe);
     }
 
     /**
@@ -93,6 +94,7 @@ public class IgniteThread extends Thread {
      * @param threadName Name of thread.
      * @param r Runnable to execute.
      * @param grpIdx Thread index within a group.
+     * @param stripe Non-negative stripe number if this thread is striped pool thread.
      */
     public IgniteThread(ThreadGroup grp, String igniteInstanceName, String threadName, Runnable
r, int grpIdx, int stripe) {
         super(grp, r, createName(cntr.incrementAndGet(), threadName, igniteInstanceName));
@@ -118,24 +120,13 @@ public class IgniteThread extends Thread {
     }
 
     /**
-     * @return Non-negative value if this thread is striped pool thread.
+     * @return Non-negative stripe number if this thread is striped pool thread.
      */
     public int stripe() {
         return stripe;
     }
 
     /**
-     * Gets name of the grid this thread belongs to.
-     *
-     * @return Name of the grid this thread belongs to.
-     * @deprecated use {@link #getIgniteInstanceName()}
-     */
-    @Deprecated
-    public String getGridName() {
-        return getIgniteInstanceName();
-    }
-
-    /**
      * Gets name of the Ignite instance this thread belongs to.
      *
      * @return Name of the Ignite instance this thread belongs to.


Mime
View raw message