You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/09/15 03:59:55 UTC
[1/6] ignite git commit: IGNITE-1197 - Fixed unswap iterator
Repository: ignite
Updated Branches:
refs/heads/ignite-1400 db28d8dd2 -> bc32ad7f5
IGNITE-1197 - Fixed unswap iterator
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cb9b7662
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cb9b7662
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cb9b7662
Branch: refs/heads/ignite-1400
Commit: cb9b76620167cc8b71b333615e6406dd98dc6d7a
Parents: 866fb41
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Sep 14 16:34:28 2015 -0700
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Sep 14 16:36:04 2015 -0700
----------------------------------------------------------------------
.../distributed/dht/GridDhtLocalPartition.java | 63 ++++++++++++++------
1 file changed, 44 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb9b7662/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 215a1b5..a58451f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -21,6 +21,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.NoSuchElementException;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -707,38 +708,62 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
return new Iterator<GridDhtCacheEntry>() {
/** */
- GridDhtCacheEntry lastEntry;
+ private GridDhtCacheEntry lastEntry;
- @Override public boolean hasNext() {
- return it.hasNext();
+ {
+ lastEntry = advance();
}
- @Override public GridDhtCacheEntry next() {
- Map.Entry<byte[], GridCacheSwapEntry> entry = it.next();
+ private GridDhtCacheEntry advance() {
+ if (it.hasNext()) {
+ Map.Entry<byte[], GridCacheSwapEntry> entry = it.next();
- byte[] keyBytes = entry.getKey();
+ byte[] keyBytes = entry.getKey();
- while (true) {
- try {
- KeyCacheObject key = cctx.toCacheKeyObject(keyBytes);
+ while (true) {
+ try {
+ KeyCacheObject key = cctx.toCacheKeyObject(keyBytes);
- lastEntry = (GridDhtCacheEntry)cctx.cache().entryEx(key, false);
+ lastEntry = (GridDhtCacheEntry)cctx.cache().entryEx(key, false);
- lastEntry.unswap(true);
+ lastEntry.unswap(true);
- return lastEntry;
- }
- catch (GridCacheEntryRemovedException e) {
- if (log.isDebugEnabled())
- log.debug("Got removed entry: " + lastEntry);
- }
- catch (IgniteCheckedException e) {
- throw new CacheException(e);
+ return lastEntry;
+ }
+ catch (GridCacheEntryRemovedException e) {
+ if (log.isDebugEnabled())
+ log.debug("Got removed entry: " + lastEntry);
+ }
+ catch (IgniteCheckedException e) {
+ throw new CacheException(e);
+ }
+ catch (GridDhtInvalidPartitionException e) {
+ if (log.isDebugEnabled())
+ log.debug("Got invalid partition exception: " + e);
+
+ return null;
+ }
}
}
+
+ return null;
+ }
+
+ @Override public boolean hasNext() {
+ return lastEntry != null;
+ }
+
+ @Override public GridDhtCacheEntry next() {
+ if (lastEntry == null)
+ throw new NoSuchElementException();
+
+ return lastEntry;
}
@Override public void remove() {
+ if (lastEntry == null)
+ throw new NoSuchElementException();
+
map.remove(lastEntry.key(), lastEntry);
}
};
[5/6] ignite git commit: Merge branch 'ignite-1.4' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-1400
Posted by ag...@apache.org.
Merge branch 'ignite-1.4' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1400
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5082374f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5082374f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5082374f
Branch: refs/heads/ignite-1400
Commit: 5082374f5e353a744de3f21b45cbee594e87b073
Parents: db28d8d d39345b
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Sep 14 18:58:00 2015 -0700
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Sep 14 18:58:00 2015 -0700
----------------------------------------------------------------------
.../org/apache/ignite/internal/GridKernalContext.java | 7 ++++---
.../org/apache/ignite/internal/GridKernalContextImpl.java | 10 +++++-----
.../java/org/apache/ignite/internal/GridLoggerProxy.java | 6 ++++--
.../java/org/apache/ignite/internal/IgniteKernal.java | 6 +++---
.../ignite/internal/executor/GridExecutorService.java | 4 ++--
.../managers/deployment/GridDeploymentStoreAdapter.java | 4 ++--
.../internal/processors/cache/GridCacheAdapter.java | 4 ++--
.../processors/cache/GridCacheClearAllRunnable.java | 4 ++--
.../ignite/internal/processors/cache/GridCacheLogger.java | 4 ++--
.../internal/processors/cache/GridCacheSharedContext.java | 4 ++--
.../datastructures/GridCacheAtomicLongImpl.java | 4 ++--
.../datastructures/GridCacheAtomicReferenceImpl.java | 4 ++--
.../datastructures/GridCacheAtomicSequenceImpl.java | 4 ++--
.../datastructures/GridCacheAtomicStampedImpl.java | 4 ++--
.../datastructures/GridCacheCountDownLatchImpl.java | 4 ++--
.../internal/processors/igfs/IgfsFragmentizerManager.java | 8 +++++---
.../internal/processors/igfs/IgfsServerManager.java | 5 +++--
.../ignite/internal/processors/job/GridJobWorker.java | 4 ++--
.../ignite/internal/processors/task/GridTaskWorker.java | 4 ++--
19 files changed, 50 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
[4/6] ignite git commit: Merge branch 'ignite-1.4' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4
Posted by ag...@apache.org.
Merge branch 'ignite-1.4' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d39345b8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d39345b8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d39345b8
Branch: refs/heads/ignite-1400
Commit: d39345b874097d8f6852b35c9d47c8037c13d19b
Parents: c70680a cc0d1f5
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Sep 14 18:55:54 2015 -0700
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Sep 14 18:55:54 2015 -0700
----------------------------------------------------------------------
.../org/apache/ignite/internal/GridKernalContext.java | 7 ++++---
.../org/apache/ignite/internal/GridKernalContextImpl.java | 10 +++++-----
.../java/org/apache/ignite/internal/GridLoggerProxy.java | 6 ++++--
.../java/org/apache/ignite/internal/IgniteKernal.java | 6 +++---
.../ignite/internal/executor/GridExecutorService.java | 4 ++--
.../managers/deployment/GridDeploymentStoreAdapter.java | 4 ++--
.../internal/processors/cache/GridCacheAdapter.java | 4 ++--
.../processors/cache/GridCacheClearAllRunnable.java | 4 ++--
.../ignite/internal/processors/cache/GridCacheLogger.java | 4 ++--
.../internal/processors/cache/GridCacheSharedContext.java | 4 ++--
.../datastructures/GridCacheAtomicLongImpl.java | 4 ++--
.../datastructures/GridCacheAtomicReferenceImpl.java | 4 ++--
.../datastructures/GridCacheAtomicSequenceImpl.java | 4 ++--
.../datastructures/GridCacheAtomicStampedImpl.java | 4 ++--
.../datastructures/GridCacheCountDownLatchImpl.java | 4 ++--
.../internal/processors/igfs/IgfsFragmentizerManager.java | 8 +++++---
.../internal/processors/igfs/IgfsServerManager.java | 5 +++--
.../ignite/internal/processors/job/GridJobWorker.java | 4 ++--
.../ignite/internal/processors/task/GridTaskWorker.java | 4 ++--
19 files changed, 50 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
[2/6] ignite git commit: IGNITE-1402 - Fixed logging categories
Posted by ag...@apache.org.
IGNITE-1402 - Fixed logging categories
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cc0d1f57
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cc0d1f57
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cc0d1f57
Branch: refs/heads/ignite-1400
Commit: cc0d1f57141d24b42c0f0ee0b7572e43aa47b339
Parents: cb9b766
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Mon Sep 14 17:09:58 2015 -0700
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Mon Sep 14 17:09:58 2015 -0700
----------------------------------------------------------------------
.../org/apache/ignite/internal/GridKernalContext.java | 7 ++++---
.../org/apache/ignite/internal/GridKernalContextImpl.java | 10 +++++-----
.../java/org/apache/ignite/internal/GridLoggerProxy.java | 6 ++++--
.../java/org/apache/ignite/internal/IgniteKernal.java | 6 +++---
.../ignite/internal/executor/GridExecutorService.java | 4 ++--
.../managers/deployment/GridDeploymentStoreAdapter.java | 4 ++--
.../internal/processors/cache/GridCacheAdapter.java | 4 ++--
.../processors/cache/GridCacheClearAllRunnable.java | 4 ++--
.../ignite/internal/processors/cache/GridCacheLogger.java | 4 ++--
.../internal/processors/cache/GridCacheSharedContext.java | 4 ++--
.../datastructures/GridCacheAtomicLongImpl.java | 4 ++--
.../datastructures/GridCacheAtomicReferenceImpl.java | 4 ++--
.../datastructures/GridCacheAtomicSequenceImpl.java | 4 ++--
.../datastructures/GridCacheAtomicStampedImpl.java | 4 ++--
.../datastructures/GridCacheCountDownLatchImpl.java | 4 ++--
.../internal/processors/igfs/IgfsFragmentizerManager.java | 8 +++++---
.../internal/processors/igfs/IgfsServerManager.java | 5 +++--
.../ignite/internal/processors/job/GridJobWorker.java | 4 ++--
.../ignite/internal/processors/task/GridTaskWorker.java | 4 ++--
19 files changed, 50 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 3f73c84..c0b50a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -94,11 +94,12 @@ public interface GridKernalContext extends Iterable<GridComponent> {
public String gridName();
/**
- * Gets logger.
+ * Gets logger for given category.
*
+ * @param ctgr Category.
* @return Logger.
*/
- public IgniteLogger log();
+ public IgniteLogger log(String ctgr);
/**
* Gets logger for given class.
@@ -572,4 +573,4 @@ public interface GridKernalContext extends Iterable<GridComponent> {
* @return Platform processor.
*/
public PlatformProcessor platform();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 6101836..ebf83bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -754,13 +754,13 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
}
/** {@inheritDoc} */
- @Override public IgniteLogger log() {
- return config().getGridLogger();
+ @Override public IgniteLogger log(String ctgr) {
+ return config().getGridLogger().getLogger(ctgr);
}
/** {@inheritDoc} */
@Override public IgniteLogger log(Class<?> cls) {
- return config().getGridLogger().getLogger(cls);
+ return log(cls.getName());
}
/** {@inheritDoc} */
@@ -808,7 +808,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
/** {@inheritDoc} */
@Override public String userVersion(ClassLoader ldr) {
- return spring != null ? spring.userVersion(ldr, log()) : U.DFLT_USER_VERSION;
+ return spring != null ? spring.userVersion(ldr, log(spring.getClass())) : U.DFLT_USER_VERSION;
}
/** {@inheritDoc} */
@@ -967,4 +967,4 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
@Override public String toString() {
return S.toString(GridKernalContextImpl.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
index 742552b..f6bddca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
@@ -206,7 +206,9 @@ public class GridLoggerProxy implements IgniteLogger, LifecycleAware, Externaliz
String gridNameR = t.get1();
Object ctgrR = t.get2();
- return IgnitionEx.gridx(gridNameR).log().getLogger(ctgrR);
+ IgniteLogger log = IgnitionEx.gridx(gridNameR).log();
+
+ return ctgrR != null ? log.getLogger(ctgrR) : log;
}
catch (IllegalStateException e) {
throw U.withCause(new InvalidObjectException(e.getMessage()), e);
@@ -220,4 +222,4 @@ public class GridLoggerProxy implements IgniteLogger, LifecycleAware, Externaliz
@Override public String toString() {
return S.toString(GridLoggerProxy.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index abab1f3..daf7d23 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -715,8 +715,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
this.cfg = cfg;
- log = (GridLoggerProxy)cfg.getGridLogger().getLogger(getClass().getName() +
- (gridName != null ? '%' + gridName : ""));
+ log = (GridLoggerProxy)cfg.getGridLogger().getLogger(
+ getClass().getName() + (gridName != null ? '%' + gridName : ""));
RuntimeMXBean rtBean = ManagementFactory.getRuntimeMXBean();
@@ -2247,7 +2247,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
/** {@inheritDoc} */
@Override public IgniteLogger log() {
- return log;
+ return cfg.getGridLogger();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java b/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java
index 860504f..e8db977 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/executor/GridExecutorService.java
@@ -135,7 +135,7 @@ public class GridExecutorService implements ExecutorService, Externalizable {
this.prj = prj;
this.ctx = ctx;
- this.log = ctx.log().getLogger(GridExecutorService.class);
+ this.log = ctx.log(GridExecutorService.class);
}
/** {@inheritDoc} */
@@ -733,4 +733,4 @@ public class GridExecutorService implements ExecutorService, Externalizable {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStoreAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStoreAdapter.java
index c2690b1..fcbc801 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStoreAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentStoreAdapter.java
@@ -57,7 +57,7 @@ abstract class GridDeploymentStoreAdapter implements GridDeploymentStore {
this.ctx = ctx;
this.comm = comm;
- log = ctx.config().getGridLogger().getLogger(getClass());
+ log = ctx.log(getClass());
}
/**
@@ -155,4 +155,4 @@ abstract class GridDeploymentStoreAdapter implements GridDeploymentStore {
@Override public String toString() {
return S.toString(GridDeploymentStoreAdapter.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 4460a2a..9329e94 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -318,7 +318,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
this.map = map;
- log = ctx.gridConfig().getGridLogger().getLogger(getClass());
+ log = ctx.logger(getClass());
metrics = new CacheMetricsImpl(ctx);
@@ -6028,4 +6028,4 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
return null;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
index e517e3a..feafc58 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
@@ -70,7 +70,7 @@ public class GridCacheClearAllRunnable<K, V> implements Runnable {
this.totalCnt = totalCnt;
ctx = cache.context();
- log = ctx.gridConfig().getGridLogger().getLogger(getClass());
+ log = ctx.logger(getClass());
}
/** {@inheritDoc} */
@@ -176,4 +176,4 @@ public class GridCacheClearAllRunnable<K, V> implements Runnable {
@Override public String toString() {
return S.toString(GridCacheClearAllRunnable.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
index f86e445..75547fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
@@ -72,7 +72,7 @@ class GridCacheLogger implements IgniteLogger, Externalizable {
cacheName = '<' + cctx.namexx() + "> ";
- log = cctx.kernalContext().log().getLogger(ctgr);
+ log = cctx.kernalContext().log(ctgr);
}
/**
@@ -190,4 +190,4 @@ class GridCacheLogger implements IgniteLogger, Externalizable {
@Override public String toString() {
return S.toString(GridCacheLogger.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 90e0921..13e390a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -520,7 +520,7 @@ public class GridCacheSharedContext<K, V> {
* @return Logger.
*/
public IgniteLogger logger(String category) {
- return kernalCtx.log().getLogger(category);
+ return kernalCtx.log(category);
}
/**
@@ -685,4 +685,4 @@ public class GridCacheSharedContext<K, V> {
public void txContextReset() {
mvccMgr.contextReset();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
index 3572409..944fc5f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
@@ -223,7 +223,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
this.atomicView = atomicView;
this.name = name;
- log = ctx.gridConfig().getGridLogger().getLogger(getClass());
+ log = ctx.logger(getClass());
}
/** {@inheritDoc} */
@@ -584,4 +584,4 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
@Override public String toString() {
return S.toString(GridCacheAtomicLongImpl.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
index b8794ea..b25e111 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
@@ -118,7 +118,7 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef
this.atomicView = atomicView;
this.name = name;
- log = ctx.gridConfig().getGridLogger().getLogger(getClass());
+ log = ctx.logger(getClass());
}
/** {@inheritDoc} */
@@ -371,4 +371,4 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef
@Override public String toString() {
return S.toString(GridCacheAtomicReferenceImpl.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
index 3e1afc0..956265b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
@@ -148,7 +148,7 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc
this.locVal = locVal;
this.name = name;
- log = ctx.gridConfig().getGridLogger().getLogger(getClass());
+ log = ctx.logger(getClass());
}
/** {@inheritDoc} */
@@ -587,4 +587,4 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc
@Override public String toString() {
return S.toString(GridCacheAtomicSequenceImpl.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
index dff32eb..f7a82a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
@@ -142,7 +142,7 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt
this.atomicView = atomicView;
this.name = name;
- log = ctx.gridConfig().getGridLogger().getLogger(getClass());
+ log = ctx.logger(getClass());
}
/** {@inheritDoc} */
@@ -411,4 +411,4 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt
@Override public String toString() {
return GridToStringBuilder.toString(GridCacheAtomicStampedImpl.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java
index cdd5f90..2667938 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java
@@ -129,7 +129,7 @@ public final class GridCacheCountDownLatchImpl implements GridCacheCountDownLatc
this.latchView = latchView;
this.ctx = ctx;
- log = ctx.gridConfig().getGridLogger().getLogger(getClass());
+ log = ctx.logger(getClass());
}
/** {@inheritDoc} */
@@ -408,4 +408,4 @@ public final class GridCacheCountDownLatchImpl implements GridCacheCountDownLatc
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
index 773d758..899730d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
@@ -407,7 +407,8 @@ public class IgfsFragmentizerManager extends IgfsManager {
* Constructor.
*/
protected FragmentizerCoordinator() {
- super(igfsCtx.kernalContext().gridName(), "fragmentizer-coordinator", igfsCtx.kernalContext().log());
+ super(igfsCtx.kernalContext().gridName(), "fragmentizer-coordinator",
+ igfsCtx.kernalContext().log(IgfsFragmentizerManager.class));
igfsCtx.kernalContext().event().addLocalEventListener(this, EVT_NODE_LEFT, EVT_NODE_FAILED);
igfsCtx.kernalContext().io().addMessageListener(topic, this);
@@ -719,7 +720,8 @@ public class IgfsFragmentizerManager extends IgfsManager {
* Constructor.
*/
protected FragmentizerWorker() {
- super(igfsCtx.kernalContext().gridName(), "fragmentizer-worker", igfsCtx.kernalContext().log());
+ super(igfsCtx.kernalContext().gridName(), "fragmentizer-worker",
+ igfsCtx.kernalContext().log(IgfsFragmentizerManager.class));
}
/** {@inheritDoc} */
@@ -849,4 +851,4 @@ public class IgfsFragmentizerManager extends IgfsManager {
return this == o;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java
index d692013..c12b367 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java
@@ -163,7 +163,8 @@ public class IgfsServerManager extends IgfsManager {
* Constructor.
*/
private BindWorker() {
- super(igfsCtx.kernalContext().gridName(), "bind-worker", igfsCtx.kernalContext().log());
+ super(igfsCtx.kernalContext().gridName(), "bind-worker",
+ igfsCtx.kernalContext().log(IgfsServerManager.class));
}
/**
@@ -210,4 +211,4 @@ public class IgfsServerManager extends IgfsManager {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
index c243435..ae6d212 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
@@ -179,7 +179,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject {
boolean internal,
GridJobEventListener evtLsnr,
GridJobHoldListener holdLsnr) {
- super(ctx.gridName(), "grid-job-worker", ctx.log());
+ super(ctx.gridName(), "grid-job-worker", ctx.log(GridJobWorker.class));
assert ctx != null;
assert ses != null;
@@ -925,4 +925,4 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject {
@Override public String toString() {
return S.toString(GridJobWorker.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc0d1f57/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
index 8fb7e5f..26a41de 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
@@ -274,7 +274,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
GridTaskEventListener evtLsnr,
@Nullable Map<GridTaskThreadContextKey, Object> thCtx,
UUID subjId) {
- super(ctx.config().getGridName(), "grid-task-worker", ctx.config().getGridLogger());
+ super(ctx.config().getGridName(), "grid-task-worker", ctx.log(GridTaskWorker.class));
assert ses != null;
assert fut != null;
@@ -1467,4 +1467,4 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
return S.toString(GridTaskWorker.class, this);
}
}
-}
\ No newline at end of file
+}
[3/6] ignite git commit: IGNITE-1197 - Reverted fix.
Posted by ag...@apache.org.
IGNITE-1197 - Reverted fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c70680a8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c70680a8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c70680a8
Branch: refs/heads/ignite-1400
Commit: c70680a8be837258ae3e10d034f1a53522d6f0f8
Parents: cb9b766
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Sep 14 18:53:29 2015 -0700
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Sep 14 18:53:29 2015 -0700
----------------------------------------------------------------------
.../distributed/dht/GridDhtLocalPartition.java | 62 ++++++--------------
1 file changed, 19 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c70680a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index a58451f..c5f15cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -708,62 +708,38 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
return new Iterator<GridDhtCacheEntry>() {
/** */
- private GridDhtCacheEntry lastEntry;
+ GridDhtCacheEntry lastEntry;
- {
- lastEntry = advance();
+ @Override public boolean hasNext() {
+ return it.hasNext();
}
- private GridDhtCacheEntry advance() {
- if (it.hasNext()) {
- Map.Entry<byte[], GridCacheSwapEntry> entry = it.next();
-
- byte[] keyBytes = entry.getKey();
+ @Override public GridDhtCacheEntry next() {
+ Map.Entry<byte[], GridCacheSwapEntry> entry = it.next();
- while (true) {
- try {
- KeyCacheObject key = cctx.toCacheKeyObject(keyBytes);
+ byte[] keyBytes = entry.getKey();
- lastEntry = (GridDhtCacheEntry)cctx.cache().entryEx(key, false);
+ while (true) {
+ try {
+ KeyCacheObject key = cctx.toCacheKeyObject(keyBytes);
- lastEntry.unswap(true);
+ lastEntry = (GridDhtCacheEntry)cctx.cache().entryEx(key, false);
- return lastEntry;
- }
- catch (GridCacheEntryRemovedException e) {
- if (log.isDebugEnabled())
- log.debug("Got removed entry: " + lastEntry);
- }
- catch (IgniteCheckedException e) {
- throw new CacheException(e);
- }
- catch (GridDhtInvalidPartitionException e) {
- if (log.isDebugEnabled())
- log.debug("Got invalid partition exception: " + e);
+ lastEntry.unswap(true);
- return null;
- }
+ return lastEntry;
+ }
+ catch (GridCacheEntryRemovedException e) {
+ if (log.isDebugEnabled())
+ log.debug("Got removed entry: " + lastEntry);
+ }
+ catch (IgniteCheckedException e) {
+ throw new CacheException(e);
}
}
-
- return null;
- }
-
- @Override public boolean hasNext() {
- return lastEntry != null;
- }
-
- @Override public GridDhtCacheEntry next() {
- if (lastEntry == null)
- throw new NoSuchElementException();
-
- return lastEntry;
}
@Override public void remove() {
- if (lastEntry == null)
- throw new NoSuchElementException();
-
map.remove(lastEntry.key(), lastEntry);
}
};
[6/6] ignite git commit: IGNITE-1400 - Reverted fix.
Posted by ag...@apache.org.
IGNITE-1400 - Reverted fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bc32ad7f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bc32ad7f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bc32ad7f
Branch: refs/heads/ignite-1400
Commit: bc32ad7f5ddc46bc9b182c2e6ae5b93d5840babe
Parents: 5082374
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Sep 14 18:59:35 2015 -0700
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Sep 14 18:59:35 2015 -0700
----------------------------------------------------------------------
.../distributed/dht/GridDhtLocalPartition.java | 62 ++++++--------------
1 file changed, 19 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc32ad7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index a58451f..c5f15cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -708,62 +708,38 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
return new Iterator<GridDhtCacheEntry>() {
/** */
- private GridDhtCacheEntry lastEntry;
+ GridDhtCacheEntry lastEntry;
- {
- lastEntry = advance();
+ @Override public boolean hasNext() {
+ return it.hasNext();
}
- private GridDhtCacheEntry advance() {
- if (it.hasNext()) {
- Map.Entry<byte[], GridCacheSwapEntry> entry = it.next();
-
- byte[] keyBytes = entry.getKey();
+ @Override public GridDhtCacheEntry next() {
+ Map.Entry<byte[], GridCacheSwapEntry> entry = it.next();
- while (true) {
- try {
- KeyCacheObject key = cctx.toCacheKeyObject(keyBytes);
+ byte[] keyBytes = entry.getKey();
- lastEntry = (GridDhtCacheEntry)cctx.cache().entryEx(key, false);
+ while (true) {
+ try {
+ KeyCacheObject key = cctx.toCacheKeyObject(keyBytes);
- lastEntry.unswap(true);
+ lastEntry = (GridDhtCacheEntry)cctx.cache().entryEx(key, false);
- return lastEntry;
- }
- catch (GridCacheEntryRemovedException e) {
- if (log.isDebugEnabled())
- log.debug("Got removed entry: " + lastEntry);
- }
- catch (IgniteCheckedException e) {
- throw new CacheException(e);
- }
- catch (GridDhtInvalidPartitionException e) {
- if (log.isDebugEnabled())
- log.debug("Got invalid partition exception: " + e);
+ lastEntry.unswap(true);
- return null;
- }
+ return lastEntry;
+ }
+ catch (GridCacheEntryRemovedException e) {
+ if (log.isDebugEnabled())
+ log.debug("Got removed entry: " + lastEntry);
+ }
+ catch (IgniteCheckedException e) {
+ throw new CacheException(e);
}
}
-
- return null;
- }
-
- @Override public boolean hasNext() {
- return lastEntry != null;
- }
-
- @Override public GridDhtCacheEntry next() {
- if (lastEntry == null)
- throw new NoSuchElementException();
-
- return lastEntry;
}
@Override public void remove() {
- if (lastEntry == null)
- throw new NoSuchElementException();
-
map.remove(lastEntry.key(), lastEntry);
}
};