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 2014/12/23 03:04:35 UTC
[1/2] incubator-ignite git commit: GG-9422 - Merged to Ignite.
Repository: incubator-ignite
Updated Branches:
refs/heads/master 49f0fa42d -> e01d3c367
GG-9422 - Merged to Ignite.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e1bfb8f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e1bfb8f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e1bfb8f1
Branch: refs/heads/master
Commit: e1bfb8f1560d1989a77bb1cfe359713f0cbbfa87
Parents: 92b73ff
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Mon Dec 22 18:03:46 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Mon Dec 22 18:03:46 2014 -0800
----------------------------------------------------------------------
.../distributed/dht/preloader/GridDhtPartitionDemandPool.java | 5 ++++-
.../distributed/dht/preloader/GridDhtPartitionSupplyPool.java | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1bfb8f1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
index 17291aa..ac7baad 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
@@ -412,11 +412,14 @@ public class GridDhtPartitionDemandPool<K, V> {
/** Counter. */
private long cntr;
+ /** Hide worker logger and use cache logger instead. */
+ private IgniteLogger log = GridDhtPartitionDemandPool.this.log;
+
/**
* @param id Worker ID.
*/
private DemandWorker(int id) {
- super(cctx.gridName(), "preloader-demand-worker", log);
+ super(cctx.gridName(), "preloader-demand-worker", GridDhtPartitionDemandPool.this.log);
assert id >= 0;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1bfb8f1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
index 963ad4c..5521013 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
@@ -190,11 +190,14 @@ class GridDhtPartitionSupplyPool<K, V> {
* Supply work.
*/
private class SupplyWorker extends GridWorker {
+ /** Hide worker logger and use cache logger. */
+ private IgniteLogger log = GridDhtPartitionSupplyPool.this.log;
+
/**
* Default constructor.
*/
private SupplyWorker() {
- super(cctx.gridName(), "preloader-supply-worker", log);
+ super(cctx.gridName(), "preloader-supply-worker", GridDhtPartitionSupplyPool.this.log);
}
/** {@inheritDoc} */
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/master'
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e01d3c36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e01d3c36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e01d3c36
Branch: refs/heads/master
Commit: e01d3c3675906e93a5ecd8bbdd854af547dd72fc
Parents: e1bfb8f 49f0fa4
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Mon Dec 22 18:04:19 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Mon Dec 22 18:04:19 2014 -0800
----------------------------------------------------------------------
.../cache/query/GridCacheQueryAdapter.java | 46 ++++++++++++++++----
.../java/org/gridgain/grid/util/GridUtils.java | 19 ++++++++
.../cache/GridCacheAbstractQuerySelfTest.java | 2 +-
.../GridCacheReplicatedQuerySelfTest.java | 38 ++++++++++++++++
4 files changed, 96 insertions(+), 9 deletions(-)
----------------------------------------------------------------------