You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/01/16 07:49:12 UTC

[1/5] incubator-ignite git commit: # Fixed query with portables.

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-53 224f7e2fc -> 9710fff67


# Fixed query with portables.


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

Branch: refs/heads/ignite-53
Commit: e4c2bc4662f69fdb05d8d99779ebdface45c7c60
Parents: 0d5ea99
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Jan 15 14:53:04 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Jan 15 14:53:04 2015 +0700

----------------------------------------------------------------------
 .../grid/kernal/visor/query/VisorQueryTask.java | 53 ++++++++++++--------
 1 file changed, 32 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e4c2bc46/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java
index 1efc054..225eb79 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java
@@ -129,6 +129,11 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
         /** Flag indicating that this furure was read from last check. */
         private Boolean accessed;
 
+        /**
+         * @param fut Future.
+         * @param next Next value.
+         * @param accessed {@code true} if query was accessed before remove timeout expired.
+         */
         public VisorFutureResultSetHolder(GridCacheQueryFuture<R> fut, R next, Boolean accessed) {
             this.fut = fut;
             this.next = next;
@@ -188,15 +193,19 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
             try {
                 Boolean scan = arg.queryTxt().toUpperCase().startsWith("SCAN");
 
-                String qryId = (scan ? VisorQueryUtils.SCAN_QRY_NAME : VisorQueryUtils.SQL_QRY_NAME) + "-" + UUID.randomUUID();
+                String qryId = (scan ? VisorQueryUtils.SCAN_QRY_NAME : VisorQueryUtils.SQL_QRY_NAME) + "-" +
+                    UUID.randomUUID();
 
                 GridCache<Object, Object> c = g.cachex(arg.cacheName());
 
                 if (c == null)
-                    return new IgniteBiTuple<>(new IgniteCheckedException("Cache not found: " + escapeName(arg.cacheName())), null);
+                    return new IgniteBiTuple<>(new IgniteCheckedException("Cache not found: " +
+                        escapeName(arg.cacheName())), null);
+
+                GridCacheProjection<Object, Object> cp = c.keepPortable();
 
                 if (scan) {
-                    GridCacheQueryFuture<Map.Entry<Object, Object>> fut = c.queries().createScanQuery(null)
+                    GridCacheQueryFuture<Map.Entry<Object, Object>> fut = cp.queries().createScanQuery(null)
                         .pageSize(arg.pageSize())
                         .projection(g.forNodeIds(arg.proj()))
                         .execute();
@@ -221,7 +230,7 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
                         VisorQueryUtils.SCAN_COL_NAMES, rows.get1(), next != null, duration));
                 }
                 else {
-                    GridCacheQueryFuture<List<?>> fut = ((GridCacheQueriesEx<?, ?>)c.queries())
+                    GridCacheQueryFuture<List<?>> fut = ((GridCacheQueriesEx<?, ?>)cp.queries())
                         .createSqlFieldsQuery(arg.queryTxt(), true)
                         .pageSize(arg.pageSize())
                         .projection(g.forNodeIds(arg.proj()))
@@ -245,7 +254,8 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
 
                         long start = U.currentTimeMillis();
 
-                        IgniteBiTuple<List<Object[]>, List<?>> rows = VisorQueryUtils.fetchSqlQueryRows(fut, firstRow, arg.pageSize());
+                        IgniteBiTuple<List<Object[]>, List<?>> rows =
+                            VisorQueryUtils.fetchSqlQueryRows(fut, firstRow, arg.pageSize());
 
                         long fetchDuration = U.currentTimeMillis() - start;
 
@@ -271,24 +281,25 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
          * @param id Uniq query result id.
          */
         private void scheduleResultSetHolderRemoval(final String id) {
-            ((GridKernal)g).context().timeout().addTimeoutObject(new GridTimeoutObjectAdapter(VisorQueryUtils.RMV_DELAY) {
-                @Override public void onTimeout() {
-                    ClusterNodeLocalMap<String, VisorFutureResultSetHolder> storage = g.nodeLocalMap();
-
-                    VisorFutureResultSetHolder<?> t = storage.get(id);
-
-                    if (t != null) {
-                        // If future was accessed since last scheduling,  set access flag to false and reschedule.
-                        if (t.accessed()) {
-                            t.accessed(false);
-
-                            scheduleResultSetHolderRemoval(id);
+            ((GridKernal)g).context().timeout()
+                .addTimeoutObject(new GridTimeoutObjectAdapter(VisorQueryUtils.RMV_DELAY) {
+                    @Override public void onTimeout() {
+                        ClusterNodeLocalMap<String, VisorFutureResultSetHolder> storage = g.nodeLocalMap();
+
+                        VisorFutureResultSetHolder<?> t = storage.get(id);
+
+                        if (t != null) {
+                            // If future was accessed since last scheduling,  set access flag to false and reschedule.
+                            if (t.accessed()) {
+                                t.accessed(false);
+
+                                scheduleResultSetHolderRemoval(id);
+                            }
+                            else
+                                storage.remove(id); // Remove stored future otherwise.
                         }
-                        else
-                            storage.remove(id); // Remove stored future otherwise.
                     }
-                }
-            });
+                });
         }
 
         /** {@inheritDoc} */


[2/5] incubator-ignite git commit: Properties hotfix for GridP2PDoubleDeploymentSelfTest

Posted by sb...@apache.org.
Properties hotfix for GridP2PDoubleDeploymentSelfTest


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

Branch: refs/heads/ignite-53
Commit: 779e5d5e98df232f8003cd1724270184239a7b8e
Parents: 31d6342
Author: avinogradov <av...@gridgain.com>
Authored: Thu Jan 15 11:30:51 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Thu Jan 15 11:30:51 2015 +0300

----------------------------------------------------------------------
 .../test/java/org/gridgain/grid/p2p/p2p.properties | 17 -----------------
 1 file changed, 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779e5d5e/modules/core/src/test/java/org/gridgain/grid/p2p/p2p.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/p2p.properties b/modules/core/src/test/java/org/gridgain/grid/p2p/p2p.properties
index 0927c53..f1b49d6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/p2p.properties
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/p2p.properties
@@ -1,18 +1 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 resource=loaded


[5/5] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-53

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-53


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

Branch: refs/heads/ignite-53
Commit: 9710fff673887ce76936216db65fdd8efff21582
Parents: 224f7e2 fb0b20a
Author: sboikov <sb...@gridgain.com>
Authored: Fri Jan 16 09:48:48 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Jan 16 09:48:48 2015 +0300

----------------------------------------------------------------------
 .../grid/kernal/visor/query/VisorQueryTask.java | 53 ++++++++++++--------
 .../java/org/gridgain/grid/p2p/p2p.properties   | 17 -------
 2 files changed, 32 insertions(+), 38 deletions(-)
----------------------------------------------------------------------



[4/5] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-1

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-1


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

Branch: refs/heads/ignite-53
Commit: fb0b20a0af910afbafb3baef16692b2c224f87e8
Parents: da0235b 725d79f
Author: avinogradov <av...@gridgain.com>
Authored: Thu Jan 15 19:22:01 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Thu Jan 15 19:22:01 2015 +0300

----------------------------------------------------------------------
 .../grid/kernal/visor/query/VisorQueryTask.java | 53 ++++++++++++--------
 .../java/org/gridgain/grid/p2p/p2p.properties   | 17 -------
 2 files changed, 32 insertions(+), 38 deletions(-)
----------------------------------------------------------------------



[3/5] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-64'

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-64'


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

Branch: refs/heads/ignite-53
Commit: 725d79ff46b280ab967b6988845240a5bd0022b0
Parents: e4c2bc4 779e5d5
Author: avinogradov <av...@gridgain.com>
Authored: Thu Jan 15 19:18:28 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Thu Jan 15 19:18:28 2015 +0300

----------------------------------------------------------------------
 .../test/java/org/gridgain/grid/p2p/p2p.properties | 17 -----------------
 1 file changed, 17 deletions(-)
----------------------------------------------------------------------